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

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

Issue 1587253003: Revert of [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 1629 matching lines...) Expand 10 before | Expand all | Expand 10 after
1640 deps += [ 1640 deps += [
1641 ":unit_tests_java", 1641 ":unit_tests_java",
1642 "//components/offline_pages:test_support", 1642 "//components/offline_pages:test_support",
1643 "//v8:v8_external_startup_data_assets", 1643 "//v8:v8_external_startup_data_assets",
1644 google_play_services_resources, 1644 google_play_services_resources,
1645 ] 1645 ]
1646 deps -= [ "//third_party/libaddressinput" ] 1646 deps -= [ "//third_party/libaddressinput" ]
1647 1647
1648 android_manifest = 1648 android_manifest =
1649 "//chrome/test/android/unit_tests_apk/AndroidManifest.xml" 1649 "//chrome/test/android/unit_tests_apk/AndroidManifest.xml"
1650 enable_multidex = true
1651 isolate_file = "../unit_tests.isolate" 1650 isolate_file = "../unit_tests.isolate"
1652 1651
1653 # Some android targets still depend on --gc-sections to link. 1652 # Some android targets still depend on --gc-sections to link.
1654 # TODO: remove --gc-sections for Debug builds (crbug.com/159847). 1653 # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
1655 ldflags = [ "-Wl,--gc-sections" ] 1654 ldflags = [ "-Wl,--gc-sections" ]
1656 } else { 1655 } else {
1657 sources += rebase_path( 1656 sources += rebase_path(
1658 chrome_tests_unit_gypi_values.chrome_unit_tests_non_android_sources, 1657 chrome_tests_unit_gypi_values.chrome_unit_tests_non_android_sources,
1659 ".", 1658 ".",
1660 "//chrome") 1659 "//chrome")
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
2244 if (is_android) { 2243 if (is_android) {
2245 android_library("unit_tests_java") { 2244 android_library("unit_tests_java") {
2246 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" 2245 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src"
2247 deps = [ 2246 deps = [
2248 "//base:base_java", 2247 "//base:base_java",
2249 "//chrome/android:chrome_java", 2248 "//chrome/android:chrome_java",
2250 "//content/public/android:content_java", 2249 "//content/public/android:content_java",
2251 ] 2250 ]
2252 } 2251 }
2253 } 2252 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698