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

Side by Side Diff: gyp/common_conditions.gypi

Issue 1835303003: We meant these to be YES... sigh. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: ios too Created 4 years, 8 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 | 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 2015 Google Inc. 1 # Copyright 2015 Google Inc.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 # conditions used in both common.gypi and skia.gyp in chromium 6 # conditions used in both common.gypi and skia.gyp in chromium
7 # 7 #
8 { 8 {
9 'defines': [ 9 'defines': [
10 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', 10 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 # The -L/usr/lib is redundant but innocuous: it's a default path. 535 # The -L/usr/lib is redundant but innocuous: it's a default path.
536 'LIBRARY_SEARCH_PATHS': [ '/usr/lib -fsanitize=<(skia_sanitizer)'] , 536 'LIBRARY_SEARCH_PATHS': [ '/usr/lib -fsanitize=<(skia_sanitizer)'] ,
537 }], 537 }],
538 ], 538 ],
539 'CLANG_CXX_LIBRARY': 'libc++', 539 'CLANG_CXX_LIBRARY': 'libc++',
540 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', 540 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
541 'GCC_ENABLE_CPP_EXCEPTIONS': 'NO', # -fno-exceptions 541 'GCC_ENABLE_CPP_EXCEPTIONS': 'NO', # -fno-exceptions
542 'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti 542 'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti
543 'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe -statics 543 'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe -statics
544 'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES', # -mssse3 544 'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES', # -mssse3
545 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # -fvisibility=hi dden 545 'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hi dden
546 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'NO', # -fvisibility-in lines-hidden 546 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES', # -fvisibility-in lines-hidden
547 'GCC_CW_ASM_SYNTAX': 'NO', # remove -fasm-bl ocks 547 'GCC_CW_ASM_SYNTAX': 'NO', # remove -fasm-bl ocks
548 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # remove -mpascal -strings 548 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # remove -mpascal -strings
549 'WARNING_CFLAGS': [ 549 'WARNING_CFLAGS': [
550 '-Wall', 550 '-Wall',
551 '-Wextra', 551 '-Wextra',
552 '-Winit-self', 552 '-Winit-self',
553 '-Wpointer-arith', 553 '-Wpointer-arith',
554 '-Wsign-compare', 554 '-Wsign-compare',
555 555
556 '-Wno-unused-parameter', 556 '-Wno-unused-parameter',
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 'CODE_SIGNING_REQUIRED': 'NO', 591 'CODE_SIGNING_REQUIRED': 'NO',
592 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)', 592 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)',
593 'SDKROOT': 'iphoneos', 593 'SDKROOT': 'iphoneos',
594 'TARGETED_DEVICE_FAMILY': '1,2', 594 'TARGETED_DEVICE_FAMILY': '1,2',
595 595
596 'CLANG_CXX_LIBRARY': 'libc++', 596 'CLANG_CXX_LIBRARY': 'libc++',
597 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', 597 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
598 'GCC_ENABLE_CPP_EXCEPTIONS': 'NO', # -fno-exceptions 598 'GCC_ENABLE_CPP_EXCEPTIONS': 'NO', # -fno-exceptions
599 'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti 599 'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti
600 'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe-statics 600 'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe-statics
601 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # -fvisibility=hidden 601 'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden
602 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'NO', # -fvisibility-inlines-hidde n 602 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES', # -fvisibility-inlines-hidde n
603 603
604 'GCC_THUMB_SUPPORT': 'NO', # TODO(mtklein): why would we not want thu mb? 604 'GCC_THUMB_SUPPORT': 'NO', # TODO(mtklein): why would we not want thu mb?
605 }, 605 },
606 }, 606 },
607 ], 607 ],
608 608
609 [ 'skia_os == "android"', 609 [ 'skia_os == "android"',
610 { 610 {
611 'defines': [ 611 'defines': [
612 'SK_BUILD_FOR_ANDROID', 612 'SK_BUILD_FOR_ANDROID',
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
686 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'], 686 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'],
687 }, 687 },
688 }], 688 }],
689 689
690 ], # end 'conditions' 690 ], # end 'conditions'
691 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 691 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
692 'xcode_settings': { 692 'xcode_settings': {
693 'SYMROOT': '<(DEPTH)/xcodebuild', 693 'SYMROOT': '<(DEPTH)/xcodebuild',
694 }, 694 },
695 } 695 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698