aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Macnak <natsu@google.com>2021-10-08 12:41:04 -0700
committerJason Macnak <natsu@google.com>2021-10-08 12:51:02 -0700
commit3dd0ccdea4aee7a4ed6afea4aa1501c8bfdf8a70 (patch)
treeacd764170f90bdbceb1ce39514b745eda4199a91
parent0104d8dcac3f9a3d85d5c15cec610ccd9e5d85d4 (diff)
downloadinstant-3dd0ccdea4aee7a4ed6afea4aa1501c8bfdf8a70.tar.gz
Add apex to instant rust crate
... for eventually including in crosvm build for Cuttlefish. Bug: 189133053 Test: `m` with vulkano gralloc enabled in crosvm Change-Id: I37066b5a148bc6c42297db777eec2e932f09b0f3
-rw-r--r--Android.bp11
-rw-r--r--cargo2android.json8
2 files changed, 15 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp
index c723067..2ad30c0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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