commit f8d22dec8788d18c5b37adf3b4710691d5d347ed
author David Brazdil <dbrazdil@google.com> Wed Jul 11 11:56:34 2018 +0100
committer David Brazdil <dbrazdil@google.com> Wed Jul 11 11:56:34 2018 +0100
tree 4c4134a5698ec16786423ad7430dec38ae36b1b0
parent d7647c1b6685dbf03ff096fd73424163f2468e4e
parent 6e3c86c8ed7a1bcfcbc63bbded0043d4b4efbe10

resolve merge conflicts of 6e3c86c8ed7a1bcfcbc63bbded0043d4b4efbe10 to stage-aosp-master

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ide3c4e229b47e4242cacafc04b70d8b392712cc8

test-base/Android.bp

diff --git a/test-base/Android.bp b/test-base/Android.bp
index 9b1867c..d25b477 100644
--- a/test-base/Android.bp
+++ b/test-base/Android.bp
@@ -117,4 +117,5 @@
         },
     },
     sdk_version: "current",
+    compile_dex: true,
 }

test-mock/Android.bp

diff --git a/test-mock/Android.bp b/test-mock/Android.bp
index 1d971fb..8d3faae 100644
--- a/test-mock/Android.bp
+++ b/test-mock/Android.bp
@@ -92,6 +92,7 @@
             enabled: false,
         },
     },
+    compile_dex: true,
 }
 
 java_library_static {
@@ -105,4 +106,5 @@
             enabled: false,
         },
     },
+    compile_dex: true,
 }

test-runner/Android.bp

diff --git a/test-runner/Android.bp b/test-runner/Android.bp
index 540a09e..2caa6c4 100644
--- a/test-runner/Android.bp
+++ b/test-runner/Android.bp
@@ -121,4 +121,5 @@
         },
     },
     sdk_version: "current",
+    compile_dex: true,
 }