diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-12-18 16:25:09 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-12-18 16:25:09 +0000 |
| commit | a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 (patch) | |
| tree | dafc1c6417406a7fbd422ad0bb890e96909ef564 /gpu/gles2_c_lib.target.linux-mips.mk | |
| parent | d5f893c0bc79db3066bb5ae5d3d972ba1be7dd5f (diff) | |
| download | chromium_org-a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7.tar.gz | |
Merge from Chromium at DEPS revision 240154
This commit was generated by merge_to_master.py.
Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
Diffstat (limited to 'gpu/gles2_c_lib.target.linux-mips.mk')
| -rw-r--r-- | gpu/gles2_c_lib.target.linux-mips.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gpu/gles2_c_lib.target.linux-mips.mk b/gpu/gles2_c_lib.target.linux-mips.mk index 0d556e4a52..b06abf6e55 100644 --- a/gpu/gles2_c_lib.target.linux-mips.mk +++ b/gpu/gles2_c_lib.target.linux-mips.mk @@ -61,6 +61,7 @@ MY_CFLAGS_Debug := \ MY_DEFS_Debug := \ '-DANGLE_DX11' \ + '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ @@ -70,9 +71,11 @@ MY_DEFS_Debug := \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DGLES2_C_LIB_IMPLEMENTATION' \ '-D__STDC_CONSTANT_MACROS' \ @@ -89,8 +92,8 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ @@ -147,6 +150,7 @@ MY_CFLAGS_Release := \ MY_DEFS_Release := \ '-DANGLE_DX11' \ + '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ @@ -156,9 +160,11 @@ MY_DEFS_Release := \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DGLES2_C_LIB_IMPLEMENTATION' \ '-D__STDC_CONSTANT_MACROS' \ @@ -176,8 +182,8 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ |