aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Farrell <jamesfarrell@google.com>2023-09-12 02:05:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-09-12 02:05:31 +0000
commit26af141379b3aee5112416857e0e318bddf85c6a (patch)
tree045a85456e2388b3bb208586219e01c36be6ed24
parentd31066989d89b3b41818270405a5411635e0ca8b (diff)
parentdbe65b53043e0257469394d1062f10ea6324b946 (diff)
downloadglam-26af141379b3aee5112416857e0e318bddf85c6a.tar.gz
Add cargo2android.json am: 96db7c231a am: 714751ad4d am: 55a84e580a am: dbe65b5304
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/glam/+/2744823 Change-Id: I14e87dae448e89de3ad69e7aebb81e050d6094a9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--.gitignore1
-rw-r--r--Android.bp4
-rw-r--r--cargo2android.json3
3 files changed, 6 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 3da98e9..63827e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
**/target
-*.json
*.swp
**/*.rs.bk
Cargo.lock
diff --git a/Android.bp b/Android.bp
index 32fbe8d..90f2f08 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -50,4 +50,6 @@ rust_library_host {
"default",
"std",
],
+ product_available: true,
+ vendor_available: true,
}
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..1be49f0
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,3 @@
+{
+ "run": true
+}