diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-10-08 22:42:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-08 22:42:23 +0000 |
| commit | 0156366dc87e742d39c419b1a9abebc5c730b182 (patch) | |
| tree | acd764170f90bdbceb1ce39514b745eda4199a91 | |
| parent | 9bace0f938f15a4cbae4c86b2d90214ad8951afa (diff) | |
| parent | 2eb4f95a4bc5f024654747847f2acfdaab7798f0 (diff) | |
| download | instant-0156366dc87e742d39c419b1a9abebc5c730b182.tar.gz | |
Merge "Add apex to instant rust crate" am: 10d03175e5 am: 2be6b1866c am: c29420be31 am: 5125a26022 am: 2eb4f95a4b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/instant/+/1850757
Change-Id: I3b190163affd7a7fe7929ee5a978f9ce899a292a
| -rw-r--r-- | Android.bp | 11 | ||||
| -rw-r--r-- | cargo2android.json | 8 |
2 files changed, 15 insertions, 4 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -22,12 +22,15 @@ rust_library { name: "libinstant", host_supported: true, crate_name: "instant", + cargo_env_compat: true, + cargo_pkg_version: "0.1.10", srcs: ["src/lib.rs"], edition: "2018", rustlibs: [ "libcfg_if", ], + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], } - -// dependent_library ["feature_list"] -// cfg-if-1.0.0 diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..340481e --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,8 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], + "device": true, + "run": true +}
\ No newline at end of file |