Chromium Code Reviews| 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 1927 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1938 "../tools/convert_dict/convert_dict_unittest.cc", | 1938 "../tools/convert_dict/convert_dict_unittest.cc", |
| 1939 ] | 1939 ] |
| 1940 | 1940 |
| 1941 # The test fetches resources which means Mac need the app bundle to exist | 1941 # The test fetches resources which means Mac need the app bundle to exist |
| 1942 # on disk so it can pull from it. | 1942 # on disk so it can pull from it. |
| 1943 deps += [ | 1943 deps += [ |
| 1944 "//third_party/google_toolbox_for_mac", | 1944 "//third_party/google_toolbox_for_mac", |
| 1945 "//third_party/ocmock", | 1945 "//third_party/ocmock", |
| 1946 ] | 1946 ] |
| 1947 | 1947 |
| 1948 if (!mac_views_browser) { | |
|
tapted
2015/12/17 01:49:19
Same dealie here. I.e.
if (mac_views_browser
jackhou1
2015/12/17 04:03:50
Done.
| |
| 1949 sources += rebase_path( | |
| 1950 chrome_tests_unit_gypi_values.chrome_unit_tests_cocoa_sources, | |
| 1951 ".", | |
| 1952 "//chrome") | |
| 1953 } | |
| 1954 | |
| 1948 # TODO(mark): We really want this for all non-static library targets, | 1955 # TODO(mark): We really want this for all non-static library targets, |
| 1949 # but when we tried to pull it up to the common.gypi level, it broke | 1956 # but when we tried to pull it up to the common.gypi level, it broke |
| 1950 # other things like the ui and startup tests. *shrug* | 1957 # other things like the ui and startup tests. *shrug* |
| 1951 ldflags = [ "-Wl,-ObjC" ] | 1958 ldflags = [ "-Wl,-ObjC" ] |
| 1952 } | 1959 } |
| 1953 if (is_mac || is_android) { | 1960 if (is_mac || is_android) { |
| 1954 sources += rebase_path( | 1961 sources += rebase_path( |
| 1955 chrome_tests_unit_gypi_values.chrome_unit_tests_mac_android_sources, | 1962 chrome_tests_unit_gypi_values.chrome_unit_tests_mac_android_sources, |
| 1956 ".", | 1963 ".", |
| 1957 "//chrome") | 1964 "//chrome") |
| (...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2228 if (is_android) { | 2235 if (is_android) { |
| 2229 android_library("unit_tests_java") { | 2236 android_library("unit_tests_java") { |
| 2230 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" | 2237 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" |
| 2231 deps = [ | 2238 deps = [ |
| 2232 "//base:base_java", | 2239 "//base:base_java", |
| 2233 "//chrome/android:chrome_java", | 2240 "//chrome/android:chrome_java", |
| 2234 "//content/public/android:content_java", | 2241 "//content/public/android:content_java", |
| 2235 ] | 2242 ] |
| 2236 } | 2243 } |
| 2237 } | 2244 } |
| OLD | NEW |