Fix license texts.android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1

All Android 1p.

Test: m nothing
Change-Id: I08664a55a4d56769636ca099d82750db4ea57de9

3 files changed, 4 insertions, 22 deletions

diff --git a/Android.bp b/Android.bp
index 3434b55..b3d8907 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5,16 +5,6 @@ soong_namespace {
 }
 
 package {
-    default_applicable_licenses: ["hardware_google_av_license"],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
-    name: "hardware_google_av_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-    ],
-    // large-scale-change unable to identify any license_text files
+    // See: http://go/android-license-faq
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
diff --git a/media/eco/Android.bp b/media/eco/Android.bp
index 7289f7a..bf699bf 100644
--- a/media/eco/Android.bp
+++ b/media/eco/Android.bp
@@ -1,10 +1,6 @@
 package {
     // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_google_av_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_av_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 filegroup {
diff --git a/media/eco/tests/Android.bp b/media/eco/tests/Android.bp
index 40e14bf..70390cc 100644
--- a/media/eco/tests/Android.bp
+++ b/media/eco/tests/Android.bp
@@ -1,10 +1,6 @@
 package {
     // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_google_av_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_av_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 cc_defaults{