diff options
author | Andrew Walbran <qwandor@google.com> | 2023-11-20 15:57:28 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-20 15:57:28 +0000 |
commit | 02023655d315936295a795b880edbd4059d83bae (patch) | |
tree | 2526d664052f7043a5978d3bd255de6ec592188a | |
parent | 9d5605b932727deaf82119733aa291038999b342 (diff) | |
parent | c659a3cc4711746b2b887113005b9ffc207d03c9 (diff) | |
download | socket2-02023655d315936295a795b880edbd4059d83bae.tar.gz |
Migrate to cargo_embargo. am: da8ef9fbda am: c659a3cc47
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/socket2/+/2837796
Change-Id: Id66104ec21bb4543794126e9da0717f6638d35f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 6 | ||||
-rw-r--r-- | cargo2android.json | 7 | ||||
-rw-r--r-- | cargo_embargo.json | 7 |
3 files changed, 9 insertions, 11 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 { @@ -46,9 +46,7 @@ rust_library { srcs: ["src/lib.rs"], edition: "2021", features: ["all"], - rustlibs: [ - "liblibc", - ], + rustlibs: ["liblibc"], apex_available: [ "//apex_available:platform", "//apex_available:anyapex", diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 6cf7f3d..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "device": true, - "features": "all", - "min-sdk-version": "29", - "vendor-available": true, - "run": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..bc82b96 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,7 @@ +{ + "features": [ + "all" + ], + "min_sdk_version": "29", + "run_cargo": false +} |