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

Side by Side Diff: base/BUILD.gn

Issue 737633002: Fix various flags in the Win64 GN build (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: tweak more flags to better match GYP Created 6 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
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 6
7 if (is_android) { 7 if (is_android) {
8 import("//build/config/android/rules.gni") 8 import("//build/config/android/rules.gni")
9 } 9 }
10 10
(...skipping 1385 matching lines...) Expand 10 before | Expand all | Expand 10 after
1396 } 1396 }
1397 1397
1398 if (is_android) { 1398 if (is_android) {
1399 deps += [ 1399 deps += [
1400 "//testing/android:native_test_native_code", 1400 "//testing/android:native_test_native_code",
1401 ] 1401 ]
1402 set_sources_assignment_filter([]) 1402 set_sources_assignment_filter([])
1403 sources += [ "debug/proc_maps_linux_unittest.cc" ] 1403 sources += [ "debug/proc_maps_linux_unittest.cc" ]
1404 set_sources_assignment_filter(sources_assignment_filter) 1404 set_sources_assignment_filter(sources_assignment_filter)
1405 } 1405 }
1406
1407 if (is_win) {
1408 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1409 cflags = [ "/wd4267" ]
1410 }
1406 } 1411 }
1407 1412
1408 if (is_android) { 1413 if (is_android) {
1409 # GYP: //base.gyp:base_jni_headers 1414 # GYP: //base.gyp:base_jni_headers
1410 generate_jni("base_jni_headers") { 1415 generate_jni("base_jni_headers") {
1411 sources = [ 1416 sources = [
1412 "android/java/src/org/chromium/base/ApplicationStatus.java", 1417 "android/java/src/org/chromium/base/ApplicationStatus.java",
1413 "android/java/src/org/chromium/base/BuildInfo.java", 1418 "android/java/src/org/chromium/base/BuildInfo.java",
1414 "android/java/src/org/chromium/base/CommandLine.java", 1419 "android/java/src/org/chromium/base/CommandLine.java",
1415 "android/java/src/org/chromium/base/ContentUriUtils.java", 1420 "android/java/src/org/chromium/base/ContentUriUtils.java",
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
1506 # GYP: //base.gyp:base_unittests_apk 1511 # GYP: //base.gyp:base_unittests_apk
1507 unittest_apk("base_unittests_apk") { 1512 unittest_apk("base_unittests_apk") {
1508 deps = [ 1513 deps = [
1509 ":base_java", 1514 ":base_java",
1510 ":base_java_unittest_support", 1515 ":base_java_unittest_support",
1511 ":base_unittests", 1516 ":base_unittests",
1512 ] 1517 ]
1513 unittests_dep = ":base_unittests" 1518 unittests_dep = ":base_unittests"
1514 } 1519 }
1515 } 1520 }
OLDNEW
« no previous file with comments | « BUILD.gn ('k') | build/config/compiler/BUILD.gn » ('j') | build/config/compiler/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698