diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-22 10:21:10 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-22 10:21:10 +0000 |
commit | bd1a5f3fb8d72d9aa00d548b1c00211bea4d79a1 (patch) | |
tree | ec5e790d679535e1a7cde61125e5cc6d0dae42dd | |
parent | 614a8f1d22177d5d69842bfc187e6465c102ccda (diff) | |
parent | 45bba9ec661a22260b928721b0fdfc664ceb37bc (diff) | |
download | dalvik-bd1a5f3fb8d72d9aa00d548b1c00211bea4d79a1.tar.gz |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to dalvik" am: 120c5bf00b am: 45bba9ec66
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1588394
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9c7806df2df5054a174cb15f4293a5b9ba8d94f0
-rw-r--r-- | Android.bp | 17 | ||||
-rw-r--r-- | dexgen/Android.bp | 9 | ||||
-rw-r--r-- | dx/Android.bp | 17 | ||||
-rw-r--r-- | dx/Android.mk | 20 | ||||
-rw-r--r-- | dx/junit-tests/Android.bp | 9 | ||||
-rw-r--r-- | dx/src/Android.bp | 9 | ||||
-rw-r--r-- | tools/dexdeps/Android.bp | 9 | ||||
-rw-r--r-- | tools/dexdeps/src/Android.bp | 9 | ||||
-rw-r--r-- | tools/hprof-conv/Android.bp | 9 |
9 files changed, 106 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index 702d27da4..72c293855 100644 --- a/Android.bp +++ b/Android.bp @@ -1,3 +1,20 @@ +package { + default_applicable_licenses: ["dalvik_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "dalvik_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} + subdirs = [ "dx", "tools/hprof-conv", diff --git a/dexgen/Android.bp b/dexgen/Android.bp index fc98bc39f..e0e732392 100644 --- a/dexgen/Android.bp +++ b/dexgen/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "dalvik_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["dalvik_license"], +} + java_library { name: "dexgen", sdk_version: "4", diff --git a/dx/Android.bp b/dx/Android.bp index b2d1ce1ba..bb2a68f43 100644 --- a/dx/Android.bp +++ b/dx/Android.bp @@ -7,6 +7,23 @@ // dx java library // ============================================================ +package { + default_applicable_licenses: ["dalvik_dx_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "dalvik_dx_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} + java_binary_host { name: "dx", wrapper: "etc/dx", diff --git a/dx/Android.mk b/dx/Android.mk index c6aa01dd4..78d2d40c2 100644 --- a/dx/Android.mk +++ b/dx/Android.mk @@ -16,6 +16,9 @@ LOCAL_IS_HOST_MODULE := true LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_MODULE_TAGS := optional LOCAL_MODULE := mainDexClasses.rules +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE include $(BUILD_SYSTEM)/base_rules.mk @@ -35,6 +38,9 @@ LOCAL_IS_HOST_MODULE := true LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_MODULE_TAGS := optional LOCAL_MODULE := mainDexClassesNoAapt.rules +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE include $(BUILD_SYSTEM)/base_rules.mk @@ -54,6 +60,9 @@ LOCAL_IS_HOST_MODULE := true LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_MODULE_TAGS := optional LOCAL_MODULE := shrinkedAndroid +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE LOCAL_BUILT_MODULE_STEM := shrinkedAndroid.jar LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX) @@ -77,6 +86,9 @@ LOCAL_IS_HOST_MODULE := true LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_MODULE_TAGS := optional LOCAL_MODULE := mainDexClasses +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE include $(BUILD_SYSTEM)/base_rules.mk @@ -99,6 +111,9 @@ LOCAL_IS_HOST_MODULE := true LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_MODULE_TAGS := optional LOCAL_MODULE := jasmin +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE include $(BUILD_SYSTEM)/base_rules.mk @@ -117,6 +132,9 @@ LOCAL_IS_HOST_MODULE := true LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_MODULE_TAGS := optional LOCAL_MODULE := jasmin.jar +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE include $(BUILD_SYSTEM)/base_rules.mk @@ -126,5 +144,3 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/jasmin.jar | $(ACP) $(hide) chmod 644 $@ INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE) - - diff --git a/dx/junit-tests/Android.bp b/dx/junit-tests/Android.bp index 9caeb9629..c508430b3 100644 --- a/dx/junit-tests/Android.bp +++ b/dx/junit-tests/Android.bp @@ -1,5 +1,14 @@ // Copyright 2011 The Android Open Source Project +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "dalvik_dx_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["dalvik_dx_license"], +} + java_test_host { name: "dx-tests", srcs: ["**/*.java"], diff --git a/dx/src/Android.bp b/dx/src/Android.bp index 177382d01..62c65d7a5 100644 --- a/dx/src/Android.bp +++ b/dx/src/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "dalvik_dx_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["dalvik_dx_license"], +} + droidstubs_host { name: "dx-doc-stubs", srcs: [ diff --git a/tools/dexdeps/Android.bp b/tools/dexdeps/Android.bp index 98b3aba6c..3d914bf7e 100644 --- a/tools/dexdeps/Android.bp +++ b/tools/dexdeps/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "dalvik_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["dalvik_license"], +} + java_binary_host { name: "dexdeps", manifest: "etc/manifest.txt", diff --git a/tools/dexdeps/src/Android.bp b/tools/dexdeps/src/Android.bp index b70586a24..1181bda2b 100644 --- a/tools/dexdeps/src/Android.bp +++ b/tools/dexdeps/src/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "dalvik_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["dalvik_license"], +} + droidstubs { name: "dexdeps-doc-stubs", srcs: [ diff --git a/tools/hprof-conv/Android.bp b/tools/hprof-conv/Android.bp index 4a7a317cd..ca5343e07 100644 --- a/tools/hprof-conv/Android.bp +++ b/tools/hprof-conv/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "dalvik_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["dalvik_license"], +} + cc_binary_host { name: "hprof-conv", srcs: ["HprofConv.c"], |