Snap for 8426163 from b9a7b3303db5c83a3b43a5a740b74fae2bab1e37 to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100

Change-Id: I317b0c8d7a9c3e964fa7bc5daef74215a38e0373

4 files changed, 19 insertions, 63 deletions

diff --git a/Android.bp b/Android.bp
index a9d86ff66f..9888fc739b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,45 +1,5 @@
 // This file is autogenerated by tools/skqp/gn_to_bp.py.
 
-package {
-    default_applicable_licenses: ["external_skqp_license"],
-}
-
-// Added automatically by a large-scale-change that took the approach of
-// 'apply every license found to every target'. While this makes sure we respect
-// every license restriction, it may not be entirely correct.
-//
-// e.g. GPL in an MIT project might only apply to the contrib/ directory.
-//
-// Please consider splitting the single license below into multiple licenses,
-// taking care not to lose any license_kind information, and overriding the
-// default license using the 'licenses: [...]' property on targets as needed.
-//
-// For unused files, consider creating a 'fileGroup' with "//visibility:private"
-// to attach the license to, and including a comment whether the files may be
-// used in the current project.
-//
-// large-scale-change filtered out the below license kinds as false-positives:
-//   SPDX-license-identifier-GPL-2.0
-//   SPDX-license-identifier-LGPL-2.1
-//   SPDX-license-identifier-OFL
-// See: http://go/android-license-faq
-license {
-    name: "external_skqp_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-        "SPDX-license-identifier-BSD",
-        "SPDX-license-identifier-CC0-1.0",
-        "SPDX-license-identifier-FTL",
-        "SPDX-license-identifier-MIT",
-        "SPDX-license-identifier-MPL",
-        "legacy_unencumbered",
-    ],
-    license_text: [
-        "LICENSE",
-    ],
-}
-
 cc_library_shared {
     name: "libskqp_app",
     sdk_version: "26",
@@ -1650,6 +1610,18 @@ cc_library_shared {
             ],
         },
 
+        mips: {
+            srcs: [
+                
+            ],
+        },
+
+        mips64: {
+            srcs: [
+                
+            ],
+        },
+
         x86: {
             srcs: [
                 "src/opts/SkOpts_avx.cpp",
@@ -1671,8 +1643,6 @@ cc_library_shared {
         },
     },
 
-    header_libs: ["jni_headers"],
-
     shared_libs: [
           "libandroid",
           "libEGL",
diff --git a/METADATA b/METADATA
deleted file mode 100644
index 5c3f89cea7..0000000000
--- a/METADATA
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party {
-  license_type: RECIPROCAL
-}
diff --git a/platform_tools/android/apps/skqp/src/main/Android.bp b/platform_tools/android/apps/skqp/src/main/Android.bp
index 1281453012..5df47bd8b5 100644
--- a/platform_tools/android/apps/skqp/src/main/Android.bp
+++ b/platform_tools/android/apps/skqp/src/main/Android.bp
@@ -2,23 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_skqp_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    //   SPDX-license-identifier-BSD
-    //   SPDX-license-identifier-CC0-1.0
-    //   SPDX-license-identifier-MIT
-    //   legacy_unencumbered
-    default_applicable_licenses: ["external_skqp_license"],
-}
-
 android_test {
     name: "CtsSkQPTestCases",
     defaults: ["cts_defaults"],
 
+    test_suites: [
+        "cts",
+        "vts10",
+        "general-tests",
+    ],
     libs: ["android.test.runner.stubs"],
     jni_libs: ["libskqp_app"],
     compile_multilib: "both",
diff --git a/platform_tools/android/apps/skqp/src/main/AndroidManifest.xml b/platform_tools/android/apps/skqp/src/main/AndroidManifest.xml
index d046036b54..f97863547e 100644
--- a/platform_tools/android/apps/skqp/src/main/AndroidManifest.xml
+++ b/platform_tools/android/apps/skqp/src/main/AndroidManifest.xml
@@ -11,9 +11,7 @@
       android:theme="@style/AppTheme"
       android:label="SkQP">
 
-      <activity
-          android:name=".MainActivity"
-          android:exported="true">
+      <activity android:name=".MainActivity">
           <intent-filter>
               <action android:name="android.intent.action.MAIN" />
               <category android:name="android.intent.category.LAUNCHER" />
@@ -22,8 +20,7 @@
       <activity
           android:name=".SkQPActivity"
           android:label="@string/title_activity_skqp"
-          android:theme="@style/AppTheme.NoActionBar"
-          android:exported="true">
+          android:theme="@style/AppTheme.NoActionBar">
           <intent-filter>
               <action android:name="com.google.intent.action.TEST_LOOP"/>
               <category android:name="android.intent.category.DEFAULT"/>