diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-21 23:32:58 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-21 23:32:58 +0000 |
| commit | f9b7a8c582853d21c50cc0e0af033b32d147cff3 (patch) | |
| tree | 87f2b3d66b71b73cbabeafa130c15ae4b25c5146 | |
| parent | 013bf333b025323b2d35894278b4e111b4100038 (diff) | |
| parent | 7030ba39d7fd611ac8d5fa81c4aebb8f1f5751c5 (diff) | |
| download | build-android-mainline-11.0.0_r2.tar.gz | |
Snap for 6698269 from 7030ba39d7fd611ac8d5fa81c4aebb8f1f5751c5 to mainline-releaseandroid-mainline-11.0.0_r2
Change-Id: I28ef00a4141076424e3d6d987cfa57bc115f41e4
| -rw-r--r-- | core/tasks/cts.mk | 1 | ||||
| -rw-r--r-- | core/tasks/tools/compatibility.mk | 15 | ||||
| -rw-r--r-- | target/board/gsi_system_ext.prop | 2 | ||||
| -rw-r--r-- | target/board/gsi_system_ext_user.prop | 2 |
4 files changed, 14 insertions, 6 deletions
diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index f3b4368775..3b91b5e239 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -16,6 +16,7 @@ test_suite_name := cts test_suite_tradefed := cts-tradefed test_suite_dynamic_config := test/suite_harness/tools/cts-tradefed/DynamicConfig.xml test_suite_readme := test/suite_harness/tools/cts-tradefed/README +test_suite_notice := $(tools_notice_file_txt) include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk diff --git a/core/tasks/tools/compatibility.mk b/core/tasks/tools/compatibility.mk index 89b0b9b1bf..6899dbd785 100644 --- a/core/tasks/tools/compatibility.mk +++ b/core/tasks/tools/compatibility.mk @@ -46,20 +46,30 @@ test_tools += $(test_suite_tools) # Include host shared libraries host_shared_libs := $(call copy-many-files, $(COMPATIBILITY.$(test_suite_name).HOST_SHARED_LIBRARY.FILES)) +compatibility_zip_deps := $(test_artifacts) $(test_tools) $(test_suite_prebuilt_tools) $(test_suite_dynamic_config) $(SOONG_ZIP) $(host_shared_libs) +compatibility_zip_resources := $(out_dir)/tools $(out_dir)/testcases +ifdef test_suite_notice + compatibility_zip_deps += $(test_suite_notice) + compatibility_zip_resources += $(out_dir)/$(notdir $(test_suite_notice)) +endif + compatibility_zip := $(out_dir).zip $(compatibility_zip): PRIVATE_NAME := android-$(test_suite_name) $(compatibility_zip): PRIVATE_OUT_DIR := $(out_dir) $(compatibility_zip): PRIVATE_TOOLS := $(test_tools) $(test_suite_prebuilt_tools) $(compatibility_zip): PRIVATE_SUITE_NAME := $(test_suite_name) $(compatibility_zip): PRIVATE_DYNAMIC_CONFIG := $(test_suite_dynamic_config) -$(compatibility_zip): $(test_artifacts) $(test_tools) $(test_suite_prebuilt_tools) $(test_suite_dynamic_config) $(SOONG_ZIP) $(host_shared_libs) | $(ADB) $(ACP) +$(compatibility_zip): PRIVATE_NOTICE := $(test_suite_notice) +$(compatibility_zip): PRIVATE_RESOURCES := $(compatibility_zip_resources) +$(compatibility_zip): $(compatibility_zip_deps) | $(ADB) $(ACP) # Make dir structure $(hide) mkdir -p $(PRIVATE_OUT_DIR)/tools $(PRIVATE_OUT_DIR)/testcases $(hide) echo $(BUILD_NUMBER_FROM_FILE) > $(PRIVATE_OUT_DIR)/tools/version.txt # Copy tools $(hide) cp $(PRIVATE_TOOLS) $(PRIVATE_OUT_DIR)/tools $(if $(PRIVATE_DYNAMIC_CONFIG),$(hide) cp $(PRIVATE_DYNAMIC_CONFIG) $(PRIVATE_OUT_DIR)/testcases/$(PRIVATE_SUITE_NAME).dynamic) - $(hide) find $(PRIVATE_OUT_DIR)/tools $(PRIVATE_OUT_DIR)/testcases | sort >$@.list + $(if $(PRIVATE_NOTICE),$(hide) cp $(PRIVATE_NOTICE) $(PRIVATE_OUT_DIR)) + $(hide) find $(PRIVATE_RESOURCES) | sort >$@.list $(hide) $(SOONG_ZIP) -d -o $@ -C $(dir $@) -l $@.list # Reset all input variables @@ -69,4 +79,5 @@ test_suite_dynamic_config := test_suite_readme := test_suite_prebuilt_tools := test_suite_tools := +test_suite_notice := host_shared_libs := diff --git a/target/board/gsi_system_ext.prop b/target/board/gsi_system_ext.prop index dd3227efb2..f085b6140f 100644 --- a/target/board/gsi_system_ext.prop +++ b/target/board/gsi_system_ext.prop @@ -14,6 +14,4 @@ persist.sys.disable_rescue=true ro.control_privapp_permissions=disable # TODO(b/136212765): the default for LMK -ro.lmk.kill_heaviest_task=true ro.lmk.kill_timeout_ms=100 -ro.lmk.use_minfree_levels=true diff --git a/target/board/gsi_system_ext_user.prop b/target/board/gsi_system_ext_user.prop index db6d880b7a..de8c48741a 100644 --- a/target/board/gsi_system_ext_user.prop +++ b/target/board/gsi_system_ext_user.prop @@ -11,6 +11,4 @@ persist.sys.disable_rescue=true ro.control_privapp_permissions=disable # TODO(b/136212765): the default for LMK -ro.lmk.kill_heaviest_task=true ro.lmk.kill_timeout_ms=100 -ro.lmk.use_minfree_levels=true |