diff options
| -rw-r--r-- | ci/build_test_suites.py | 9 | ||||
| -rw-r--r-- | core/android_soong_config_vars.mk | 11 | ||||
| -rw-r--r-- | core/main.mk | 2 | ||||
| -rw-r--r-- | core/robolectric_test_config_template.xml | 3 | ||||
| -rw-r--r-- | core/soong_config.mk | 2 | ||||
| -rw-r--r-- | target/product/generic_ramdisk.mk | 1 | ||||
| -rw-r--r-- | target/product/gsi_release.mk | 1 |
7 files changed, 19 insertions, 10 deletions
diff --git a/ci/build_test_suites.py b/ci/build_test_suites.py index 0ab6dabae0..d81248b496 100644 --- a/ci/build_test_suites.py +++ b/ci/build_test_suites.py @@ -84,14 +84,14 @@ class BuildPlanner: packaging_commands_getters = [] # In order to roll optimizations out differently between test suites and # device builds, we have separate flags. - enable_discovery = ('test_suites_zip_test_discovery' + enable_discovery = (('test_suites_zip_test_discovery' in self.build_context.enabled_build_features and not self.args.device_build ) or ( 'device_zip_test_discovery' in self.build_context.enabled_build_features and self.args.device_build - ) + )) and not self.args.test_discovery_info_mode logging.info(f'Discovery mode is enabled= {enable_discovery}') preliminary_build_targets = self._collect_preliminary_build_targets(enable_discovery) @@ -252,6 +252,11 @@ def parse_args(argv: list[str]) -> argparse.Namespace: action='store_true', help='Flag to indicate running a device build.', ) + argparser.add_argument( + '--test_discovery_info_mode', + action='store_true', + help='Flag to enable running test discovery in info only mode.', + ) return argparser.parse_args(argv) diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 73831dcfab..b30e025312 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -39,12 +39,15 @@ $(call soong_config_set_bool,ANDROID,RELEASE_BOARD_API_LEVEL_FROZEN,$(RELEASE_BO $(call add_soong_config_var,ANDROID,TARGET_DYNAMIC_64_32_DRMSERVER) $(call add_soong_config_var,ANDROID,TARGET_ENABLE_MEDIADRM_64) $(call add_soong_config_var,ANDROID,TARGET_DYNAMIC_64_32_MEDIASERVER) -$(call soong_config_set_bool,ANDROID,TARGET_SUPPORTS_32_BIT_APPS,$(if $(TARGET_SUPPORTS_32_BIT_APPS),true,false)) -$(call soong_config_set_bool,ANDROID,TARGET_SUPPORTS_64_BIT_APPS,$(if $(TARGET_SUPPORTS_64_BIT_APPS),true,false)) +$(call soong_config_set_bool,ANDROID,TARGET_SUPPORTS_32_BIT_APPS,$(if $(filter true,$(TARGET_SUPPORTS_32_BIT_APPS)),true,false)) +$(call soong_config_set_bool,ANDROID,TARGET_SUPPORTS_64_BIT_APPS,$(if $(filter true,$(TARGET_SUPPORTS_64_BIT_APPS)),true,false)) $(call add_soong_config_var,ANDROID,BOARD_GENFS_LABELS_VERSION) $(call add_soong_config_var,ANDROID,ADDITIONAL_M4DEFS,$(if $(BOARD_SEPOLICY_M4DEFS),$(addprefix -D,$(BOARD_SEPOLICY_M4DEFS)))) +# For BUILDING_GSI +$(call soong_config_set_bool,gsi,building_gsi,$(if $(filter true,$(BUILDING_GSI)),true,false)) + # For bootable/recovery RECOVERY_API_VERSION := 3 RECOVERY_FSTAB_VERSION := 2 @@ -124,10 +127,6 @@ ifdef TARGET_BOOTS_16K $(call soong_config_set_bool,ANDROID,target_boots_16k,$(filter true,$(TARGET_BOOTS_16K))) endif -ifdef PRODUCT_MEMCG_V2_FORCE_ENABLED -$(call add_soong_config_var_value,ANDROID,memcg_v2_force_enabled,$(PRODUCT_MEMCG_V2_FORCE_ENABLED)) -endif - ifdef PRODUCT_CGROUP_V2_SYS_APP_ISOLATION_ENABLED $(call add_soong_config_var_value,ANDROID,cgroup_v2_sys_app_isolation,$(PRODUCT_CGROUP_V2_SYS_APP_ISOLATION_ENABLED)) else diff --git a/core/main.mk b/core/main.mk index da5d49c7f8..cdf6acd58d 100644 --- a/core/main.mk +++ b/core/main.mk @@ -305,7 +305,7 @@ subdir_makefiles_total := $(words int $(subdir_makefiles) post finish) $(foreach mk,$(subdir_makefiles),$(info [$(call inc_and_print,subdir_makefiles_inc)/$(subdir_makefiles_total)] including $(mk) ...)$(eval include $(mk))) # Build bootloader.img/radio.img, and unpack the partitions. --include vendor/google/build/tasks/tools/update_bootloader_radio_image.mk +-include vendor/google_devices/$(TARGET_SOC)/prebuilts/misc_bins/update_bootloader_radio_image.mk # For an unbundled image, we can skip blueprint_tools because unbundled image # aims to remove a large number framework projects from the manifest, the diff --git a/core/robolectric_test_config_template.xml b/core/robolectric_test_config_template.xml index 1956b6eddf..2e4f700c33 100644 --- a/core/robolectric_test_config_template.xml +++ b/core/robolectric_test_config_template.xml @@ -32,6 +32,9 @@ {EXTRA_CONFIGS} <test class="com.android.tradefed.testtype.IsolatedHostTest" > + + {EXTRA_TEST_RUNNER_CONFIGS} + <option name="jar" value="{MODULE}.jar" /> <option name="java-flags" value="--add-modules=jdk.compiler"/> <option name="java-flags" value="--add-opens=java.base/java.lang=ALL-UNNAMED"/> diff --git a/core/soong_config.mk b/core/soong_config.mk index adfdb9c417..48565f46a2 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -196,6 +196,8 @@ $(call add_json_str, OemPath, $(TARGET_COPY_OUT_OEM)) $(call add_json_bool, MinimizeJavaDebugInfo, $(filter true,$(PRODUCT_MINIMIZE_JAVA_DEBUG_INFO))) $(call add_json_str, RecoveryPath, $(TARGET_COPY_OUT_RECOVERY)) $(call add_json_bool, BuildingRecoveryImage, $(BUILDING_RECOVERY_IMAGE)) +$(call add_json_str, UserdataPath, $(TARGET_COPY_OUT_DATA)) +$(call add_json_bool, BuildingUserdataImage, $(BUILDING_USERDATA_IMAGE)) $(call add_json_bool, UseGoma, $(filter-out false,$(USE_GOMA))) $(call add_json_bool, UseRBE, $(filter-out false,$(USE_RBE))) diff --git a/target/product/generic_ramdisk.mk b/target/product/generic_ramdisk.mk index 5ecb55fca8..32277ece03 100644 --- a/target/product/generic_ramdisk.mk +++ b/target/product/generic_ramdisk.mk @@ -24,6 +24,7 @@ PRODUCT_PACKAGES += \ init_first_stage \ snapuserd_ramdisk \ ramdisk-build.prop \ + toolbox_ramdisk \ # Debug ramdisk PRODUCT_PACKAGES += \ diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk index c288ad064a..115b355920 100644 --- a/target/product/gsi_release.mk +++ b/target/product/gsi_release.mk @@ -27,7 +27,6 @@ # BUILDING_GSI := true -$(call soong_config_set_bool,gsi,building_gsi,true) PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \ system/etc/init/config \ |