aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Macnak <natsu@google.com>2021-09-08 17:48:15 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-09-08 17:48:15 +0000
commited3a16084ecd61a7b6a853195fdc71c64c8dbb5a (patch)
tree599cf99c36a4d9d630e2f43e11b063e072767c41
parent934a0bb7ae4b539b65ba60dd3bdf9da646814022 (diff)
parentfae7e12231e3c0edc1691652007b4081901e883d (diff)
downloadlibloading-ed3a16084ecd61a7b6a853195fdc71c64c8dbb5a.tar.gz
Update build with --device (attempt #2) am: 49a352efab am: 37a37fa186 am: 97cab57613 am: fae7e12231
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libloading/+/1818992 Change-Id: I2d7ec613f2e73f0c8eb7d3cb42c29de342d8faab
-rw-r--r--Android.bp11
-rw-r--r--cargo2android.json5
2 files changed, 11 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index bbae702..63cb45b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --dependencies.
+// This file is generated by cargo2android.py --config cargo2android.json.
+// Do not modify this file as changes will be overridden on upgrade.
package {
default_applicable_licenses: ["external_rust_crates_libloading_license"],
@@ -17,15 +18,15 @@ license {
],
}
-rust_library_host {
+rust_library {
name: "liblibloading",
+ host_supported: true,
crate_name: "libloading",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.7.0",
srcs: ["src/lib.rs"],
edition: "2015",
rustlibs: [
"libcfg_if",
],
}
-
-// dependent_library ["feature_list"]
-// cfg-if-1.0.0
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..1b6cca2
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,5 @@
+{
+ "dependencies": true,
+ "device": true,
+ "run": true
+} \ No newline at end of file