Snap for 8570526 from 44173ea9c2b2ce5ab56e8b2662c8775a1a1ee44c to mainline-ipsec-releaseaml_ips_331910010aml_ips_331312000aml_ips_331310000aml_ips_331111030aml_ips_331014020android13-mainline-ipsec-release

Change-Id: I3934d5dc943502def4c9bee9f3cc508ca53f82b9

5 files changed, 47 insertions, 37 deletions

diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index 013b2f4..0000000
--- a/Android.bp
+++ /dev/null
@@ -1,32 +0,0 @@
-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 d97975c..5361c45 100644
--- a/METADATA
+++ b/METADATA
@@ -1,3 +1,6 @@
 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
new file mode 100644
index 0000000..2e9ced7
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,12 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsDatabaseTestCases"
+    }
+  ],
+  "hwasan-postsubmit": [
+    {
+      "name": "CtsDatabaseTestCases"
+    }
+  ]
+}
diff --git a/android/Android.bp b/android/Android.bp
index 3c32bdd..8df66ca 100644
--- a/android/Android.bp
+++ b/android/Android.bp
@@ -15,10 +15,8 @@ license {
     ],
 }
 
-cc_library_static {
-    name: "libsqlite3_android",
-    vendor_available: true,
-    native_bridge_supported: true,
+cc_defaults {
+    name: "libsqlite3_android_defaults",
     host_supported: true,
     cflags: [
         "-Wall",
@@ -35,6 +33,14 @@ cc_library_static {
     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: [
@@ -57,7 +63,16 @@ cc_library_static {
             exclude_shared_libs: ["libandroidicu"],
         },
     },
-    export_include_dirs: ["."],
+}
+
+// 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
 }
 
 //       The formal test for phone_number_compare() is in DataBaseGeneralTest.java
diff --git a/dist/Android.bp b/dist/Android.bp
index 9a79419..92b3bdf 100644
--- a/dist/Android.bp
+++ b/dist/Android.bp
@@ -149,6 +149,18 @@ 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