diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-11-14 18:12:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-14 18:12:47 +0000 |
| commit | 2103e3b07e73390b94411cab9e216bf26c7d49bf (patch) | |
| tree | bf34a890e7e5d5e1e4177eacabeadab904d0d1bd | |
| parent | c0e29e42dd46c0f20fa60e4ee03c44262d62f6f9 (diff) | |
| parent | 551fcbd5d2cfef3f92664cff7615bcdbe838bd0e (diff) | |
| download | log-2103e3b07e73390b94411cab9e216bf26c7d49bf.tar.gz | |
Use add-module-block to preserve changes to Android.bp. am: 5a83b41bad am: dc20e1b3c8 am: 551fcbd5d2
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/log/+/2828093
Change-Id: I2898af936e61a56d90fb428ae93adffc92650f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | android_impl.bp | 12 | ||||
| -rw-r--r-- | cargo2android.json | 3 |
3 files changed, 15 insertions, 2 deletions
@@ -71,7 +71,7 @@ rust_library { "liblog", ], } - } + }, } rust_library_rlib { diff --git a/android_impl.bp b/android_impl.bp new file mode 100644 index 0000000..77d8833 --- /dev/null +++ b/android_impl.bp @@ -0,0 +1,12 @@ +target: { + android: { + cfgs: ["default_log_impl"], + rustlibs: [ + "libandroid_log_sys", + "libonce_cell", + ], + shared_libs: [ + "liblog", + ], + } +}
\ No newline at end of file diff --git a/cargo2android.json b/cargo2android.json index 474419b..2e29872 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -6,7 +6,8 @@ "variants": [ { "features": "std", - "suffix": "_rust" + "suffix": "_rust", + "add-module-block": "android_impl.bp" }, { "force-rlib": true, |