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

am: f8d22dec87 Change-Id: Ia11c6556d55a1eab3552edcd8665969001cfb9e7
2018-07-11 05:33:38 -07:00
parent d6f00d8511 f8d22dec87
commit 1efb9d2ec3
3 changed files with 4 additions and 0 deletions
--- a/test-base/Android.bp
+++ b/test-base/Android.bp
@@ -117,4 +117,5 @@ java_library_static {
        },
    },
    sdk_version: "current",
+    compile_dex: true,
 }
--- 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,
 }
--- a/test-runner/Android.bp
+++ b/test-runner/Android.bp
@@ -121,4 +121,5 @@ java_library_static {
        },
    },
    sdk_version: "current",
+    compile_dex: true,
 }