Merge "Merge Android 14 QPR1" into main

2 files changed, 2 insertions, 7 deletions

diff --git a/Android.bp b/Android.bp
index 8a94da24..47164744 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,13 +1,7 @@
 package {
     default_applicable_licenses: ["external_libyuv_license"],
 }
-
 // Added automatically by a large-scale-change
-//
-// large-scale-change included anything that looked like it might be a license
-// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
-//
-// Please consider removing redundant or irrelevant files from 'license_text:'.
 // See: http://go/android-license-faq
 license {
     name: "external_libyuv_license",
@@ -20,6 +14,7 @@ license {
         "PATENTS",
     ],
 }
+subdirs = ["files"]
 
 cc_library {
     name: "libyuv",
diff --git a/METADATA b/METADATA
index 7ceb7be3..2f8de652 100644
--- a/METADATA
+++ b/METADATA
@@ -6,7 +6,7 @@ name: "libyuv"
 description: "libyuv is an open source project that includes YUV scaling and conversion functionality."
 third_party {
   url {
-    type: GIT
+    type: ARCHIVE
     value: "https://chromium.googlesource.com/libyuv/libyuv/"
   }
   version: "f0921806a293e3e008e6325a51d4ea760c39d2c1"