diff options
author | Bob Badour <bbadour@google.com> | 2021-02-19 13:06:22 -0800 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2021-02-19 23:38:28 +0000 |
commit | aa7d835fdd739881a907ac5c8a89a5dae01f6089 (patch) | |
tree | d85b4086e7cd0aedd28a071d5e1899f62b73695d /tests | |
parent | d29cac66b426d59afd7ce7da9519b6d43f5df0cc (diff) |
Add LOCAL_LICENSE_KINDS to bionic
Added SPDX-license-identifier-Apache-2.0 to:
apex/Android.bp
libdl/Android.bp
tools/Android.bp
tools/versioner/Android.bp
tools/versioner/src/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to:
benchmarks/Android.bp
benchmarks/linker_relocation/gen/Android.bp
libc/malloc_debug/Android.bp
libc/system_properties/Android.bp
tests/Android.bp
tests/libs/Android.bp
tests/libs/Android.build.dlext_testzip.mk
tests/make_fortify_compile_test.mk
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
SPDX-license-identifier-ISC SPDX-license-identifier-MIT
legacy_notice legacy_unencumbered
to:
libc/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
SPDX-license-identifier-MIT legacy_unencumbered
to:
libm/Android.bp
Added SPDX-license-identifier-Apache-2.0 legacy_unencumbered
to:
libc/tools/Android.bp
Added SPDX-license-identifier-BSD
to:
benchmarks/linker_relocation/Android.bp
benchmarks/spawn/Android.bp
libc/async_safe/Android.bp
libc/malloc_hooks/Android.bp
libfdtrack/Android.bp
linker/Android.bp
tests/headers/Android.bp
tests/headers/posix/Android.bp
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: Ib05bcaa276b3aa71a7654ccbe8e67e1f16aec9f3
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Android.bp | 16 | ||||
-rw-r--r-- | tests/headers/Android.bp | 4 | ||||
-rw-r--r-- | tests/headers/posix/Android.bp | 4 | ||||
-rw-r--r-- | tests/libs/Android.bp | 4 | ||||
-rw-r--r-- | tests/libs/Android.build.dlext_testzip.mk | 7 | ||||
-rw-r--r-- | tests/make_fortify_compile_test.mk | 3 |
6 files changed, 37 insertions, 1 deletions
diff --git a/tests/Android.bp b/tests/Android.bp index 58400187c..9b7e6f5b0 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -14,6 +14,22 @@ // limitations under the License. // +package { + default_applicable_licenses: ["bionic_tests_license"], +} + +license { + name: "bionic_tests_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-BSD", + ], + license_text: [ + "NOTICE", + ], +} + cc_defaults { name: "bionic_tests_defaults", host_supported: true, diff --git a/tests/headers/Android.bp b/tests/headers/Android.bp index b44c29601..76e41ca8d 100644 --- a/tests/headers/Android.bp +++ b/tests/headers/Android.bp @@ -1 +1,5 @@ +package { + default_applicable_licenses: ["bionic_tests_license"], +} + subdirs = ["*"] diff --git a/tests/headers/posix/Android.bp b/tests/headers/posix/Android.bp index 8f3a2f29b..0809cdbae 100644 --- a/tests/headers/posix/Android.bp +++ b/tests/headers/posix/Android.bp @@ -14,6 +14,10 @@ // limitations under the License. // +package { + default_applicable_licenses: ["bionic_tests_license"], +} + cc_library_static { name: "libbionic_tests_headers_posix", srcs: ["*.c"], diff --git a/tests/libs/Android.bp b/tests/libs/Android.bp index ba1c1989b..fabcd048e 100644 --- a/tests/libs/Android.bp +++ b/tests/libs/Android.bp @@ -14,6 +14,10 @@ // limitations under the License. // +package { + default_applicable_licenses: ["bionic_tests_license"], +} + cc_defaults { name: "bionic_testlib_defaults", host_supported: true, diff --git a/tests/libs/Android.build.dlext_testzip.mk b/tests/libs/Android.build.dlext_testzip.mk index 8775c2958..66ed343d9 100644 --- a/tests/libs/Android.build.dlext_testzip.mk +++ b/tests/libs/Android.build.dlext_testzip.mk @@ -24,6 +24,9 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := NATIVE_TESTS LOCAL_MODULE := libdlext_test_zip_zipaligned +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE LOCAL_MODULE_SUFFIX := .zip LOCAL_MODULE_PATH := $($(bionic_2nd_arch_prefix)TARGET_OUT_DATA_NATIVE_TESTS)/bionic-loader-test-libs/libdlext_test_zip LOCAL_2ND_ARCH_VAR_PREFIX := $(bionic_2nd_arch_prefix) @@ -49,6 +52,9 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := NATIVE_TESTS LOCAL_MODULE := libdlext_test_runpath_zip_zipaligned +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE LOCAL_MODULE_SUFFIX := .zip LOCAL_MODULE_PATH := $($(bionic_2nd_arch_prefix)TARGET_OUT_DATA_NATIVE_TESTS)/bionic-loader-test-libs/libdlext_test_runpath_zip LOCAL_2ND_ARCH_VAR_PREFIX := $(bionic_2nd_arch_prefix) @@ -94,4 +100,3 @@ $(LOCAL_BUILT_MODULE) : $(lib_d) $(lib_a) $(lib_b) $(lib_c) $(lib_x) $(lib_y) $( $(hide) touch $(dir $@)/zipdir/empty_file.txt $(hide) (cd $(dir $@)/zipdir && zip -qrD0 ../$(notdir $@).unaligned .) $(hide) $(BIONIC_TESTS_ZIPALIGN) 4096 $@.unaligned $@ - diff --git a/tests/make_fortify_compile_test.mk b/tests/make_fortify_compile_test.mk index c36dfddc2..ec0ba45a0 100644 --- a/tests/make_fortify_compile_test.mk +++ b/tests/make_fortify_compile_test.mk @@ -9,6 +9,9 @@ LOCAL_CXX := $(LOCAL_PATH)/touch-obj-on-success \ LOCAL_CLANG := true LOCAL_MODULE := bionic-compile-time-tests$(FORTIFY_LEVEL)-clang++ +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE LOCAL_TIDY := false LOCAL_CPPFLAGS := -Wall -Wno-error LOCAL_CPPFLAGS += -fno-color-diagnostics -ferror-limit=10000 -Xclang -verify |