StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only search for test suite jdk files once" am: 6961b14269 am: e72f71968a am: 7de4d04c10

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2585683

Change-Id: I1dd51d6b64e045fa2a6a38432c70357cfec9539b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-12 07:49:20 +00:00
committed by Automerger Merge Worker
parent f32297eb62 7de4d04c10
commit dba7b2e967
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/tasks/tools/compatibility.mk
View File

@@ -44,10 +44,16 @@ test_tools += $(test_suite_tools)
# The JDK to package into the test suite zip file. Always package the linux JDK.
test_suite_jdk_dir := $(ANDROID_JAVA_HOME)/../linux-x86
ifndef test_suite_jdk_files
# This file gets included many times, so make sure we only run the $(shell) once.
# Otherwise it will slow down every build due to all copies of it being rerun when kati
# checks the stamp file.
test_suite_jdk_files :=$= $(shell find $(test_suite_jdk_dir) -type f | sort)
endif
test_suite_jdk := $(call intermediates-dir-for,PACKAGING,$(test_suite_name)_jdk,HOST)/jdk.zip
$(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): $(test_suite_jdk_files)
$(test_suite_jdk): $(SOONG_ZIP)
$(SOONG_ZIP) -o $@ -P $(PRIVATE_SUBDIR)/jdk -C $(PRIVATE_JDK_DIR) -D $(PRIVATE_JDK_DIR) -sha256