diff options
author | Bob Badour <bbadour@google.com> | 2021-02-26 02:58:09 -0800 |
---|---|---|
committer | Bob Badour <bbadour@google.com> | 2021-02-26 02:58:09 -0800 |
commit | d25457b57fac0006a80e7eb407fa255e86904b7c (patch) | |
tree | d2a46f7ca87bed778815d65cb33db9e1c3c89990 /googletest | |
parent | e9a0041e2546f591da22ed51f57ac5b98a4f0bf4 (diff) | |
download | googletest-d25457b57fac0006a80e7eb407fa255e86904b7c.tar.gz |
[LSC] Add LOCAL_LICENSE_KINDS to external/googletest
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to:
Android.bp
googlemock/Android.bp
Added SPDX-license-identifier-BSD to:
googlemock/test/Android.bp
googletest/Android.bp
googletest/Android.mk
googletest/test/Android.bp
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: I2db677d4f762c0a87cc8fc759ae67ca27a21c8fa
Diffstat (limited to 'googletest')
-rw-r--r-- | googletest/Android.bp | 9 | ||||
-rw-r--r-- | googletest/Android.mk | 18 | ||||
-rw-r--r-- | googletest/test/Android.bp | 9 |
3 files changed, 36 insertions, 0 deletions
diff --git a/googletest/Android.bp b/googletest/Android.bp index 47ef71c2..26a372ea 100644 --- a/googletest/Android.bp +++ b/googletest/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 "external_googletest_license" + // to get the below license kinds: + // SPDX-license-identifier-BSD + default_applicable_licenses: ["external_googletest_license"], +} + cc_defaults { name: "libgtest_defaults", export_include_dirs: ["include"], diff --git a/googletest/Android.mk b/googletest/Android.mk index 38a44db8..19060e8c 100644 --- a/googletest/Android.mk +++ b/googletest/Android.mk @@ -85,6 +85,9 @@ endef include $(CLEAR_VARS) LOCAL_MODULE := libgtest +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../LICENSE LOCAL_SRC_FILES := src/gtest-all.cc LOCAL_C_INCLUDES := $(LOCAL_PATH)/src $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include @@ -95,6 +98,9 @@ include $(BUILD_STATIC_LIBRARY) # Users don't need to manually depend on both. include $(CLEAR_VARS) LOCAL_MODULE := libgtest_main +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../LICENSE LOCAL_SRC_FILES := src/gtest_main.cc LOCAL_C_INCLUDES := $(LOCAL_PATH)/src $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include @@ -108,6 +114,9 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := googletest_static +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../LICENSE LOCAL_SRC_FILES := src/gtest-all.cc LOCAL_C_INCLUDES := $(LOCAL_PATH)/src $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include @@ -116,6 +125,9 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := libgoogletest_main +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../LICENSE LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := src/gtest_main.cc LOCAL_C_INCLUDES := $(LOCAL_PATH)/src $(LOCAL_PATH)/include @@ -128,6 +140,9 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := googletest_shared +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../LICENSE LOCAL_SRC_FILES := src/gtest-all.cc LOCAL_C_INCLUDES := $(LOCAL_PATH)/src $(LOCAL_PATH)/include LOCAL_CFLAGS := -DGTEST_CREATE_SHARED_LIBRARY @@ -137,6 +152,9 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := googletest_main_shared +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../LICENSE LOCAL_SRC_FILES := src/gtest_main.cc LOCAL_C_INCLUDES := $(LOCAL_PATH)/src $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include diff --git a/googletest/test/Android.bp b/googletest/test/Android.bp index 6a36a068..4b000128 100644 --- a/googletest/test/Android.bp +++ b/googletest/test/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 "external_googletest_license" + // to get the below license kinds: + // SPDX-license-identifier-BSD + default_applicable_licenses: ["external_googletest_license"], +} + cc_defaults { name: "gtest_test_defaults", host_supported: true, |