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

Merge "Policy change: GPL+CE is permissive." am: 9a76135e44 am: 63a85ce166 am: 9434cd7754 am: 3be77f249e am: 9db6cad5dd

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

Change-Id: I75ef3d314d78e3493022e02757a92c8548af278e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bob Badour
2022-09-22 13:47:04 +00:00
committed by Automerger Merge Worker
parent 17ca8c7b04 9db6cad5dd
commit cd25d6134b
11 changed files with 101 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,7 +53,7 @@ $(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)
$(call declare-license-metadata,$(test_suite_jdk),SPDX-license-identifier-GPL-2.0-with-classpath-exception,restricted,\
$(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)))))
# Copy license metadata