aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-20 03:18:32 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-20 03:18:32 +0000
commit3642487db1e7ae2fef392c356f5567c8612d1c74 (patch)
tree409bfabab642248d521db866bb4974ebc5c231e5
parent505df3c0c27851b093d52fbde7fba83ae9ced301 (diff)
parent6e18a19d382dbceb0a609937970328b39931a5c4 (diff)
downloadaho-corasick-3642487db1e7ae2fef392c356f5567c8612d1c74.tar.gz
Snap for 10975086 from 6e18a19d382dbceb0a609937970328b39931a5c4 to 24Q1-release
Change-Id: Ic9cfbcb356e9d3b8f55ee5946e9f0dd628fa9274
-rw-r--r--Android.bp10
-rw-r--r--cargo_embargo.json (renamed from cargo2android.json)9
2 files changed, 6 insertions, 13 deletions
diff --git a/Android.bp b/Android.bp
index ced92eb..f170196 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 {
@@ -55,9 +55,7 @@ rust_test {
"default",
"std",
],
- rustlibs: [
- "libmemchr",
- ],
+ rustlibs: ["libmemchr"],
}
rust_library {
@@ -72,9 +70,7 @@ rust_library {
"default",
"std",
],
- rustlibs: [
- "libmemchr",
- ],
+ rustlibs: ["libmemchr"],
apex_available: [
"//apex_available:platform",
"com.android.compos",
diff --git a/cargo2android.json b/cargo_embargo.json
index bef74ca..b553798 100644
--- a/cargo2android.json
+++ b/cargo_embargo.json
@@ -1,12 +1,9 @@
{
- "apex-available": [
+ "tests": true,
+ "apex_available": [
"//apex_available:platform",
"com.android.compos",
"com.android.virt"
],
- "dependencies": true,
- "device": true,
- "run": true,
- "tests": true,
- "vendor-available": true
+ "run_cargo": false
}