diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-23 14:30:11 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-23 14:30:11 +0000 |
commit | 33da0102ba555323de98159006c711e6ea07b151 (patch) | |
tree | d44461c371df65019d97618335581d401c69b143 | |
parent | 838a0719663c4a2a0174d4cfca5ccd14546dac22 (diff) | |
parent | 426dd8cf7b0dff76d748027da8bbb223da6627f3 (diff) | |
download | ndk-33da0102ba555323de98159006c711e6ea07b151.tar.gz |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to prebuilts/ndk" am: 50dac67963 am: 426dd8cf7b
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1649818
Change-Id: I836cded102b6ed3171eadf4b547547673631734a
-rw-r--r-- | r23/sources/android/cpufeatures/Android.mk | 3 | ||||
-rw-r--r-- | r23/sources/android/native_app_glue/Android.mk | 3 | ||||
-rw-r--r-- | r23/sources/android/support/Android.mk | 6 | ||||
-rw-r--r-- | r23/sources/cxx-stl/llvm-libc++/Android.mk | 12 | ||||
-rw-r--r-- | r23/sources/cxx-stl/llvm-libc++abi/Android.mk | 9 |
5 files changed, 33 insertions, 0 deletions
diff --git a/r23/sources/android/cpufeatures/Android.mk b/r23/sources/android/cpufeatures/Android.mk index e42fdf8a2..7b53d2318 100644 --- a/r23/sources/android/cpufeatures/Android.mk +++ b/r23/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/r23/sources/android/native_app_glue/Android.mk b/r23/sources/android/native_app_glue/Android.mk index e18a14eaf..a41b80f38 100644 --- a/r23/sources/android/native_app_glue/Android.mk +++ b/r23/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/r23/sources/android/support/Android.mk b/r23/sources/android/support/Android.mk index b6b9ce9b6..7cefed18e 100644 --- a/r23/sources/android/support/Android.mk +++ b/r23/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) @@ -116,6 +119,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/r23/sources/cxx-stl/llvm-libc++/Android.mk b/r23/sources/cxx-stl/llvm-libc++/Android.mk index 0415fb2c2..9c19a9ac9 100644 --- a/r23/sources/cxx-stl/llvm-libc++/Android.mk +++ b/r23/sources/cxx-stl/llvm-libc++/Android.mk @@ -92,6 +92,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 +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 @@ -112,6 +115,9 @@ include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := c++_shared +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +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) \ @@ -140,6 +146,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 +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 @@ -160,6 +169,9 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := c++_shared +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +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/r23/sources/cxx-stl/llvm-libc++abi/Android.mk b/r23/sources/cxx-stl/llvm-libc++abi/Android.mk index 4f88cfcf7..9b94bd94f 100644 --- a/r23/sources/cxx-stl/llvm-libc++abi/Android.mk +++ b/r23/sources/cxx-stl/llvm-libc++abi/Android.mk @@ -49,6 +49,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 @@ -64,6 +67,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) @@ -93,6 +99,9 @@ endif # Prebuilt/building # is linked statically even if a shared library dependency exports an unwinder. 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)/LICENSE.TXT $(LOCAL_PATH)/NOTICE LOCAL_SRC_FILES := $(NDK_TOOLCHAIN_LIB_DIR)/$(TARGET_TOOLCHAIN_ARCH_LIB_DIR)/libunwind.a include $(PREBUILT_STATIC_LIBRARY) |