aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-20 03:20:43 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-20 03:20:43 +0000
commitea544c151bc62f8edc788806902306a8cf64d60c (patch)
tree44f665f74d9c19ee7d0517b749edc8ddc1629970
parentbb68a3d0ec809c421079ff5d913de56a39964ded (diff)
parent557f4cffb08a5421d76c9fcd5cf1a11d68d39bd4 (diff)
downloadmerge-ea544c151bc62f8edc788806902306a8cf64d60c.tar.gz
Snap for 10975086 from 557f4cffb08a5421d76c9fcd5cf1a11d68d39bd4 to 24Q1-release
Change-Id: Ifa7872cf56ad0cad132acf6dcd864d04a4d4b9d2
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json4
-rw-r--r--cargo_embargo.json3
3 files changed, 5 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp
index fd96792..776a794 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo_embargo.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -32,9 +32,7 @@ rust_library {
"num-traits",
"std",
],
- rustlibs: [
- "libnum_traits",
- ],
+ rustlibs: ["libnum_traits"],
proc_macros: ["libmerge_derive"],
apex_available: [
"//apex_available:platform",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 6e26a5a..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "device": true,
- "run": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..cb908d7
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,3 @@
+{
+ "run_cargo": false
+}