Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e72e34e authored by Kiyoung Kim's avatar Kiyoung Kim Committed by Automerger Merge Worker
Browse files

Merge "Move AvatarPicker to system_ext partition" into main am: 7ac8448f am: 1548b088 

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



Change-Id: I8e49d2a2e5a6430d3dea40126f279b26cca7705c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9d0d452b 1548b088

target/product/generic/Android.bp

+0 −5
Original line number Diff line number Diff line
@@ -884,11 +884,6 @@ system_image_defaults { 
                default: [

                    "framework-connectivity-b", // base_system

                ],

            }) + select(release_flag("RELEASE_AVATAR_PICKER_APP"), {

                true: [

                    "AvatarPicker", // generic_system (RELEASE_AVATAR_PICKER_APP)

                ],

                default: [],

            }) + select(release_flag("RELEASE_UPROBESTATS_MODULE"), {

                true: [

                    "com.android.uprobestats", // base_system (RELEASE_UPROBESTATS_MODULE)

target/product/handheld_system.mk

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ $(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk) 


PRODUCT_PACKAGES += \

    android.software.window_magnification.prebuilt.xml \

    $(if $(RELEASE_AVATAR_PICKER_APP), AvatarPicker,) \

    BasicDreams \

    BlockedNumberProvider \

    BluetoothMidiService \

target/product/handheld_system_ext.mk

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/media_system_ext.mk) 
# /system_ext packages

PRODUCT_PACKAGES += \

    AccessibilityMenu \

    $(if $(RELEASE_AVATAR_PICKER_APP), AvatarPicker,) \

    Launcher3QuickStep \

    Provision \

    Settings \