diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 18:06:36 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 18:06:36 +0000 |
commit | e434c5c38262b4ed6ffdc00d3b5f9fc13471c203 (patch) | |
tree | 55ac449c24960e80aa3d5833861def48d750f1a0 | |
parent | 14cc4783a18a0709e668985c2501db760e519a7e (diff) | |
parent | 698989fa6909b4b57131f129835d01f74c598ffb (diff) | |
download | libsqlite3-sys-e434c5c38262b4ed6ffdc00d3b5f9fc13471c203.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: f8f84ac1fa am: 19577ea5a4 am: 26a8861e5c am: 698989fa69t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libsqlite3-sys/+/1912646
Change-Id: Ib93b5165d21f2b17af87ae970411d2cbfcd57e44
-rw-r--r-- | Android.bp | 43 | ||||
-rw-r--r-- | TEST_MAPPING | 16 | ||||
-rw-r--r-- | cargo2android.json | 7 | ||||
-rw-r--r-- | patches/Android.bp.patch | 65 |
4 files changed, 63 insertions, 68 deletions
@@ -41,7 +41,6 @@ rust_library { host_supported: true, crate_name: "libsqlite3_sys", cargo_env_compat: true, - cargo_pkg_version: "0.22.2", srcs: [ "src/lib.rs", ":libsqlite3_bindgen", @@ -53,16 +52,23 @@ rust_library { "pkg-config", "vcpkg", ], - shared_libs: [ - "libsqlite", - ], + shared_libs: ["libsqlite"], } -rust_defaults { - name: "libsqlite3-sys_test_defaults", +rust_test { + name: "libsqlite3-sys_test_src_lib", + host_supported: true, crate_name: "libsqlite3_sys", + cargo_env_compat: true, + srcs: [ + "src/lib.rs", + ":libsqlite3_bindgen", + ], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: [ "default", @@ -70,30 +76,7 @@ rust_defaults { "pkg-config", "vcpkg", ], - shared_libs: [ - "libsqlite", - ], -} - -rust_test_host { - name: "libsqlite3-sys_host_test_src_lib", - srcs: [ - "src/lib.rs", - ":libsqlite3_bindgen", - ], - defaults: ["libsqlite3-sys_test_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "libsqlite3-sys_device_test_src_lib", - srcs: [ - "src/lib.rs", - ":libsqlite3_bindgen", - ], - defaults: ["libsqlite3-sys_test_defaults"], + shared_libs: ["libsqlite"], } rust_bindgen { diff --git a/TEST_MAPPING b/TEST_MAPPING index d87563d..a952140 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -8,7 +8,21 @@ "name": "legacykeystore_test" }, { - "name": "libsqlite3-sys_device_test_src_lib" + "name": "libsqlite3-sys_test_src_lib" + }, + { + "name": "libsqlite3_bindgen_test" + } + ], + "presubmit-rust": [ + { + "name": "keystore2_test" + }, + { + "name": "legacykeystore_test" + }, + { + "name": "libsqlite3-sys_test_src_lib" }, { "name": "libsqlite3_bindgen_test" diff --git a/cargo2android.json b/cargo2android.json index 530205a..e901180 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,8 +1,9 @@ { + "add-toplevel-block": "cargo2android-extra-module.bp", + "copy-out": true, "device": true, + "no-pkg-vers": true, "patch": "patches/Android.bp.patch", "run": true, - "tests": true, - "copy-out": true, - "add-toplevel-block": "cargo2android-extra-module.bp" + "tests": true } diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch index 0928aa0..bd57023 100644 --- a/patches/Android.bp.patch +++ b/patches/Android.bp.patch @@ -2,7 +2,9 @@ diff --git a/Android.bp b/Android.bp index 1764165..df125da 100644 --- a/Android.bp +++ b/Android.bp -@@ -38,9 +38,2 @@ license { +@@ -36,13 +36,6 @@ + ], + } -genrule { - name: "copy_libsqlite3-sys_build_out", @@ -12,49 +14,42 @@ index 1764165..df125da 100644 -} - rust_library { -@@ -53,3 +46,3 @@ rust_library { + name: "liblibsqlite3_sys", + host_supported: true, +@@ -50,7 +43,7 @@ + cargo_env_compat: true, + srcs: [ "src/lib.rs", - ":copy_libsqlite3-sys_build_out", + ":libsqlite3_bindgen", ], -@@ -62,3 +55,5 @@ rust_library { + edition: "2018", + features: [ +@@ -59,7 +52,7 @@ + "pkg-config", + "vcpkg", ], - shared_libs: ["libsqlite3"], -+ shared_libs: [ -+ "libsqlite", -+ ], ++ shared_libs: ["libsqlite"], } -@@ -68,8 +63,2 @@ rust_defaults { - crate_name: "libsqlite3_sys", -- srcs: [ -- "src/lib.rs", + + rust_test { +@@ -69,7 +62,7 @@ + cargo_env_compat: true, + srcs: [ + "src/lib.rs", - ":copy_libsqlite3-sys_build_out", -- ], -- cargo_env_compat: true, -- cargo_pkg_version: "0.22.2", ++ ":libsqlite3_bindgen", + ], test_suites: ["general-tests"], -@@ -83,3 +72,5 @@ rust_defaults { + auto_gen_config: true, +@@ -83,7 +76,28 @@ + "pkg-config", + "vcpkg", ], - shared_libs: ["libsqlite3"], -+ shared_libs: [ -+ "libsqlite", -+ ], - } -@@ -88,2 +79,6 @@ rust_test_host { - name: "libsqlite3-sys_host_test_src_lib", -+ srcs: [ -+ "src/lib.rs", -+ ":libsqlite3_bindgen", -+ ], - defaults: ["libsqlite3-sys_test_defaults"], -@@ -96,3 +91,28 @@ rust_test { - name: "libsqlite3-sys_device_test_src_lib", -+ srcs: [ -+ "src/lib.rs", -+ ":libsqlite3_bindgen", -+ ], - defaults: ["libsqlite3-sys_test_defaults"], - } ++ shared_libs: ["libsqlite"], ++} + +rust_bindgen { + name: "libsqlite3_bindgen", @@ -75,4 +70,6 @@ index 1764165..df125da 100644 + auto_gen_config: true, + clippy_lints: "none", + lints: "none", -+} + } + + rust_library { |