diff options
author | Andrew Walbran <qwandor@google.com> | 2023-11-10 21:48:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-10 21:48:31 +0000 |
commit | 1d6fccf388057c05f3d0a198e5a5a5f6527df2ff (patch) | |
tree | a0e31e9e99011ae149b175d6d6f9e873122ad5d3 | |
parent | 291480229f9267d138b23f4be6b932af619c0ef8 (diff) | |
parent | 1396bf6e6cffd03277ae8d994a03d99fe6773cf1 (diff) | |
download | protobuf-support-1d6fccf388057c05f3d0a198e5a5a5f6527df2ff.tar.gz |
Migrate to cargo_embargo. am: d6fb48ff86 am: d0317daa93 am: 1396bf6e6c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/protobuf-support/+/2821940
Change-Id: I0caf7a39c02a7312dcb270e2c28c6ecdb4ead97d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 8 | ||||
-rw-r--r-- | cargo2android.json | 10 | ||||
-rw-r--r-- | cargo_embargo.json | 4 |
3 files changed, 6 insertions, 16 deletions
@@ -1,8 +1,6 @@ -// 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 { default_applicable_licenses: [ "external_rust_crates_protobuf-support_license", @@ -36,9 +34,7 @@ rust_library { cargo_pkg_version: "3.2.0", srcs: ["src/lib.rs"], edition: "2021", - rustlibs: [ - "libthiserror", - ], + rustlibs: ["libthiserror"], apex_available: [ "//apex_available:platform", "//apex_available:anyapex", diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 26ba70d..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "//apex_available:anyapex" - ], - "min-sdk-version": "29", - "dependencies": true, - "device": true, - "run": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..a6d8815 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,4 @@ +{ + "min_sdk_version": "29", + "run_cargo": false +} |