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

Commit 68163da3 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "[bt] Add the Google module in pixel image" into main am: 871316df 

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



Change-Id: I86694771cd5859bb5baf0624979e08e5fc1b8aea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 742180b8 871316df

target/product/base_system.mk

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ PRODUCT_PACKAGES += \ 
    com.android.adbd \

    com.android.adservices \

    com.android.appsearch \

    com.android.btservices \

    com.android.bt \

    com.android.configinfrastructure \

    com.android.conscrypt \

    com.android.devicelock \

target/product/default_art_config.mk

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ PRODUCT_APEX_BOOT_JARS := \ 
    com.android.adservices:framework-adservices \

    com.android.adservices:framework-sdksandbox \

    com.android.appsearch:framework-appsearch \

    com.android.btservices:framework-bluetooth \

    com.android.bt:framework-bluetooth \

    com.android.configinfrastructure:framework-configinfrastructure \

    com.android.conscrypt:conscrypt \

    com.android.devicelock:framework-devicelock \
@@ -171,7 +171,7 @@ PRODUCT_STANDALONE_SYSTEM_SERVER_JARS := \ 
# Keep the list sorted by module names and then library names.

# Note: For modules available in Q, DO NOT add new entries here.

PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS := \

    com.android.btservices:service-bluetooth \

    com.android.bt:service-bluetooth \

    com.android.devicelock:service-devicelock \

    com.android.os.statsd:service-statsd \

    com.android.scheduling:service-scheduling \

tools/aconfig/aconfig_device_paths/mainline_aconfig_flags_paths.txt

+1 −1
Original line number Diff line number Diff line 
"/apex/com.android.adservices/etc/aconfig_flags.pb",

"/apex/com.android.appsearch/etc/aconfig_flags.pb",

"/apex/com.android.art/etc/aconfig_flags.pb",

"/apex/com.android.btservices/etc/aconfig_flags.pb",

"/apex/com.android.bt/etc/aconfig_flags.pb",

"/apex/com.android.cellbroadcast/etc/aconfig_flags.pb",

"/apex/com.android.configinfrastructure/etc/aconfig_flags.pb",

"/apex/com.android.conscrypt/etc/aconfig_flags.pb",