From 23d8c72472f5d7894ed8636d27b5af004f7ca871 Mon Sep 17 00:00:00 2001 From: Zhenhuang Wang Date: Tue, 14 Feb 2023 00:29:30 +0000 Subject: [PATCH] Revert "Revert "Enable `-sha256` feature to some Soong built zip files"" This reverts commit 7d8eeec0ddae9c5a7524f6fe2fa15c95623ccacd. Reason for revert: re-submit the change https://r.android.com/2393272 Change-Id: I6c906a82823a4b69d0cd8a5ce364d802c646cb68 --- core/tasks/general-tests.mk | 3 ++- core/tasks/host-unit-tests.mk | 2 +- core/tasks/tools/compatibility.mk | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/tasks/general-tests.mk b/core/tasks/general-tests.mk index 5726ee20b5..8dbc76f131 100644 --- a/core/tasks/general-tests.mk +++ b/core/tasks/general-tests.mk @@ -87,7 +87,8 @@ $(general_tests_zip) : $(COMPATIBILITY.general-tests.FILES) $(general_tests_tool $(SOONG_ZIP) -d -o $@ \ -P host -C $(PRIVATE_INTERMEDIATES_DIR) -D $(PRIVATE_INTERMEDIATES_DIR)/tools \ -P host -C $(HOST_OUT) -l $(PRIVATE_INTERMEDIATES_DIR)/host.list \ - -P target -C $(PRODUCT_OUT) -l $(PRIVATE_INTERMEDIATES_DIR)/target.list + -P target -C $(PRODUCT_OUT) -l $(PRIVATE_INTERMEDIATES_DIR)/target.list \ + -sha256 $(SOONG_ZIP) -d -o $(PRIVATE_general_tests_configs_zip) \ -P host -C $(HOST_OUT) -l $(PRIVATE_INTERMEDIATES_DIR)/host-test-configs.list \ -P target -C $(PRODUCT_OUT) -l $(PRIVATE_INTERMEDIATES_DIR)/target-test-configs.list diff --git a/core/tasks/host-unit-tests.mk b/core/tasks/host-unit-tests.mk index ed2f2a68c3..733a2e258c 100644 --- a/core/tasks/host-unit-tests.mk +++ b/core/tasks/host-unit-tests.mk @@ -41,7 +41,7 @@ $(host_unit_tests_zip) : $(COMPATIBILITY.host-unit-tests.FILES) $(my_host_shared grep $(TARGET_OUT_TESTCASES) $@.list > $@-target.list || true $(hide) $(SOONG_ZIP) -d -o $@ -P host -C $(HOST_OUT) -l $@-host.list \ -P target -C $(PRODUCT_OUT) -l $@-target.list \ - -P host/testcases -C $(HOST_OUT) -l $@-host-libs.list + -P host/testcases -C $(HOST_OUT) -l $@-host-libs.list -sha256 rm -f $@.list $@-host.list $@-target.list $@-host-libs.list host-unit-tests: $(host_unit_tests_zip) diff --git a/core/tasks/tools/compatibility.mk b/core/tasks/tools/compatibility.mk index a5f162af63..94008909cc 100644 --- a/core/tasks/tools/compatibility.mk +++ b/core/tasks/tools/compatibility.mk @@ -51,7 +51,7 @@ $(test_suite_jdk): PRIVATE_JDK_DIR := $(test_suite_jdk_dir) $(test_suite_jdk): PRIVATE_SUBDIR := $(test_suite_subdir) $(test_suite_jdk): $(shell find $(test_suite_jdk_dir) -type f | sort) $(test_suite_jdk): $(SOONG_ZIP) - $(SOONG_ZIP) -o $@ -P $(PRIVATE_SUBDIR)/jdk -C $(PRIVATE_JDK_DIR) -D $(PRIVATE_JDK_DIR) + $(SOONG_ZIP) -o $@ -P $(PRIVATE_SUBDIR)/jdk -C $(PRIVATE_JDK_DIR) -D $(PRIVATE_JDK_DIR) -sha256 $(call declare-license-metadata,$(test_suite_jdk),SPDX-license-identifier-GPL-2.0-with-classpath-exception,permissive,\ $(test_suite_jdk_dir)/legal/java.base/LICENSE,JDK,prebuilts/jdk/$(notdir $(patsubst %/,%,$(dir $(test_suite_jdk_dir))))) @@ -123,7 +123,7 @@ $(compatibility_zip): $(compatibility_zip_deps) | $(ADB) $(ACP) cp $(PRIVATE_TOOLS) $(PRIVATE_OUT_DIR)/tools $(if $(PRIVATE_DYNAMIC_CONFIG),$(hide) cp $(PRIVATE_DYNAMIC_CONFIG) $(PRIVATE_OUT_DIR)/testcases/$(PRIVATE_SUITE_NAME).dynamic) find $(PRIVATE_RESOURCES) | sort >$@.list - $(SOONG_ZIP) -d -o $@.tmp -C $(dir $@) -l $@.list + $(SOONG_ZIP) -d -o $@.tmp -C $(dir $@) -l $@.list -sha256 $(MERGE_ZIPS) $@ $@.tmp $(PRIVATE_JDK) rm -f $@.tmp # Build a list of tests