aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Farrell <jamesfarrell@google.com>2023-09-11 23:02:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-09-11 23:02:11 +0000
commit55a84e580a12914e573002f70703548520ab9380 (patch)
tree045a85456e2388b3bb208586219e01c36be6ed24
parent11ba49a6db83c1f2f5391661aa0f47ce3a03230f (diff)
parent714751ad4dc00e50fb59fa395bb2083615c5657d (diff)
downloadglam-55a84e580a12914e573002f70703548520ab9380.tar.gz
Add cargo2android.json am: 96db7c231a am: 714751ad4d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/glam/+/2744823 Change-Id: Ib5e279b530fe490a1d71bdf42527289fd4e2ddd3 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
+}