aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-14 14:58:40 +0000
committerAndrew Walbran <qwandor@google.com>2023-11-14 14:58:40 +0000
commit78bd7a37912d543c85d165afcbf1cbd9a644083a (patch)
treec0efa6518dd1631bd730ec0965b76b93bf8d7736
parenta194ac7573032c9a2c1bb724b53d85122bae7584 (diff)
downloadlibz-sys-78bd7a37912d543c85d165afcbf1cbd9a644083a.tar.gz
Migrate to cargo_embargo.
Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I18050125e35504a7b5f6299d417db2ef1ad3011a
-rw-r--r--Android.bp6
-rw-r--r--cargo_embargo.json (renamed from cargo2android.json)7
2 files changed, 4 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp
index 12dffa7..ac04d75 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 {
@@ -60,9 +60,7 @@ rust_library {
"libc",
"stock-zlib",
],
- rustlibs: [
- "liblibc",
- ],
+ rustlibs: ["liblibc"],
shared_libs: ["libz"],
apex_available: [
"//apex_available:platform",
diff --git a/cargo2android.json b/cargo_embargo.json
index adb04b1..f3c0ef8 100644
--- a/cargo2android.json
+++ b/cargo_embargo.json
@@ -1,12 +1,9 @@
{
- "apex-available": [
+ "apex_available": [
"//apex_available:platform",
"com.android.btservices",
"com.android.virt"
],
- "dependencies": true,
- "device": true,
- "min-sdk-version": "29",
- "run": true,
+ "min_sdk_version": "29",
"tests": true
}