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

Commit b559097e authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

Merge "Include VCN in apex based on the build system flag" into main am: 28b1eb53 am: 39dcc253 

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



Change-Id: I3346d5c16cd6217debd50f0f705ea0634728e2d7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 301fc24b 39dcc253

core/android_soong_config_vars.mk

+3 −0
Original line number Diff line number Diff line
@@ -232,6 +232,9 @@ endif 
$(call soong_config_set,ANDROID,release_package_profiling_module,$(RELEASE_PACKAGE_PROFILING_MODULE))

$(call soong_config_set,bootclasspath,release_package_profiling_module,$(RELEASE_PACKAGE_PROFILING_MODULE))



# Move VCN from platform to the Tethering module; used by both platform and module

$(call soong_config_set,ANDROID,is_vcn_in_mainline,$(RELEASE_MOVE_VCN_TO_MAINLINE))



# Add perf-setup build flag to soong

# Note: BOARD_PERFSETUP_SCRIPT location must be under platform_testing/scripts/perf-setup/.

ifdef BOARD_PERFSETUP_SCRIPT

target/product/base_system.mk

+7 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ PRODUCT_PACKAGES += \ 
    enhanced-confirmation.xml \

    ExtShared \

    flags_health_check \

    framework-connectivity-b \

    framework-graphics \

    framework-location \

    framework-minus-apex \
@@ -371,6 +370,13 @@ ifeq ($(RELEASE_USE_WEBVIEW_BOOTSTRAP_MODULE),true) 
        com.android.webview.bootstrap

endif



# Only add the jar when it is not in the Tethering module. Otherwise,

# it will be added via com.android.tethering

ifneq ($(RELEASE_MOVE_VCN_TO_MAINLINE),true)

    PRODUCT_PACKAGES += \

        framework-connectivity-b

endif



ifneq (,$(RELEASE_RANGING_STACK))

    PRODUCT_PACKAGES += \

        com.android.ranging

target/product/default_art_config.mk

+11 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ PRODUCT_BOOT_JARS += \ 
    framework-minus-apex \

    framework-graphics \

    framework-location \

    framework-connectivity-b \

    ext \

    telephony-common \

    voip-common \
@@ -137,6 +136,17 @@ ifneq (,$(RELEASE_RANGING_STACK)) 
    $(call soong_config_set,bootclasspath,release_ranging_stack,true)

endif



# Check if VCN should be built into the tethering module or not

ifeq ($(RELEASE_MOVE_VCN_TO_MAINLINE),true)

    PRODUCT_APEX_BOOT_JARS += \

        com.android.tethering:framework-connectivity-b \



else

    PRODUCT_BOOT_JARS += \

        framework-connectivity-b \



endif



# List of system_server classpath jars delivered via apex.

# Keep the list sorted by module names and then library names.

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

target/product/generic/Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -700,7 +700,6 @@ android_filesystem_defaults { 
                "framework-graphics", // base_system

                "framework-location", // base_system

                "framework-minus-apex-install-dependencies", // base_system

                "framework-connectivity-b", // base_system

                "framework_compatibility_matrix.device.xml",

                "generic_system_fonts", // ok

                "hwservicemanager_compat_symlink_module", // base_system
@@ -738,6 +737,11 @@ android_filesystem_defaults { 
                    "com.android.profiling", // base_system (RELEASE_PACKAGE_PROFILING_MODULE)

                ],

                default: [],

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

                true: [],

                default: [

                    "framework-connectivity-b", // base_system

                ],

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

                true: [

                    "AvatarPicker", // generic_system (RELEASE_AVATAR_PICKER_APP)