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

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

Issue 1421473010: Replace most uses of asset_location with android_assets() template (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | « chrome/android/chrome_public_apk_tmpl.gni ('k') | content/content_unittests.isolate » ('j') | 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 1600 matching lines...) Expand 10 before | Expand all | Expand 10 after
1611 1611
1612 if (is_android) { 1612 if (is_android) {
1613 sources += rebase_path( 1613 sources += rebase_path(
1614 chrome_tests_unit_gypi_values.chrome_unit_tests_offline_pages_source s, 1614 chrome_tests_unit_gypi_values.chrome_unit_tests_offline_pages_source s,
1615 ".", 1615 ".",
1616 "//chrome") 1616 "//chrome")
1617 deps -= [ "//third_party/libaddressinput" ] 1617 deps -= [ "//third_party/libaddressinput" ]
1618 1618
1619 android_manifest = 1619 android_manifest =
1620 "//chrome/test/android/unit_tests_apk/AndroidManifest.xml" 1620 "//chrome/test/android/unit_tests_apk/AndroidManifest.xml"
1621 apk_asset_location = "$root_out_dir/unit_tests_apk/assets" 1621 apk_deps = [
1622 apk_deps = [ ":unit_tests_java" ] 1622 ":unit_tests_java",
1623 "//v8:v8_external_startup_data_assets",
1624 ]
1623 isolate_file = "../unit_tests.isolate" 1625 isolate_file = "../unit_tests.isolate"
1624 deps += [ ":copy_unit_tests_apk_assets" ]
1625 1626
1626 # Some android targets still depend on --gc-sections to link. 1627 # Some android targets still depend on --gc-sections to link.
1627 # TODO: remove --gc-sections for Debug builds (crbug.com/159847). 1628 # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
1628 ldflags = [ "-Wl,--gc-sections" ] 1629 ldflags = [ "-Wl,--gc-sections" ]
1629 } else { 1630 } else {
1630 sources += rebase_path( 1631 sources += rebase_path(
1631 chrome_tests_unit_gypi_values.chrome_unit_tests_non_android_sources, 1632 chrome_tests_unit_gypi_values.chrome_unit_tests_non_android_sources,
1632 ".", 1633 ".",
1633 "//chrome") 1634 "//chrome")
1634 sources -= 1635 sources -=
(...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after
2191 2192
2192 if (!is_android && use_ash) { 2193 if (!is_android && use_ash) {
2193 sources += rebase_path( 2194 sources += rebase_path(
2194 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, 2195 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources,
2195 ".", 2196 ".",
2196 "//chrome") 2197 "//chrome")
2197 } 2198 }
2198 } 2199 }
2199 2200
2200 if (is_android) { 2201 if (is_android) {
2201 copy_ex("copy_unit_tests_apk_assets") {
2202 clear_dir = true
2203 dest = "$root_out_dir/unit_tests_apk/assets"
2204
2205 if (v8_use_external_startup_data) {
2206 renaming_sources = v8_external_startup_data_renaming_sources
2207 renaming_destinations = v8_external_startup_data_renaming_destinations
2208 deps = [
2209 "//v8",
2210 ]
2211 }
2212 }
2213
2214 android_library("unit_tests_java") { 2202 android_library("unit_tests_java") {
2215 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" 2203 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src"
2216 deps = [ 2204 deps = [
2217 "//base:base_java", 2205 "//base:base_java",
2218 "//chrome/android:chrome_java", 2206 "//chrome/android:chrome_java",
2219 "//content/public/android:content_java", 2207 "//content/public/android:content_java",
2220 ] 2208 ]
2221 } 2209 }
2222 } 2210 }
OLDNEW
« no previous file with comments | « chrome/android/chrome_public_apk_tmpl.gni ('k') | content/content_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698