diff options
author | Ben Murdoch <benm@google.com> | 2013-07-10 11:40:50 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2013-07-10 11:40:50 +0100 |
commit | eb525c5499e34cc9c4b825d6d9e75bb07cc06ace (patch) | |
tree | d908ce4bfe1717d2cd53f41327d8b9ba8304355f /android_webview/android_webview_common.target.darwin-arm.mk | |
parent | 3c54152607de4272b3da0c146b71dcba8a0e5610 (diff) | |
download | chromium_org-eb525c5499e34cc9c4b825d6d9e75bb07cc06ace.tar.gz |
Merge from Chromium at DEPS revision r210036
This commit was generated by merge_to_master.py.
Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
Diffstat (limited to 'android_webview/android_webview_common.target.darwin-arm.mk')
-rw-r--r-- | android_webview/android_webview_common.target.darwin-arm.mk | 149 |
1 files changed, 139 insertions, 10 deletions
diff --git a/android_webview/android_webview_common.target.darwin-arm.mk b/android_webview/android_webview_common.target.darwin-arm.mk index 750223a962..2609eed0de 100644 --- a/android_webview/android_webview_common.target.darwin-arm.mk +++ b/android_webview/android_webview_common.target.darwin-arm.mk @@ -27,7 +27,6 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ - android_webview/browser/aw_autofill_manager_delegate.cc \ android_webview/browser/aw_browser_context.cc \ android_webview/browser/aw_browser_main_parts.cc \ android_webview/browser/aw_contents_client_bridge_base.cc \ @@ -69,7 +68,7 @@ LOCAL_SRC_FILES := \ # Flags passed to both C and C++ files. -MY_CFLAGS := \ +MY_CFLAGS_Debug := \ -fstack-protector \ --param=ssp-buffer-size=4 \ -Werror \ @@ -81,6 +80,7 @@ MY_CFLAGS := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unknown-pragmas \ -fno-tree-sra \ -fuse-ld=gold \ -Wno-psabi \ @@ -101,9 +101,7 @@ MY_CFLAGS := \ -fdata-sections \ -ffunction-sections -MY_CFLAGS_C := - -MY_DEFS := \ +MY_DEFS_Debug := \ '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DUSE_LINUX_BREAKPAD' \ @@ -134,10 +132,118 @@ MY_DEFS := \ '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ '-D_DEBUG' -LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS) # Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES := \ +LOCAL_C_INCLUDES_Debug := \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/skia/config \ + $(gyp_shared_intermediate_dir)/ui/ui_resources \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(LOCAL_PATH)/third_party/khronos \ + $(LOCAL_PATH)/gpu \ + $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/third_party/skia/include/config \ + $(LOCAL_PATH)/third_party/skia/include/core \ + $(LOCAL_PATH)/third_party/skia/include/effects \ + $(LOCAL_PATH)/third_party/skia/include/pdf \ + $(LOCAL_PATH)/third_party/skia/include/gpu \ + $(LOCAL_PATH)/third_party/skia/include/gpu/gl \ + $(LOCAL_PATH)/third_party/skia/include/lazy \ + $(LOCAL_PATH)/third_party/skia/include/pathops \ + $(LOCAL_PATH)/third_party/skia/include/pipe \ + $(LOCAL_PATH)/third_party/skia/include/ports \ + $(LOCAL_PATH)/third_party/skia/include/utils \ + $(LOCAL_PATH)/skia/ext \ + $(gyp_shared_intermediate_dir)/ui/gl \ + $(LOCAL_PATH)/third_party/mesa/src/include \ + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport + + +# Flags passed to only C++ (and not C) files. +LOCAL_CPPFLAGS_Debug := \ + -fno-rtti \ + -fno-threadsafe-statics \ + -fvisibility-inlines-hidden \ + -Wsign-compare \ + -Wno-abi \ + -Wno-error=c++0x-compat \ + -Wno-non-virtual-dtor \ + -Wno-sign-promo + + +# Flags passed to both C and C++ files. +MY_CFLAGS_Release := \ + -fstack-protector \ + --param=ssp-buffer-size=4 \ + -Werror \ + -fno-exceptions \ + -fno-strict-aliasing \ + -Wall \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -fvisibility=hidden \ + -pipe \ + -fPIC \ + -Wno-unknown-pragmas \ + -fno-tree-sra \ + -fuse-ld=gold \ + -Wno-psabi \ + -ffunction-sections \ + -funwind-tables \ + -g \ + -fstack-protector \ + -fno-short-enums \ + -finline-limit=64 \ + -Wa,--noexecstack \ + -U_FORTIFY_SOURCE \ + -Wno-extra \ + -Wno-ignored-qualifiers \ + -Wno-type-limits \ + -Os \ + -fno-ident \ + -fdata-sections \ + -ffunction-sections \ + -fomit-frame-pointer + +MY_DEFS_Release := \ + '-DANGLE_DX11' \ + '-D_FILE_OFFSET_BITS=64' \ + '-DUSE_LINUX_BREAKPAD' \ + '-DNO_TCMALLOC' \ + '-DDISABLE_NACL' \ + '-DCHROMIUM_BUILD' \ + '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_GPU=1' \ + '-DUSE_OPENSSL=1' \ + '-DENABLE_EGLIMAGE=1' \ + '-DENABLE_LANGUAGE_DETECTION=1' \ + '-DSK_BUILD_NO_IMAGE_ENCODE' \ + '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ + '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ + '-DSK_ENABLE_INST_COUNT=0' \ + '-DSK_USE_POSIX_THREADS' \ + '-DSK_BUILD_FOR_ANDROID' \ + '-D__STDC_CONSTANT_MACROS' \ + '-D__STDC_FORMAT_MACROS' \ + '-DANDROID' \ + '-D__GNU_SOURCE=1' \ + '-DUSE_STLPORT=1' \ + '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ + '-DCHROME_BUILD_ID=""' \ + '-DNDEBUG' \ + '-DNVALGRIND' \ + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \ + '-D_FORTIFY_SOURCE=2' + + +# Include paths placed before CFLAGS/CPPFLAGS +LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/skia/config \ $(gyp_shared_intermediate_dir)/ui/ui_resources \ @@ -153,6 +259,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/third_party/skia/include/pdf \ $(LOCAL_PATH)/third_party/skia/include/gpu \ $(LOCAL_PATH)/third_party/skia/include/gpu/gl \ + $(LOCAL_PATH)/third_party/skia/include/lazy \ $(LOCAL_PATH)/third_party/skia/include/pathops \ $(LOCAL_PATH)/third_party/skia/include/pipe \ $(LOCAL_PATH)/third_party/skia/include/ports \ @@ -164,10 +271,9 @@ LOCAL_C_INCLUDES := \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport -LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES) # Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS := \ +LOCAL_CPPFLAGS_Release := \ -fno-rtti \ -fno-threadsafe-statics \ -fvisibility-inlines-hidden \ @@ -177,9 +283,13 @@ LOCAL_CPPFLAGS := \ -Wno-non-virtual-dtor \ -Wno-sign-promo + +LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) +LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) ### Rules for final target. -LOCAL_LDFLAGS := \ +LOCAL_LDFLAGS_Debug := \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -196,6 +306,25 @@ LOCAL_LDFLAGS := \ -Wl,--as-needed +LOCAL_LDFLAGS_Release := \ + -Wl,-z,now \ + -Wl,-z,relro \ + -Wl,-z,noexecstack \ + -fPIC \ + -Wl,-z,relro \ + -Wl,-z,now \ + -fuse-ld=gold \ + -nostdlib \ + -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ + -Wl,--icf=safe \ + -Wl,-O1 \ + -Wl,--as-needed \ + -Wl,--gc-sections + + +LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) + LOCAL_STATIC_LIBRARIES := \ skia_skia_gyp \ ui_gl_gl_gyp |