diff options
author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2022-08-25 21:51:23 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-08-25 21:51:23 +0000 |
commit | c8f90691024501e957c5466df62c0a91b2866577 (patch) | |
tree | e4e9c86656d92ad19e0fcc3fae39a0116c510090 | |
parent | 6d2ffb9ab7f8de0fc513aebaeff15cbec1354240 (diff) | |
parent | f8dfa5575c13d47afcdc75fd3ed95c9691215ae9 (diff) | |
download | libyuv-c8f90691024501e957c5466df62c0a91b2866577.tar.gz |
Merge "external/libyuv: Move files/fuzz to top level directory" am: fe33d276d6 am: 6f63e30a91 am: f8dfa5575c
Original change: https://android-review.googlesource.com/c/platform/external/libyuv/+/2196945
Change-Id: Ic2be82d57054379458a45c6e7158f0f74685151d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | fuzz/Android.bp (renamed from files/fuzz/Android.bp) | 4 | ||||
-rw-r--r-- | fuzz/OWNERS (renamed from files/fuzz/OWNERS) | 0 | ||||
-rw-r--r-- | fuzz/mjpeg_dec_fuzz.cc (renamed from files/fuzz/mjpeg_dec_fuzz.cc) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/files/fuzz/Android.bp b/fuzz/Android.bp index 0e495899..a8d552b1 100644 --- a/files/fuzz/Android.bp +++ b/fuzz/Android.bp @@ -2,10 +2,10 @@ package { // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "external_libyuv_files_license" + // all of the 'license_kinds' from "external_libyuv_license" // to get the below license kinds: // SPDX-license-identifier-BSD - default_applicable_licenses: ["external_libyuv_files_license"], + default_applicable_licenses: ["external_libyuv_license"], } cc_fuzz { diff --git a/files/fuzz/OWNERS b/fuzz/OWNERS index 37481f5d..37481f5d 100644 --- a/files/fuzz/OWNERS +++ b/fuzz/OWNERS diff --git a/files/fuzz/mjpeg_dec_fuzz.cc b/fuzz/mjpeg_dec_fuzz.cc index 3be8410a..3be8410a 100644 --- a/files/fuzz/mjpeg_dec_fuzz.cc +++ b/fuzz/mjpeg_dec_fuzz.cc |