| OLD | NEW |
| 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 2021 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2032 chrome_tests_unit_gypi_values.chrome_unit_tests_cocoa_sources, | 2032 chrome_tests_unit_gypi_values.chrome_unit_tests_cocoa_sources, |
| 2033 ".", | 2033 ".", |
| 2034 "//chrome") | 2034 "//chrome") |
| 2035 } | 2035 } |
| 2036 | 2036 |
| 2037 # TODO(mark): We really want this for all non-static library targets, | 2037 # TODO(mark): We really want this for all non-static library targets, |
| 2038 # but when we tried to pull it up to the common.gypi level, it broke | 2038 # but when we tried to pull it up to the common.gypi level, it broke |
| 2039 # other things like the ui and startup tests. *shrug* | 2039 # other things like the ui and startup tests. *shrug* |
| 2040 ldflags = [ "-Wl,-ObjC" ] | 2040 ldflags = [ "-Wl,-ObjC" ] |
| 2041 } | 2041 } |
| 2042 if (is_mac || is_android) { | |
| 2043 sources += rebase_path( | |
| 2044 chrome_tests_unit_gypi_values.chrome_unit_tests_mac_android_sources, | |
| 2045 ".", | |
| 2046 "//chrome") | |
| 2047 } | |
| 2048 if (is_android) { | |
| 2049 sources += rebase_path( | |
| 2050 chrome_tests_unit_gypi_values.chrome_unit_tests_android_sources, | |
| 2051 ".", | |
| 2052 "//chrome") | |
| 2053 } | |
| 2054 if (!is_mac && !is_ios) { | 2042 if (!is_mac && !is_ios) { |
| 2055 deps += [ | 2043 deps += [ |
| 2056 "//chrome:packed_extra_resources", | 2044 "//chrome:packed_extra_resources", |
| 2057 "//chrome:packed_resources", | 2045 "//chrome:packed_resources", |
| 2058 "//chrome/tools/convert_dict:lib", | 2046 "//chrome/tools/convert_dict:lib", |
| 2059 "//third_party/hunspell", | 2047 "//third_party/hunspell", |
| 2060 ] | 2048 ] |
| 2061 } | 2049 } |
| 2062 if (is_win || is_mac) { | 2050 if (is_win || is_mac) { |
| 2063 sources += rebase_path( | 2051 sources += rebase_path( |
| (...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2342 if (is_android) { | 2330 if (is_android) { |
| 2343 android_library("unit_tests_java") { | 2331 android_library("unit_tests_java") { |
| 2344 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap
k/ChromeNativeTestApplication.java" ] | 2332 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap
k/ChromeNativeTestApplication.java" ] |
| 2345 deps = [ | 2333 deps = [ |
| 2346 "//base:base_java", | 2334 "//base:base_java", |
| 2347 "//chrome/android:chrome_java", | 2335 "//chrome/android:chrome_java", |
| 2348 "//content/public/android:content_java", | 2336 "//content/public/android:content_java", |
| 2349 ] | 2337 ] |
| 2350 } | 2338 } |
| 2351 } | 2339 } |
| OLD | NEW |