diff options
| author | 2025-03-19 00:17:27 -0700 | |
|---|---|---|
| committer | 2025-03-19 00:17:27 -0700 | |
| commit | 35b920f9bacede1b1b9fcca1a5ae3773a8f160ed (patch) | |
| tree | 8972dfd0911267d1e39399c2cf4c8f425feaeeae | |
| parent | 6c600640f5c220d9a27c4008955400dcbe5a6a33 (diff) | |
| parent | 15dd9a678caf7789bec813ee80e9066d237b9074 (diff) | |
Merge "StatementService is not an Android system module" into main am: 05085ae52a am: 15dd9a678c
Original change: https://android-review.googlesource.com/c/platform/build/+/3548119
Change-Id: I9427079d06e0198742ebcb0584b1748609aef49d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | target/product/generic/Android.bp | 6 | ||||
| -rw-r--r-- | target/product/media_system.mk | 1 | ||||
| -rw-r--r-- | target/product/media_system_ext.mk | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/target/product/generic/Android.bp b/target/product/generic/Android.bp index c90c61cca6..391621f503 100644 --- a/target/product/generic/Android.bp +++ b/target/product/generic/Android.bp @@ -382,6 +382,11 @@ android_filesystem_defaults { "android.hidl.allocator@1.0-service", /////////////////////////////////////////// + // media_system_ext + /////////////////////////////////////////// + "StatementService", + + /////////////////////////////////////////// // window_extensions_base /////////////////////////////////////////// "androidx.window.extensions", @@ -809,7 +814,6 @@ system_image_defaults { "Shell", // base_system "SimAppDialog", // handheld_system "SoundPicker", // not installed by anyone - "StatementService", // media_system "Stk", // generic_system "Tag", // generic_system "TeleService", // handheld_system diff --git a/target/product/media_system.mk b/target/product/media_system.mk index af3857ebc1..4df71516ab 100644 --- a/target/product/media_system.mk +++ b/target/product/media_system.mk @@ -35,7 +35,6 @@ PRODUCT_PACKAGES += \ libwebviewchromium_plat_support \ make_f2fs \ requestsync \ - StatementService \ PRODUCT_HOST_PACKAGES += \ fsck.f2fs \ diff --git a/target/product/media_system_ext.mk b/target/product/media_system_ext.mk index e79a7eb5d1..455a253436 100644 --- a/target/product/media_system_ext.mk +++ b/target/product/media_system_ext.mk @@ -20,5 +20,8 @@ # base_system_ext.mk. $(call inherit-product, $(SRC_TARGET_DIR)/product/base_system_ext.mk) +PRODUCT_PACKAGES += \ + StatementService \ + # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions_base.mk) |