Snap for 8730993 from 0f760307e6d0d5eb26825ef38b325309d82bdc7f to mainline-tzdata3-releaseaml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010

Change-Id: Ib9f7aa118a07c2b645c8bd4682af5e784f3cee20

5 files changed, 37 insertions, 47 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..013b2f4
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,32 @@
+package {
+    default_applicable_licenses: ["external_sqlite_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.
+// See: http://go/android-license-faq
+license {
+    name: "external_sqlite_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "legacy_permissive",
+    ],
+    // large-scale-change unable to identify any license_text files
+}
+
+subdirs = [
+    "android",
+    "dist",
+]
diff --git a/METADATA b/METADATA
index 5361c45..d97975c 100644
--- a/METADATA
+++ b/METADATA
@@ -1,6 +1,3 @@
 third_party {
   license_type: NOTICE
-  security {
-      tag: "NVD-CPE2.3:cpe:/a:sqlite:sqlite:3.32.0"
-  }
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
deleted file mode 100644
index 2e9ced7..0000000
--- a/TEST_MAPPING
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "presubmit": [
-    {
-      "name": "CtsDatabaseTestCases"
-    }
-  ],
-  "hwasan-postsubmit": [
-    {
-      "name": "CtsDatabaseTestCases"
-    }
-  ]
-}
diff --git a/android/Android.bp b/android/Android.bp
index 8df66ca..3c32bdd 100644
--- a/android/Android.bp
+++ b/android/Android.bp
@@ -15,8 +15,10 @@ license {
     ],
 }
 
-cc_defaults {
-    name: "libsqlite3_android_defaults",
+cc_library_static {
+    name: "libsqlite3_android",
+    vendor_available: true,
+    native_bridge_supported: true,
     host_supported: true,
     cflags: [
         "-Wall",
@@ -33,14 +35,6 @@ cc_defaults {
     shared_libs: [
         "liblog",
     ],
-    export_include_dirs: ["."],
-}
-
-cc_library_static {
-    name: "libsqlite3_android",
-    defaults: ["libsqlite3_android_defaults"],
-    vendor_available: true,
-    native_bridge_supported: true,
     target: {
         android: {
             cflags: [
@@ -63,16 +57,7 @@ cc_library_static {
             exclude_shared_libs: ["libandroidicu"],
         },
     },
-}
-
-// This static library is variant of libsqlite3_android built without the ICU
-// extension.  The library is supposed to be used in environments where the ICU
-// extension is not needed and the dependency to ICU (which is as large as 60+
-// MB) is not desirable, like microdroid.
-cc_library_static {
-    name: "libsqlite3_android_noicu",
-    defaults: ["libsqlite3_android_defaults"],
-    // Not define SQLITE_ENABLE_ICU
+    export_include_dirs: ["."],
 }
 
 //       The formal test for phone_number_compare() is in DataBaseGeneralTest.java
diff --git a/dist/Android.bp b/dist/Android.bp
index 92b3bdf..9a79419 100644
--- a/dist/Android.bp
+++ b/dist/Android.bp
@@ -149,18 +149,6 @@ cc_library {
     export_include_dirs: ["."],
 }
 
-// This static library is variant of libsqlite built without the ICU extension.
-// The library is supposed to be used in environments where the ICU extension
-// is not needed and the dependency to ICU (which is as large as 60+ MB) is not
-// desirable, like microdroid.
-cc_library_static {
-    name: "libsqlite_static_noicu",
-    defaults: ["sqlite-defaults"],
-    srcs: ["sqlite3.c"],
-    whole_static_libs: ["libsqlite3_android_noicu"],
-    // Not define SQLITE_ENABLE_ICU
-}
-
 //
 //
 // Build the device command line tool sqlite3