diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-10-12 19:09:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-12 19:09:56 +0000 |
| commit | acb8f108be8eea4fef2ffc747297fa948e70f979 (patch) | |
| tree | 4a4dc4365c8f891f15d8f661c009646f48125006 | |
| parent | f9b99e6c562185a0d693ece82ec0adaff7e3a6df (diff) | |
| parent | b864104f9081c28446ea14ecc33a2522a8e69c87 (diff) | |
| download | libvpx-acb8f108be8eea4fef2ffc747297fa948e70f979.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libvpx" am: b864104f90
Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1853628
Change-Id: Ic4d2a7bb3302c1973969436bf040e12d6277faa2
| -rw-r--r-- | libvpx/test/android/Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libvpx/test/android/Android.mk b/libvpx/test/android/Android.mk index 7318de2fc..87155fcb5 100644 --- a/libvpx/test/android/Android.mk +++ b/libvpx/test/android/Android.mk @@ -34,6 +34,9 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/third_party/googletest/src/ LOCAL_C_INCLUDES += $(LOCAL_PATH)/third_party/googletest/src/include/ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/third_party/googletest/src/include/ LOCAL_SRC_FILES := ./third_party/googletest/src/src/gtest-all.cc +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE $(LOCAL_PATH)/../../PATENTS include $(BUILD_STATIC_LIBRARY) #libvpx_test @@ -48,6 +51,9 @@ else LOCAL_STATIC_LIBRARIES += vpx endif +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE $(LOCAL_PATH)/../../PATENTS include $(LOCAL_PATH)/test/test.mk LOCAL_C_INCLUDES := $(BINDINGS_DIR) FILTERED_SRC := $(sort $(filter %.cc %.c, $(LIBVPX_TEST_SRCS-yes))) |