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

Side by Side Diff: base/BUILD.gn

Issue 955273002: Fix PEImage tests to use a checked in binary. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove incorrect isolate entry Created 5 years, 10 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 | base/base.gyp » ('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 (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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/ui.gni") 5 import("//build/config/ui.gni")
6 import("//testing/test.gni") 6 import("//testing/test.gni")
7 7
8 if (is_android) { 8 if (is_android) {
9 import("//build/config/android/rules.gni") 9 import("//build/config/android/rules.gni")
10 } 10 }
(...skipping 1122 matching lines...) Expand 10 before | Expand all | Expand 10 after
1133 sources = [ 1133 sources = [
1134 "files/protect_file_posix.cc", 1134 "files/protect_file_posix.cc",
1135 ] 1135 ]
1136 1136
1137 deps = [ 1137 deps = [
1138 "//base", 1138 "//base",
1139 ] 1139 ]
1140 } 1140 }
1141 1141
1142 if (is_win) { 1142 if (is_win) {
1143 # Target to manually rebuild pe_image_test.dll which is checked into
1144 # base/test/data/pe_image.
1143 shared_library("pe_image_test") { 1145 shared_library("pe_image_test") {
1144 sources = [ 1146 sources = [
1145 "win/pe_image_test.cc", 1147 "win/pe_image_test.cc",
1146 ] 1148 ]
1147 ldflags = [ 1149 ldflags = [
1148 "/DELAYLOAD:cfgmgr32.dll", 1150 "/DELAYLOAD:cfgmgr32.dll",
1149 "/DELAYLOAD:shell32.dll", 1151 "/DELAYLOAD:shell32.dll",
1150 "/SUBSYSTEM:WINDOWS", 1152 "/SUBSYSTEM:WINDOWS",
1151 ] 1153 ]
1152 libs = [ 1154 libs = [
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
1457 deps += [ "//third_party/libevent" ] 1459 deps += [ "//third_party/libevent" ]
1458 } 1460 }
1459 1461
1460 if (is_android) { 1462 if (is_android) {
1461 deps += [ "//testing/android:native_test_native_code" ] 1463 deps += [ "//testing/android:native_test_native_code" ]
1462 set_sources_assignment_filter([]) 1464 set_sources_assignment_filter([])
1463 sources += [ "debug/proc_maps_linux_unittest.cc" ] 1465 sources += [ "debug/proc_maps_linux_unittest.cc" ]
1464 set_sources_assignment_filter(sources_assignment_filter) 1466 set_sources_assignment_filter(sources_assignment_filter)
1465 } 1467 }
1466 1468
1467 if (is_win) {
1468 deps += [ ":pe_image_test" ]
1469 }
1470
1471 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1469 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1472 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] 1470 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
1473 } 1471 }
1474 1472
1475 if (is_android) { 1473 if (is_android) {
1476 # GYP: //base.gyp:base_jni_headers 1474 # GYP: //base.gyp:base_jni_headers
1477 generate_jni("base_jni_headers") { 1475 generate_jni("base_jni_headers") {
1478 sources = [ 1476 sources = [
1479 "android/java/src/org/chromium/base/ApplicationStatus.java", 1477 "android/java/src/org/chromium/base/ApplicationStatus.java",
1480 "android/java/src/org/chromium/base/BuildInfo.java", 1478 "android/java/src/org/chromium/base/BuildInfo.java",
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
1568 1566
1569 # GYP: //base.gyp:base_java_unittest_support 1567 # GYP: //base.gyp:base_java_unittest_support
1570 android_library("base_java_unittest_support") { 1568 android_library("base_java_unittest_support") {
1571 deps = [ 1569 deps = [
1572 ":base_java", 1570 ":base_java",
1573 ] 1571 ]
1574 java_files = 1572 java_files =
1575 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 1573 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
1576 } 1574 }
1577 } 1575 }
OLDNEW
« no previous file with comments | « no previous file | base/base.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698