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

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

Issue 1587733003: GN(android): Fix unit_tests_apk compile of @integer/google_play_services_version (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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1619 matching lines...) Expand 10 before | Expand all | Expand 10 after
1630 1630
1631 if (is_android) { 1631 if (is_android) {
1632 sources += rebase_path( 1632 sources += rebase_path(
1633 chrome_tests_unit_gypi_values.chrome_unit_tests_offline_pages_source s, 1633 chrome_tests_unit_gypi_values.chrome_unit_tests_offline_pages_source s,
1634 ".", 1634 ".",
1635 "//chrome") 1635 "//chrome")
1636 deps += [ 1636 deps += [
1637 ":unit_tests_java", 1637 ":unit_tests_java",
1638 "//components/offline_pages:test_support", 1638 "//components/offline_pages:test_support",
1639 "//v8:v8_external_startup_data_assets", 1639 "//v8:v8_external_startup_data_assets",
1640 google_play_services_resources,
1640 ] 1641 ]
1641 deps -= [ "//third_party/libaddressinput" ] 1642 deps -= [ "//third_party/libaddressinput" ]
1642 1643
1643 android_manifest = 1644 android_manifest =
1644 "//chrome/test/android/unit_tests_apk/AndroidManifest.xml" 1645 "//chrome/test/android/unit_tests_apk/AndroidManifest.xml"
1645 isolate_file = "../unit_tests.isolate" 1646 isolate_file = "../unit_tests.isolate"
1646 1647
1647 # Some android targets still depend on --gc-sections to link. 1648 # Some android targets still depend on --gc-sections to link.
1648 # TODO: remove --gc-sections for Debug builds (crbug.com/159847). 1649 # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
1649 ldflags = [ "-Wl,--gc-sections" ] 1650 ldflags = [ "-Wl,--gc-sections" ]
(...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after
2238 if (is_android) { 2239 if (is_android) {
2239 android_library("unit_tests_java") { 2240 android_library("unit_tests_java") {
2240 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" 2241 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src"
2241 deps = [ 2242 deps = [
2242 "//base:base_java", 2243 "//base:base_java",
2243 "//chrome/android:chrome_java", 2244 "//chrome/android:chrome_java",
2244 "//content/public/android:content_java", 2245 "//content/public/android:content_java",
2245 ] 2246 ]
2246 } 2247 }
2247 } 2248 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698