diff options
| author | Ivan Lozano <ivanlozano@google.com> | 2019-11-15 15:16:34 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-15 15:16:34 -0800 |
| commit | 1d07dd4bd70d0ff7a71404a80239d1de99188d47 (patch) | |
| tree | 57d1fb8fdd1fd3e2dee6a08270ef1c14a9beb4e8 | |
| parent | 700eaa9c8abd01fb643a48fb21c37462b3a5c3b6 (diff) | |
| parent | fd2f5d24410088d6007f25b4dd2d01d7a540a0d7 (diff) | |
| download | adhd-1d07dd4bd70d0ff7a71404a80239d1de99188d47.tar.gz | |
Merge "Apply crosvm_defaults to adhd modules." am: 0297e0f98d
am: fd2f5d2441
Change-Id: Ifefa0e6c2718bbf7b38fe13c0790f41e870cb6af
| -rw-r--r-- | audio_streams/Android.bp | 2 | ||||
| -rw-r--r-- | cras/client/cras-sys/Android.bp | 1 | ||||
| -rw-r--r-- | cras/client/libcras/Android.bp | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/audio_streams/Android.bp b/audio_streams/Android.bp index 3e78e566..95b816b0 100644 --- a/audio_streams/Android.bp +++ b/audio_streams/Android.bp @@ -1,7 +1,7 @@ rust_library_host_rlib { name: "libaudio_streams", + defaults: ["crosvm_defaults"], deny_warnings: false, crate_name: "audio_streams", - edition: "2018", srcs: ["src/audio_streams.rs"], } diff --git a/cras/client/cras-sys/Android.bp b/cras/client/cras-sys/Android.bp index 0e061b1b..46ed7b8c 100644 --- a/cras/client/cras-sys/Android.bp +++ b/cras/client/cras-sys/Android.bp @@ -1,5 +1,6 @@ rust_library_host_rlib { name: "libcras_sys", + defaults: ["crosvm_defaults"], deny_warnings: false, crate_name: "cras_sys", edition: "2015", diff --git a/cras/client/libcras/Android.bp b/cras/client/libcras/Android.bp index 3c0b3ede..f3971915 100644 --- a/cras/client/libcras/Android.bp +++ b/cras/client/libcras/Android.bp @@ -1,8 +1,8 @@ rust_library_host_rlib { name: "liblibcras", + defaults: ["crosvm_defaults"], deny_warnings: false, crate_name: "libcras", - edition: "2018", srcs: ["src/libcras.rs"], rlibs: [ "liblibc", |