diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-10-14 20:10:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-14 20:10:56 +0000 |
| commit | 0be748482e0f2e67610bb6ae61e68515a4129a34 (patch) | |
| tree | 405db61133a22c5b4fe5721e9035bfa18607479d | |
| parent | 1ff5a0a01dabaf7d5ac7b1a3ffe3eba9f315d4e0 (diff) | |
| parent | c3c63226a05dacbea1cbe759f4c46a4c3ed09174 (diff) | |
| download | libvpx-0be748482e0f2e67610bb6ae61e68515a4129a34.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libvpx" am: 38dba97777 am: 3b24dc2b53 am: 67352912e8 am: c3c63226a0
Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1858286
Change-Id: I19aa78b1e181e952fb0960451fb7cb6965cc9e01
| -rw-r--r-- | libvpx/third_party/libwebm/Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libvpx/third_party/libwebm/Android.mk b/libvpx/third_party/libwebm/Android.mk index 3b3dd1d39..23f935f2d 100644 --- a/libvpx/third_party/libwebm/Android.mk +++ b/libvpx/third_party/libwebm/Android.mk @@ -14,4 +14,7 @@ LOCAL_SRC_FILES:= common/file_util.cc \ mkvmuxer/mkvmuxer.cc \ mkvmuxer/mkvmuxerutil.cc \ mkvmuxer/mkvwriter.cc +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE.TXT $(LOCAL_PATH)/PATENTS.TXT include $(BUILD_STATIC_LIBRARY) |