aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-22 21:42:09 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-22 21:42:09 +0000
commit4fe939ff4defc057b09dccc45075c84ac36e614b (patch)
treed2618b8cf461a238b69a2ff07ff803222c8fae74
parent98baf8376e9b39ee3cde59f1b15d86c0e763a8f6 (diff)
parentdbb20153d3868b780d86cd892f5482b2fb6fb100 (diff)
downloadrusticata-macros-simpleperf-release.tar.gz
Snap for 11135399 from dbb20153d3868b780d86cd892f5482b2fb6fb100 to simpleperf-releasesimpleperf-release
Change-Id: I26f3d59898ce35a824d910ebf4f81cb4d0a02432
-rw-r--r--Android.bp10
-rw-r--r--cargo_embargo.json (renamed from cargo2android.json)5
2 files changed, 5 insertions, 10 deletions
diff --git a/Android.bp b/Android.bp
index 4b50bf1..3755207 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 {
@@ -47,9 +47,7 @@ rust_library {
cargo_pkg_version: "4.1.0",
srcs: ["src/lib.rs"],
edition: "2018",
- rustlibs: [
- "libnom",
- ],
+ rustlibs: ["libnom"],
apex_available: [
"//apex_available:platform",
"com.android.virt",
@@ -71,7 +69,5 @@ rust_test {
unit_test: true,
},
edition: "2018",
- rustlibs: [
- "libnom",
- ],
+ rustlibs: ["libnom"],
}
diff --git a/cargo2android.json b/cargo_embargo.json
index 8e490de..fcc96ec 100644
--- a/cargo2android.json
+++ b/cargo_embargo.json
@@ -1,9 +1,8 @@
{
- "apex-available": [
+ "apex_available": [
"//apex_available:platform",
"com.android.virt"
],
- "device": true,
- "run": true,
+ "run_cargo": false,
"tests": true
}