diff options
| author | David Brazdil <dbrazdil@google.com> | 2018-07-11 11:56:34 +0100 |
|---|---|---|
| committer | David Brazdil <dbrazdil@google.com> | 2018-07-11 11:56:34 +0100 |
| commit | f8d22dec8788d18c5b37adf3b4710691d5d347ed (patch) | |
| tree | 4c4134a5698ec16786423ad7430dec38ae36b1b0 | |
| parent | d7647c1b6685dbf03ff096fd73424163f2468e4e (diff) | |
| parent | 6e3c86c8ed7a1bcfcbc63bbded0043d4b4efbe10 (diff) | |
resolve merge conflicts of 6e3c86c8ed7a1bcfcbc63bbded0043d4b4efbe10 to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ide3c4e229b47e4242cacafc04b70d8b392712cc8
| -rw-r--r-- | test-base/Android.bp | 1 | ||||
| -rw-r--r-- | test-mock/Android.bp | 2 | ||||
| -rw-r--r-- | test-runner/Android.bp | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/test-base/Android.bp b/test-base/Android.bp index 9b1867cd90fd..d25b47727c0b 100644 --- a/test-base/Android.bp +++ b/test-base/Android.bp @@ -117,4 +117,5 @@ java_library_static { }, }, sdk_version: "current", + compile_dex: true, } diff --git a/test-mock/Android.bp b/test-mock/Android.bp index 1d971fb95a4f..8d3faaef9f6b 100644 --- a/test-mock/Android.bp +++ b/test-mock/Android.bp @@ -92,6 +92,7 @@ java_library_static { enabled: false, }, }, + compile_dex: true, } java_library_static { @@ -105,4 +106,5 @@ java_library_static { enabled: false, }, }, + compile_dex: true, } diff --git a/test-runner/Android.bp b/test-runner/Android.bp index 540a09e45db1..2caa6c45f16b 100644 --- a/test-runner/Android.bp +++ b/test-runner/Android.bp @@ -121,4 +121,5 @@ java_library_static { }, }, sdk_version: "current", + compile_dex: true, } |