aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-15 00:12:25 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-15 00:12:25 +0000
commitdd670983eac4771a39f7fc5d65e1131918fac51e (patch)
treec0efa6518dd1631bd730ec0965b76b93bf8d7736
parentbf1786a1316ae9fe5adf94dc77a5ceb82c956d87 (diff)
parent3ba9cc63ea0fb8f8468331557e1ce726af4c7166 (diff)
downloadlibz-sys-android14-qpr2-s2-release.tar.gz
Change-Id: I84c50822d232c9fc52fd74ed9bcb4a23b211b845
-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
}