aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Macnak <natsu@google.com>2021-09-02 16:08:30 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-09-02 16:08:30 +0000
commit65e7374ed2ce0ed9079e36c6786eb685289e4fbb (patch)
tree49aabc6e886ca011b4cb7be7786dfd63b8388f69
parenta37d6c5a0a18615e56a84bb7d760a8a00e2003a3 (diff)
parent4a116dde76cb25d74fa10b0c417b8e43a0c3ab46 (diff)
downloadlibloading-65e7374ed2ce0ed9079e36c6786eb685289e4fbb.tar.gz
Merge "Update build with --device and apex" am: 8cd2b3cd92 am: 337eef4684 am: 4a116dde76
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libloading/+/1814092 Change-Id: I9bf7dafd7de8c9647d79079dacdbc3125eb55994
-rw-r--r--Android.bp15
1 files changed, 10 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index bbae702..751fbcc 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 --run --device --dependencies.
+// Do not modify this file as changes will be overridden on upgrade.
package {
default_applicable_licenses: ["external_rust_crates_libloading_license"],
@@ -17,15 +18,19 @@ 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",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
}
-
-// dependent_library ["feature_list"]
-// cfg-if-1.0.0