diff options
author | Andrew Walbran <qwandor@google.com> | 2023-11-20 13:15:44 +0000 |
---|---|---|
committer | Andrew Walbran <qwandor@google.com> | 2023-11-20 13:15:44 +0000 |
commit | 4e010678ac3d858dab9643ba4389302c9ce4fea7 (patch) | |
tree | 917f606ce4c92b79bee25893f3f509a48d83ec37 | |
parent | 4c84410f0f764e85bf996866daa6284c97d4dde3 (diff) | |
download | num_cpus-4e010678ac3d858dab9643ba4389302c9ce4fea7.tar.gz |
Migrate to cargo_embargo.
Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp
Change-Id: I9d2de46b11a93d8836bd5cef1914e47f93452ea5
-rw-r--r-- | Android.bp | 10 | ||||
-rw-r--r-- | cargo2android.json | 18 | ||||
-rw-r--r-- | cargo_embargo.json | 19 |
3 files changed, 22 insertions, 25 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 { @@ -45,9 +45,7 @@ rust_library { cargo_pkg_version: "1.15.0", srcs: ["src/lib.rs"], edition: "2015", - rustlibs: [ - "liblibc", - ], + rustlibs: ["liblibc"], apex_available: [ "//apex_available:platform", "com.android.btservices", @@ -73,7 +71,5 @@ rust_test { unit_test: false, }, edition: "2015", - rustlibs: [ - "liblibc", - ], + rustlibs: ["liblibc"], } diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index d95e478..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "com.android.btservices", - "com.android.compos", - "com.android.resolv", - "com.android.uwb", - "com.android.virt" - ], - "dependencies": true, - "device": true, - "min-sdk-version": "29", - "no-presubmit": true, - "patch": "patches/Android.bp.patch", - "run": true, - "tests": true, - "vendor-available": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..ca7d422 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,19 @@ +{ + "apex_available": [ + "//apex_available:platform", + "com.android.btservices", + "com.android.compos", + "com.android.resolv", + "com.android.uwb", + "com.android.virt" + ], + "min_sdk_version": "29", + "package": { + "num_cpus": { + "no_presubmit": true, + "patch": "patches/Android.bp.patch" + } + }, + "run_cargo": false, + "tests": true +} |