Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Side by Side Diff: chrome/test/BUILD.gn

Issue 1581563003: [Android] Rework multidex and enable multidex for unit_tests_apk. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/chrome_build.gni") 5 import("//build/config/chrome_build.gni")
6 import("//build/config/compiler/compiler.gni") 6 import("//build/config/compiler/compiler.gni")
7 import("//build/config/crypto.gni") 7 import("//build/config/crypto.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/ui.gni") 9 import("//build/config/ui.gni")
10 import("//chrome/chrome_tests.gni") 10 import("//chrome/chrome_tests.gni")
(...skipping 1626 matching lines...) Expand 10 before | Expand all | Expand 10 after
1637 "//chrome") 1637 "//chrome")
1638 deps += [ 1638 deps += [
1639 ":unit_tests_java", 1639 ":unit_tests_java",
1640 "//components/offline_pages:test_support", 1640 "//components/offline_pages:test_support",
1641 "//v8:v8_external_startup_data_assets", 1641 "//v8:v8_external_startup_data_assets",
1642 ] 1642 ]
1643 deps -= [ "//third_party/libaddressinput" ] 1643 deps -= [ "//third_party/libaddressinput" ]
1644 1644
1645 android_manifest = 1645 android_manifest =
1646 "//chrome/test/android/unit_tests_apk/AndroidManifest.xml" 1646 "//chrome/test/android/unit_tests_apk/AndroidManifest.xml"
1647 enable_multidex = true
1647 isolate_file = "../unit_tests.isolate" 1648 isolate_file = "../unit_tests.isolate"
1648 1649
1649 # Some android targets still depend on --gc-sections to link. 1650 # Some android targets still depend on --gc-sections to link.
1650 # TODO: remove --gc-sections for Debug builds (crbug.com/159847). 1651 # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
1651 ldflags = [ "-Wl,--gc-sections" ] 1652 ldflags = [ "-Wl,--gc-sections" ]
1652 } else { 1653 } else {
1653 sources += rebase_path( 1654 sources += rebase_path(
1654 chrome_tests_unit_gypi_values.chrome_unit_tests_non_android_sources, 1655 chrome_tests_unit_gypi_values.chrome_unit_tests_non_android_sources,
1655 ".", 1656 ".",
1656 "//chrome") 1657 "//chrome")
(...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after
2243 if (is_android) { 2244 if (is_android) {
2244 android_library("unit_tests_java") { 2245 android_library("unit_tests_java") {
2245 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" 2246 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src"
2246 deps = [ 2247 deps = [
2247 "//base:base_java", 2248 "//base:base_java",
2248 "//chrome/android:chrome_java", 2249 "//chrome/android:chrome_java",
2249 "//content/public/android:content_java", 2250 "//content/public/android:content_java",
2250 ] 2251 ]
2251 } 2252 }
2252 } 2253 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698