diff options
| -rw-r--r-- | core/android_soong_config_vars.mk | 3 | ||||
| -rw-r--r-- | target/product/base_system.mk | 8 | ||||
| -rw-r--r-- | target/product/default_art_config.mk | 12 | ||||
| -rw-r--r-- | target/product/generic/Android.bp | 6 |
4 files changed, 26 insertions, 3 deletions
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 8e70570acc..6040ad335c 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -202,6 +202,9 @@ $(call soong_config_set,bootclasspath,release_crashrecovery_module,$(RELEASE_CRA $(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 diff --git a/target/product/base_system.mk b/target/product/base_system.mk index b9b226b863..2907e07ee5 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -96,7 +96,6 @@ PRODUCT_PACKAGES += \ enhanced-confirmation.xml \ ExtShared \ flags_health_check \ - framework-connectivity-b \ framework-graphics \ framework-location \ framework-minus-apex \ @@ -348,6 +347,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 diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk index 83d9215a9b..d857e04b69 100644 --- a/target/product/default_art_config.mk +++ b/target/product/default_art_config.mk @@ -51,7 +51,6 @@ PRODUCT_BOOT_JARS += \ framework-minus-apex \ framework-graphics \ framework-location \ - framework-connectivity-b \ ext \ telephony-common \ voip-common \ @@ -121,6 +120,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. diff --git a/target/product/generic/Android.bp b/target/product/generic/Android.bp index 4a3d21bee8..66bf694645 100644 --- a/target/product/generic/Android.bp +++ b/target/product/generic/Android.bp @@ -705,7 +705,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 @@ -734,6 +733,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) |