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

Commit 97e73564 authored by Zhenhuang Wang's avatar Zhenhuang Wang Committed by Automerger Merge Worker
Browse files

Merge "Revert "Enable `-sha256` feature to some Soong built zip files"" am: 65ff0460 

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



Change-Id: I947c01778145669c5cb36d3645f1cd6d43988674
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5c8213b1 65ff0460

core/tasks/general-tests.mk

+1 −2
Original line number Diff line number Diff line
@@ -87,8 +87,7 @@ $(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 \

	  -sha256

	  -P target -C $(PRODUCT_OUT) -l $(PRIVATE_INTERMEDIATES_DIR)/target.list

	$(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

core/tasks/host-unit-tests.mk

+1 −1
Original line number Diff line number Diff line
@@ -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 -sha256

	  -P host/testcases -C $(HOST_OUT) -l $@-host-libs.list

	rm -f $@.list $@-host.list $@-target.list $@-host-libs.list



host-unit-tests: $(host_unit_tests_zip)

core/tasks/tools/compatibility.mk

+2 −2
Original line number Diff line number Diff line
@@ -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) -sha256

	$(SOONG_ZIP) -o $@ -P $(PRIVATE_SUBDIR)/jdk -C $(PRIVATE_JDK_DIR) -D $(PRIVATE_JDK_DIR)



$(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 -sha256

	$(SOONG_ZIP) -d -o $@.tmp -C $(dir $@) -l $@.list

	$(MERGE_ZIPS) $@ $@.tmp $(PRIVATE_JDK)

	rm -f $@.tmp

# Build a list of tests