Use defaults from external/sqlite am: 8cc6a24726 am: 355708aa90 am: a9cf5cddae am: 1100964ebeandroid-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r97android-mainline-12.0.0_r96android-mainline-12.0.0_r95android-mainline-12.0.0_r94android-mainline-12.0.0_r93android-mainline-12.0.0_r92android-mainline-12.0.0_r91android-mainline-12.0.0_r90android-mainline-12.0.0_r9android-mainline-12.0.0_r89android-mainline-12.0.0_r88android-mainline-12.0.0_r87android-mainline-12.0.0_r86android-mainline-12.0.0_r85android-mainline-12.0.0_r84android-mainline-12.0.0_r83android-mainline-12.0.0_r82android-mainline-12.0.0_r81android-mainline-12.0.0_r80android-mainline-12.0.0_r8android-mainline-12.0.0_r79android-mainline-12.0.0_r78android-mainline-12.0.0_r77android-mainline-12.0.0_r76android-mainline-12.0.0_r75android-mainline-12.0.0_r74android-mainline-12.0.0_r73android-mainline-12.0.0_r72android-mainline-12.0.0_r71android-mainline-12.0.0_r70android-mainline-12.0.0_r7android-mainline-12.0.0_r69android-mainline-12.0.0_r68android-mainline-12.0.0_r67android-mainline-12.0.0_r66android-mainline-12.0.0_r65android-mainline-12.0.0_r64android-mainline-12.0.0_r63android-mainline-12.0.0_r62android-mainline-12.0.0_r61android-mainline-12.0.0_r60android-mainline-12.0.0_r6android-mainline-12.0.0_r59android-mainline-12.0.0_r58android-mainline-12.0.0_r57android-mainline-12.0.0_r56android-mainline-12.0.0_r53android-mainline-12.0.0_r52android-mainline-12.0.0_r51android-mainline-12.0.0_r50android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r48android-mainline-12.0.0_r47android-mainline-12.0.0_r46android-mainline-12.0.0_r45android-mainline-12.0.0_r44android-mainline-12.0.0_r43android-mainline-12.0.0_r42android-mainline-12.0.0_r41android-mainline-12.0.0_r40android-mainline-12.0.0_r39android-mainline-12.0.0_r38android-mainline-12.0.0_r37android-mainline-12.0.0_r35android-mainline-12.0.0_r34android-mainline-12.0.0_r33android-mainline-12.0.0_r32android-mainline-12.0.0_r31android-mainline-12.0.0_r30android-mainline-12.0.0_r3android-mainline-12.0.0_r29android-mainline-12.0.0_r28android-mainline-12.0.0_r27android-mainline-12.0.0_r26android-mainline-12.0.0_r25android-mainline-12.0.0_r24android-mainline-12.0.0_r23android-mainline-12.0.0_r22android-mainline-12.0.0_r21android-mainline-12.0.0_r20android-mainline-12.0.0_r2android-mainline-12.0.0_r19android-mainline-12.0.0_r18android-mainline-12.0.0_r17android-mainline-12.0.0_r16android-mainline-12.0.0_r15android-mainline-12.0.0_r14android-mainline-12.0.0_r13android-mainline-12.0.0_r126android-mainline-12.0.0_r125android-mainline-12.0.0_r124android-mainline-12.0.0_r123android-mainline-12.0.0_r122android-mainline-12.0.0_r121android-mainline-12.0.0_r120android-mainline-12.0.0_r12android-mainline-12.0.0_r119android-mainline-12.0.0_r118android-mainline-12.0.0_r117android-mainline-12.0.0_r116android-mainline-12.0.0_r115android-mainline-12.0.0_r114android-mainline-12.0.0_r113android-mainline-12.0.0_r110android-mainline-12.0.0_r11android-mainline-12.0.0_r109android-mainline-12.0.0_r108android-mainline-12.0.0_r107android-mainline-12.0.0_r106android-mainline-12.0.0_r105android-mainline-12.0.0_r104android-mainline-12.0.0_r103android-mainline-12.0.0_r102android-mainline-12.0.0_r101android-mainline-12.0.0_r100android-mainline-12.0.0_r10android-mainline-12.0.0_r1aml_wif_311811030aml_tz3_311312010aml_tet_311811050aml_sdk_311710000aml_pco_311011000aml_mpr_311911090aml_doc_310851020android12-mainline-wifi-releaseandroid12-mainline-tethering-releaseandroid12-mainline-statsd-releaseandroid12-mainline-sdkext-releaseandroid12-mainline-resolv-releaseandroid12-mainline-permission-releaseandroid12-mainline-neuralnetworks-releaseandroid12-mainline-networkstack-releaseandroid12-mainline-mediaprovider-releaseandroid12-mainline-media-swcodec-releaseandroid12-mainline-media-releaseandroid12-mainline-ipsec-releaseandroid12-mainline-extservices-releaseandroid12-mainline-documentsui-releaseandroid12-mainline-conscrypt-releaseandroid12-mainline-cellbroadcast-releaseandroid12-mainline-captiveportallogin-releaseandroid12-mainline-art-releaseandroid12-mainline-adbd-release

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libsqlite3-sys/+/1674871

Change-Id: Ia64670308d236eadcebc901a60ad04d304486955

3 files changed, 24 insertions, 80 deletions

diff --git a/Android.bp b/Android.bp
index 982f3fb..46b94a4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --device --run --dependencies --test --patch=patches/Android.bp.patch.
+// Do not modify this file as changes will be overridden on upgrade.
 
 // We renamed the shared_libs dependence from libsqlite3 to libsqlite.
 // srcs has been moved out of _defaults to work around b/163420435
@@ -79,6 +80,9 @@ rust_test_host {
         ":libsqlite3_bindgen",
     ],
     defaults: ["libsqlite3-sys_defaults"],
+    test_options: {
+        unit_test: true,
+    },
 }
 
 rust_test {
@@ -93,38 +97,6 @@ rust_test {
 // dependent_library ["feature_list"]
 //   pkg-config-0.3.19
 
-// Keep this array in sync with the cflags used in external/sqlite
-// After b/163598610 is resolved, use defaults instead.
-sqlite3_bindgen_clang_flags = [
-    " -DNDEBUG=1",
-    " -DHAVE_USLEEP=1",
-    " -DSQLITE_HAVE_ISNAN",
-    " -DSQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576",
-    " -DSQLITE_THREADSAFE=2",
-    " -DSQLITE_TEMP_STORE=3",
-    " -DSQLITE_POWERSAFE_OVERWRITE=1",
-    " -DSQLITE_DEFAULT_FILE_FORMAT=4",
-    " -DSQLITE_DEFAULT_AUTOVACUUM=1",
-    " -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1",
-    " -DSQLITE_ENABLE_FTS3",
-    " -DSQLITE_ENABLE_FTS3_BACKWARDS",
-    " -DSQLITE_ENABLE_FTS4",
-    " -DSQLITE_OMIT_BUILTIN_TEST",
-    " -DSQLITE_OMIT_COMPILEOPTION_DIAGS",
-    " -DSQLITE_OMIT_LOAD_EXTENSION",
-    " -DSQLITE_DEFAULT_FILE_PERMISSIONS=0600",
-    " -DSQLITE_SECURE_DELETE",
-    " -DSQLITE_ENABLE_BATCH_ATOMIC_WRITE",
-    " -DBIONIC_IOCTL_NO_SIGNEDNESS_OVERLOAD",
-    " -DHAVE_POSIX_FALLOCATE=1",
-    // extra -D flags for android targets
-    " -DUSE_PREAD64",
-    " -Dfdatasync=fdatasync",
-    " -DHAVE_MALLOC_H=1",
-    " -DHAVE_MALLOC_USABLE_SIZE",
-    " -Wno-unused-parameter",
-]
-
 rust_bindgen {
     name: "libsqlite3_bindgen",
     host_supported: true,
@@ -132,5 +104,6 @@ rust_bindgen {
     custom_bindgen: "sqlite3_bindgen_build",
     wrapper_src: "wrapper.h",
     source_stem: "bindgen",
-    cflags: ["-I external/sqlite/dist"] + sqlite3_bindgen_clang_flags,
+    cflags: ["-I external/sqlite/dist"],
+    defaults: ["sqlite-defaults"],
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 6716814..a731acb 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,8 +1,14 @@
-// Generated by cargo2android.py for tests in Android.bp
+// Generated by update_crate_tests.py for tests that depend on this crate.
 {
   "presubmit": [
     {
+      "name": "keystore2_test"
+    },
+    {
       "name": "libsqlite3-sys_device_test_src_lib"
+    },
+    {
+      "name": "vpnprofilestore_test"
     }
   ]
 }
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
index 0a2d5c3..0b9b65e 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -1,12 +1,6 @@
---- Android.bp	2020-10-30 16:41:52.854552104 -0700
-+++ Android.bp	2020-10-30 16:47:00.153323579 -0700
-@@ -1,10 +1,16 @@
- // This file is generated by cargo2android.py --device --run --dependencies --test --patch=patches/Android.bp.patch.
- 
-+// We renamed the shared_libs dependence from libsqlite3 to libsqlite.
-+// srcs has been moved out of _defaults to work around b/163420435
-+
- rust_library {
+--- Android.bp	2021-04-14 17:32:44.882379059 +0000
++++ Android.bp	2021-04-14 17:33:25.765957305 +0000
+@@ -40,7 +40,10 @@
      name: "liblibsqlite3_sys",
      host_supported: true,
      crate_name: "libsqlite3_sys",
@@ -18,7 +12,7 @@
      edition: "2018",
      features: [
          "default",
-@@ -12,13 +18,14 @@
+@@ -48,13 +51,14 @@
          "pkg-config",
          "vcpkg",
      ],
@@ -35,7 +29,7 @@
      test_suites: ["general-tests"],
      auto_gen_config: true,
      edition: "2018",
-@@ -28,23 +35,70 @@
+@@ -64,11 +68,17 @@
          "pkg-config",
          "vcpkg",
      ],
@@ -52,7 +46,9 @@
 +        ":libsqlite3_bindgen",
 +    ],
      defaults: ["libsqlite3-sys_defaults"],
- }
+     test_options: {
+         unit_test: true,
+@@ -77,13 +87,23 @@
  
  rust_test {
      name: "libsqlite3-sys_device_test_src_lib",
@@ -69,39 +65,7 @@
 -Errors in cargo.out:
 -error: linking with `cc` failed: exit code: 1
 -error: aborting due to previous error
--error: could not compile `libsqlite3-sys`.
-+// Keep this array in sync with the cflags used in external/sqlite
-+// After b/163598610 is resolved, use defaults instead.
-+sqlite3_bindgen_clang_flags = [
-+    " -DNDEBUG=1",
-+    " -DHAVE_USLEEP=1",
-+    " -DSQLITE_HAVE_ISNAN",
-+    " -DSQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576",
-+    " -DSQLITE_THREADSAFE=2",
-+    " -DSQLITE_TEMP_STORE=3",
-+    " -DSQLITE_POWERSAFE_OVERWRITE=1",
-+    " -DSQLITE_DEFAULT_FILE_FORMAT=4",
-+    " -DSQLITE_DEFAULT_AUTOVACUUM=1",
-+    " -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1",
-+    " -DSQLITE_ENABLE_FTS3",
-+    " -DSQLITE_ENABLE_FTS3_BACKWARDS",
-+    " -DSQLITE_ENABLE_FTS4",
-+    " -DSQLITE_OMIT_BUILTIN_TEST",
-+    " -DSQLITE_OMIT_COMPILEOPTION_DIAGS",
-+    " -DSQLITE_OMIT_LOAD_EXTENSION",
-+    " -DSQLITE_DEFAULT_FILE_PERMISSIONS=0600",
-+    " -DSQLITE_SECURE_DELETE",
-+    " -DSQLITE_ENABLE_BATCH_ATOMIC_WRITE",
-+    " -DBIONIC_IOCTL_NO_SIGNEDNESS_OVERLOAD",
-+    " -DHAVE_POSIX_FALLOCATE=1",
-+    // extra -D flags for android targets
-+    " -DUSE_PREAD64",
-+    " -Dfdatasync=fdatasync",
-+    " -DHAVE_MALLOC_H=1",
-+    " -DHAVE_MALLOC_USABLE_SIZE",
-+    " -Wno-unused-parameter",
-+]
-+
+-error: could not compile `libsqlite3-sys`
 +rust_bindgen {
 +    name: "libsqlite3_bindgen",
 +    host_supported: true,
@@ -109,5 +73,6 @@
 +    custom_bindgen: "sqlite3_bindgen_build",
 +    wrapper_src: "wrapper.h",
 +    source_stem: "bindgen",
-+    cflags: ["-I external/sqlite/dist"] + sqlite3_bindgen_clang_flags,
++    cflags: ["-I external/sqlite/dist"],
++    defaults: ["sqlite-defaults"],
 +}