diff options
| author | 2018-07-11 05:33:38 -0700 | |
|---|---|---|
| committer | 2018-07-11 05:33:38 -0700 | |
| commit | 1efb9d2ec3e20e34a682368dcf7649f0281077ca (patch) | |
| tree | a56623e43ecdef77c6e0ea98f35112ffefbee4da | |
| parent | d6f00d85115a5c6a887f29b731cc8aa653996cc7 (diff) | |
| parent | f8d22dec8788d18c5b37adf3b4710691d5d347ed (diff) | |
resolve merge conflicts of 6e3c86c8ed7a1bcfcbc63bbded0043d4b4efbe10 to stage-aosp-master
am: f8d22dec87
Change-Id: Ia11c6556d55a1eab3552edcd8665969001cfb9e7
| -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, } |