aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Huang <huangluke@google.com>2021-05-12 10:41:12 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-05-12 10:41:12 +0000
commite8e7788f61a34a8734ddc706a583b186ccf698df (patch)
tree374e6263abc26a82e70c06ffcb32122ace1036af
parentb5d6d1540b00ecda19d03b7da04467281656f67b (diff)
parent412b0b2480efa5672a51e74d2cc5ac04aaede716 (diff)
downloadtinyvec-e8e7788f61a34a8734ddc706a583b186ccf698df.tar.gz
Make libtinyvec available to DnsResolver am: c5df0d2700 am: 412b0b2480
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tinyvec/+/1705166 Change-Id: I57df07555aad741794803762da99a21e5b04ad87
-rw-r--r--Android.bp8
-rw-r--r--cargo2android.json11
2 files changed, 18 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index ed6c334..47bf80c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --device --dependencies --features=alloc,default,tinyvec_macros.
+// 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_tinyvec_license"],
@@ -52,6 +53,11 @@ rust_library {
rustlibs: [
"libtinyvec_macros",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.resolv",
+ ],
+ min_sdk_version: "29",
}
// dependent_library ["feature_list"]
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..9b0c9be
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,11 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.resolv"
+ ],
+ "min_sdk_version": "29",
+ "dependencies": true,
+ "features": "alloc,default,tinyvec_macros",
+ "device": true,
+ "run": true
+} \ No newline at end of file