diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-04-28 21:52:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 21:52:42 +0000 |
| commit | 16fc4abb8570d28b89a7f32a68770c68595b95b3 (patch) | |
| tree | d382200c188be653d0f36bcb8b740f7907012d27 | |
| parent | 84efb330e621544a4c6776fbac46b9852ee346e7 (diff) | |
| parent | fc011c2e3d7100d6b4dadf231dfd44a5b5cb215b (diff) | |
| download | android_log-sys-16fc4abb8570d28b89a7f32a68770c68595b95b3.tar.gz | |
Generate apex_available from c2a instead of a patch am: 3f92d191de am: fc011c2e3d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/android_log-sys/+/1687129
Change-Id: Iec539d9701192bd8afba8f239597bd1a328b9710
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | cargo2android.json | 10 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 14 |
3 files changed, 18 insertions, 9 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: [ diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..623aa56 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,10 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], + "dependencies": true, + "device": true, + "patch": "patches/Android.bp.patch", + "run": true +}
\ No newline at end of file diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch index 207e6be..b458dd2 100644 --- a/patches/Android.bp.patch +++ b/patches/Android.bp.patch @@ -1,6 +1,6 @@ ---- Android.bp.orig 2020-10-30 16:31:00.469140136 -0700 -+++ Android.bp 2020-10-30 16:31:43.436969421 -0700 -@@ -6,4 +6,14 @@ +--- a/Android.bp ++++ b/Android.bp +@@ -45,6 +45,12 @@ rust_library { crate_name: "android_log_sys", srcs: ["src/lib.rs"], edition: "2015", @@ -10,8 +10,6 @@ + enabled: false, + }, + }, -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } + apex_available: [ + "//apex_available:platform", + "com.android.virt", |