diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-02-21 00:09:09 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-02-21 00:09:09 +0000 |
commit | f6c51dd520ccd9e7f1c22509b1af22cf5ea9707b (patch) | |
tree | b440655b3eea1d82567b56f638e50a3b1b5979ab | |
parent | e6683bd089e0f5c162d6d93c0969f70e941a5922 (diff) | |
parent | 13ecf3dc9f80db2b6474d7a11f93a5e4cbd42942 (diff) | |
download | ndk-f6c51dd520ccd9e7f1c22509b1af22cf5ea9707b.tar.gz |
Snap for 7160059 from 13ecf3dc9f80db2b6474d7a11f93a5e4cbd42942 to sc-v2-release
Change-Id: Ia0578bb2ff458231bdccef1a8ec3f2797b3cc0f4
-rw-r--r-- | Android.bp | 33 | ||||
-rw-r--r-- | r21/sources/android/cpufeatures/Android.mk | 3 | ||||
-rw-r--r-- | r21/sources/android/native_app_glue/Android.mk | 3 | ||||
-rw-r--r-- | r21/sources/android/support/Android.mk | 6 | ||||
-rw-r--r-- | r21/sources/cxx-stl/llvm-libc++/Android.mk | 15 | ||||
-rw-r--r-- | r21/sources/cxx-stl/llvm-libc++abi/Android.mk | 6 |
6 files changed, 66 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index 0b0d81789..4bafd8785 100644 --- a/Android.bp +++ b/Android.bp @@ -1,3 +1,36 @@ +package { + default_applicable_licenses: ["prebuilts_ndk_license"], +} + +// Added automatically by a large-scale-change that took the approach of +// 'apply every license found to every target'. While this makes sure we respect +// every license restriction, it may not be entirely correct. +// +// e.g. GPL in an MIT project might only apply to the contrib/ directory. +// +// Please consider splitting the single license below into multiple licenses, +// taking care not to lose any license_kind information, and overriding the +// default license using the 'licenses: [...]' property on targets as needed. +// +// For unused files, consider creating a 'fileGroup' with "//visibility:private" +// to attach the license to, and including a comment whether the files may be +// used in the current project. +// See: http://go/android-license-faq +license { + name: "prebuilts_ndk_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-ISC", + "SPDX-license-identifier-MIT", + "SPDX-license-identifier-NCSA", + ], + license_text: [ + "NOTICE", + ], +} + libcxx_includes = [ "current/sources/cxx-stl/llvm-libc++/include", "current/sources/cxx-stl/llvm-libc++abi/include", diff --git a/r21/sources/android/cpufeatures/Android.mk b/r21/sources/android/cpufeatures/Android.mk index e42fdf8a2..7b53d2318 100644 --- a/r21/sources/android/cpufeatures/Android.mk +++ b/r21/sources/android/cpufeatures/Android.mk @@ -2,6 +2,9 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := cpufeatures +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE LOCAL_SRC_FILES := cpu-features.c LOCAL_CFLAGS := -Wall -Wextra -Werror LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) diff --git a/r21/sources/android/native_app_glue/Android.mk b/r21/sources/android/native_app_glue/Android.mk index e18a14eaf..a41b80f38 100644 --- a/r21/sources/android/native_app_glue/Android.mk +++ b/r21/sources/android/native_app_glue/Android.mk @@ -3,6 +3,9 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE:= android_native_app_glue +LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS:= notice +LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/NOTICE LOCAL_SRC_FILES:= android_native_app_glue.c LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) LOCAL_EXPORT_LDLIBS := -llog -landroid diff --git a/r21/sources/android/support/Android.mk b/r21/sources/android/support/Android.mk index c9a908f0a..b98f9afdb 100644 --- a/r21/sources/android/support/Android.mk +++ b/r21/sources/android/support/Android.mk @@ -9,6 +9,9 @@ LIBCXX_LIBS := ../../cxx-stl/llvm-libc++/libs/$(TARGET_ARCH_ABI) include $(CLEAR_VARS) LOCAL_MODULE := android_support +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE LOCAL_SRC_FILES := $(LIBCXX_LIBS)/lib$(LOCAL_MODULE)$(TARGET_LIB_EXTENSION) include $(PREBUILT_STATIC_LIBRARY) @@ -115,6 +118,9 @@ endif include $(CLEAR_VARS) LOCAL_MODULE := android_support +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE LOCAL_SRC_FILES := $(android_support_sources) LOCAL_C_INCLUDES := $(android_support_c_includes) LOCAL_CFLAGS := $(android_support_cflags) diff --git a/r21/sources/cxx-stl/llvm-libc++/Android.mk b/r21/sources/cxx-stl/llvm-libc++/Android.mk index 5bccc7439..a728c3497 100644 --- a/r21/sources/cxx-stl/llvm-libc++/Android.mk +++ b/r21/sources/cxx-stl/llvm-libc++/Android.mk @@ -88,6 +88,9 @@ libcxxabi_c_includes := $(LOCAL_PATH)/../llvm-libc++abi/include include $(CLEAR_VARS) LOCAL_MODULE := c++_static +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT SPDX-license-identifier-NCSA +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE)$(TARGET_LIB_EXTENSION) LOCAL_EXPORT_C_INCLUDES := $(libcxx_export_includes) LOCAL_STATIC_LIBRARIES := libc++abi @@ -111,6 +114,9 @@ include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := c++_shared +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT SPDX-license-identifier-NCSA +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE)$(TARGET_SONAME_EXTENSION) LOCAL_EXPORT_C_INCLUDES := \ $(libcxx_export_includes) \ @@ -138,6 +144,9 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) # we don't actually want to make the API available (yet). include $(CLEAR_VARS) LOCAL_MODULE := libunwind +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT SPDX-license-identifier-NCSA +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/$(LOCAL_MODULE)$(TARGET_LIB_EXTENSION) LOCAL_EXPORT_LDLIBS := -ldl include $(PREBUILT_STATIC_LIBRARY) @@ -152,6 +161,9 @@ $(call ndk_log,Rebuilding libc++ libraries from sources) include $(CLEAR_VARS) LOCAL_MODULE := c++_static +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT SPDX-license-identifier-NCSA +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE LOCAL_SRC_FILES := $(libcxx_sources) LOCAL_C_INCLUDES := $(libcxx_includes) LOCAL_CPPFLAGS := $(libcxx_cxxflags) -ffunction-sections -fdata-sections @@ -176,6 +188,9 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := c++_shared +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT SPDX-license-identifier-NCSA +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE LOCAL_STRIP_MODE := none LOCAL_SRC_FILES := $(libcxx_sources) LOCAL_C_INCLUDES := $(libcxx_includes) diff --git a/r21/sources/cxx-stl/llvm-libc++abi/Android.mk b/r21/sources/cxx-stl/llvm-libc++abi/Android.mk index 1788847df..790d5bc49 100644 --- a/r21/sources/cxx-stl/llvm-libc++abi/Android.mk +++ b/r21/sources/cxx-stl/llvm-libc++abi/Android.mk @@ -57,6 +57,9 @@ ifneq ($(LIBCXX_FORCE_REBUILD),true) # Using prebuilt include $(CLEAR_VARS) LOCAL_MODULE := libc++abi +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT SPDX-license-identifier-NCSA +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE.TXT $(LOCAL_PATH)/NOTICE LOCAL_SRC_FILES := ../llvm-libc++/libs/$(TARGET_ARCH_ABI)/$(LOCAL_MODULE)$(TARGET_LIB_EXTENSION) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include @@ -74,6 +77,9 @@ else # Building include $(CLEAR_VARS) LOCAL_MODULE := libc++abi +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT SPDX-license-identifier-NCSA +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE.TXT $(LOCAL_PATH)/NOTICE LOCAL_SRC_FILES := $(libcxxabi_src_files) LOCAL_C_INCLUDES := $(libcxxabi_includes) LOCAL_CPPFLAGS := $(libcxxabi_cppflags) |