commit bd112255b9fe12111affbb3158d6bb9b184a7b9f
author Priyanka Advani (xWF) <padvani@google.com> Wed Nov 06 19:10:01 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 06 19:10:01 2024 +0000
tree ce67497ec242807373bfeaf040cc5b7098552e57
parent b82f9b9ea458c418da00264b99edd0b11d6aabb5
parent d08cb2968223f2d5640164d210b42cc912255893

Merge changes from topic "revert-3332613-system_aconfigd_rust_binary-EBVLQXTIPR" into main am: 9ee13fbc93 am: d08cb29682

Original change: https://android-review.googlesource.com/c/platform/build/+/3339562

Change-Id: I02f24b60fdc001f21b7fde51f86353eb75e35572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index bccace1..5ffac7c 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -18,7 +18,6 @@
 PRODUCT_PACKAGES += \
     abx \
     aconfigd \
-    aconfigd-system \
     adbd_system_api \
     aflags \
     am \

target/product/generic/Android.bp

diff --git a/target/product/generic/Android.bp b/target/product/generic/Android.bp
index 76eba40..0cd2959 100644
--- a/target/product/generic/Android.bp
+++ b/target/product/generic/Android.bp
@@ -379,7 +379,6 @@
     deps: [
         "abx",
         "aconfigd",
-        "aconfigd-system",
         "aflags",
         "am",
         "android.software.credentials.prebuilt.xml", // generic_system