diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-10-14 19:42:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-14 19:42:35 +0000 |
| commit | 67352912e8852540a2d2907bf66ae38d910de7cf (patch) | |
| tree | 405db61133a22c5b4fe5721e9035bfa18607479d | |
| parent | 059a8dc2ea4ece2e9b236cf83c667a1001d047fb (diff) | |
| parent | 3b24dc2b5377c8b46337b79743ef17a1975bac2a (diff) | |
| download | libvpx-67352912e8852540a2d2907bf66ae38d910de7cf.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libvpx" am: 38dba97777 am: 3b24dc2b53
Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1858286
Change-Id: Ied9dbebf9a6388ea6570a7ebee7bcc136c4358a9
| -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) |