Upstream: DexOptimizer and DexLoader classes

chrome/android/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build_overrides/v8.gni")
 import("//chrome/android/chrome_public_apk_tmpl.gni")
 import("//chrome/common/features.gni")
 import("//chrome/version.gni")
@@ skipping 532 matching lines @@
 
 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk
 instrumentation_test_apk("chrome_public_test_apk") {
   apk_name = "ChromePublicTest"
   apk_under_test = ":chrome_public_apk"
   android_manifest = chrome_public_test_apk_manifest
 
   deps = [
     ":chrome_public_test_apk_manifest",
     ":chrome_test_java",
+    "//chrome/android/webapk/shell_apk:shell_apk_javatests",

[Yaron, 2016/05/16 20:39:58]

This is sufficient for the tests to get picked up and run, right?

[jbudorick, 2016/05/16 20:57:41]

yep

   ]
   additional_apks = [
+    "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk",

[Yaron, 2016/05/16 20:39:58]

I think this is fine and I think we discussed with the approach with John but
+jbudorick in case he has concerns. We could split out shell_apk_javatests as a
separate test target on the waterfall if needed

[jbudorick, 2016/05/16 20:57:41]

Yeah, I think it's fine for us to use chrome_public_test_apk as the default
target for instrumentation tests in //chrome/android. (sync_shell deviates
because it needs a different apk_under_test for some reason.)

     "//chrome/test/android/chrome_public_test_support:chrome_public_test_support_apk",
     "//net/android:net_test_support_apk",
   ]
   isolate_file = "../chrome_public_test_apk.isolate"
   proguard_enabled = !is_debug
 }
 
 android_library("chrome_sync_shell_test_apk_java") {
   testonly = true
 
@@ skipping 24 matching lines @@
 instrumentation_test_apk("chrome_sync_shell_test_apk") {
   apk_name = "ChromeSyncShellTest"
   apk_under_test = ":chrome_sync_shell_apk"
   android_manifest = chrome_sync_shell_test_apk_manifest
   deps = [
     ":chrome_sync_shell_test_apk_java",
     ":chrome_sync_shell_test_apk_manifest",
   ]
   proguard_enabled = !is_debug
 }