aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-06-23 22:02:52 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-23 22:02:52 +0000
commit7b78fd4778c0dc5db2232b777b5cb765dcb25f48 (patch)
treed1d1dac30a8145d58adab81bd82d9488da80d6be
parent6f32ad874cc3579a8fffc33423734264be061e7f (diff)
parent6ea2266fa19f572ebf0c1cc17d570edfea61d34f (diff)
downloadmemoffset-7b78fd4778c0dc5db2232b777b5cb765dcb25f48.tar.gz
Merge "Make available to com.android.compos apex" am: 7dbc8144f5 am: 026fe9b100 am: 50e03f4770 am: 6ea2266fa1
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/memoffset/+/1741440 Change-Id: I7faaefb0853ec0e9fd25abc781ce9211c967f763
-rw-r--r--Android.bp1
-rw-r--r--cargo2android.json1
2 files changed, 2 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index afca47b..32779fc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -34,6 +34,7 @@ rust_library {
],
apex_available: [
"//apex_available:platform",
+ "com.android.compos",
"com.android.virt",
],
}
diff --git a/cargo2android.json b/cargo2android.json
index 29665bb..fc236fe 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,6 +1,7 @@
{
"apex-available": [
"//apex_available:platform",
+ "com.android.compos",
"com.android.virt"
],
"dependencies": true,