commit d08cb2968223f2d5640164d210b42cc912255893
author Priyanka Advani (xWF) <padvani@google.com> Wed Nov 06 18:48:16 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 06 18:48:16 2024 +0000
tree 7d50ea6598e2d9a5d4dce6256ea318b7ad711bf2
parent 09be16550dd8c968778c2e345e71c6d22ca1311d
parent 9ee13fbc93d1d51c3ffaa1ab63297d61aba07417

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

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

Change-Id: Ifd5a426b7118dc1662948913c1372bc36e58c20e
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 3a8eb72..8f2f7e3 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 80b84de..017f8fb 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