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

Side by Side Diff: build/config/compiler/BUILD.gn

Issue 359783005: Include stlport through -isystem instead of -I. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: blehgn Created 6 years, 5 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 | « build/common.gypi ('k') | no next file » | 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/android/config.gni") 5 import("//build/config/android/config.gni")
6 if (cpu_arch == "arm") { 6 if (cpu_arch == "arm") {
7 import("//build/config/arm.gni") 7 import("//build/config/arm.gni")
8 } 8 }
9 if (is_posix) { 9 if (is_posix) {
10 import("//build/config/gcc/gcc_version.gni") 10 import("//build/config/gcc/gcc_version.gni")
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 "-I" + rebase_path("$android_src/external/stlport/stlport", 393 "-I" + rebase_path("$android_src/external/stlport/stlport",
394 root_build_dir), 394 root_build_dir),
395 ] 395 ]
396 libs += [ 396 libs += [
397 "stlport", 397 "stlport",
398 ] 398 ]
399 } else { 399 } else {
400 android_stlport_root = "$android_ndk_root/sources/cxx-stl/stlport" 400 android_stlport_root = "$android_ndk_root/sources/cxx-stl/stlport"
401 401
402 cflags += [ 402 cflags += [
403 "-I" + rebase_path("$android_stlport_root/stlport", root_build_dir) 403 "-isystem" + rebase_path("$android_stlport_root/stlport",
404 root_build_dir)
404 ] 405 ]
405 lib_dirs += [ "$android_stlport_root/libs/$android_app_abi" ] 406 lib_dirs += [ "$android_stlport_root/libs/$android_app_abi" ]
406 407
407 if (component_mode == "shared_library") { 408 if (component_mode == "shared_library") {
408 libs += [ "stlport_shared" ] 409 libs += [ "stlport_shared" ]
409 } else { 410 } else {
410 libs += [ "stlport_static" ] 411 libs += [ "stlport_static" ]
411 } 412 }
412 } 413 }
413 414
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 } else { 831 } else {
831 cflags = [ "-g1" ] 832 cflags = [ "-g1" ]
832 } 833 }
833 } 834 }
834 835
835 config("no_symbols") { 836 config("no_symbols") {
836 if (!is_win) { 837 if (!is_win) {
837 cflags = [ "-g0" ] 838 cflags = [ "-g0" ]
838 } 839 }
839 } 840 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698