diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:32:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:32:42 +0000 |
| commit | c26c22d4df84540b98d4d3fcac3b9cc4b0f6ac93 (patch) | |
| tree | ea3b424ccfcb2943ddb5315a0be486b1228d593d | |
| parent | d6f9ec1831fc5d411ae44a46c9c8908579d2d5cf (diff) | |
| parent | f01cacb86e74d8c83163a8e06ca05c88e142e82e (diff) | |
| download | num_cpus-c26c22d4df84540b98d4d3fcac3b9cc4b0f6ac93.tar.gz | |
Generate apex_available from c2a instead of a patch am: 26ca985f6a am: ba225c54ef am: c7b4be65fc am: f01cacb86e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/num_cpus/+/1688581
Change-Id: I8c5f46a3a9b0c5768b526e7d10f875fc47f22368
| -rw-r--r-- | Android.bp | 5 | ||||
| -rw-r--r-- | cargo2android.json | 9 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 15 |
3 files changed, 12 insertions, 17 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --run --dependencies --device --patch=patches/Android.bp.patch. +// This file is generated by cargo2android.py --config cargo2android.json. +// Do not modify this file as changes will be overridden on upgrade. package { default_applicable_licenses: ["external_rust_crates_num_cpus_license"], @@ -52,4 +53,4 @@ rust_library { } // dependent_library ["feature_list"] -// libc-0.2.81 "default,std" +// libc-0.2.94 "default,std" diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..42b7833 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,9 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], + "dependencies": true, + "device": true, + "run": true +}
\ No newline at end of file diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch deleted file mode 100644 index 968209d..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 5c46750..fd8d3d0 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -9,6 +9,10 @@ rust_library { - rustlibs: [ - "liblibc", - ], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } - - // dependent_library ["feature_list"] |