aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-16 19:33:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 19:33:32 +0000
commit6a7aee51308728254b2672c9c8c158242cfdea35 (patch)
treee53480b90569cebf978467178f3251ccef6a8549
parent310fd44dd50a3622276bbe9183eda56a14cc459f (diff)
parent46e854ee746fe7160b4120f14cdb19dfc2c6094a (diff)
downloadprotobuf-6a7aee51308728254b2672c9c8c158242cfdea35.tar.gz
Migrate to cargo_embargo. am: 41728e2a7b am: 1d1895d52d am: 46e854ee74
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/protobuf/+/2834511 Change-Id: If78e86a5a9a87ce667b4eb503bb45f3963ccc18a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json12
-rw-r--r--cargo_embargo.json11
3 files changed, 12 insertions, 13 deletions
diff --git a/Android.bp b/Android.bp
index 72288cb..a1853db 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 {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index e6792f4..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "//apex_available:anyapex"
- ],
- "copy-out": true,
- "dependencies": true,
- "device": true,
- "features": "bytes",
- "min-sdk-version": "29",
- "run": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..89530e3
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,11 @@
+{
+ "features": [
+ "bytes"
+ ],
+ "min_sdk_version": "29",
+ "package": {
+ "protobuf": {
+ "copy_out": true
+ }
+ }
+}