diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-11-15 22:54:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-11-15 22:54:21 +0000 |
| commit | 0297e0f98d5067dc350af708d396ee7f0a46b69c (patch) | |
| tree | 57d1fb8fdd1fd3e2dee6a08270ef1c14a9beb4e8 | |
| parent | c0005ccc4003f0c7204042ede2b7fd8378e4d842 (diff) | |
| parent | eaee9be42dab143601dffe6b30c9cfb15ccce554 (diff) | |
| download | adhd-0297e0f98d5067dc350af708d396ee7f0a46b69c.tar.gz | |
Merge "Apply crosvm_defaults to adhd modules."
| -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", |