diff options
author | Andrew Walbran <qwandor@google.com> | 2023-11-16 18:58:36 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-16 18:58:36 +0000 |
commit | 46e854ee746fe7160b4120f14cdb19dfc2c6094a (patch) | |
tree | e53480b90569cebf978467178f3251ccef6a8549 | |
parent | 5feb1bc659028e5c9862765f72748a1a5fa0a45c (diff) | |
parent | 1d1895d52df4d271c543248c7949835ba9832855 (diff) | |
download | protobuf-46e854ee746fe7160b4120f14cdb19dfc2c6094a.tar.gz |
Migrate to cargo_embargo. am: 41728e2a7b am: 1d1895d52d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/protobuf/+/2834511
Change-Id: Ibbf12718941bc08ac0829a182d4fcb3c8024057b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | cargo2android.json | 12 | ||||
-rw-r--r-- | cargo_embargo.json | 11 |
3 files changed, 12 insertions, 13 deletions
@@ -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 + } + } +} |