summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2013-07-16 05:05:17 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2013-07-16 05:05:17 +0000
commit4a5095016a6f2bcb2765ad3b2a7731906c213ab0 (patch)
tree66476a57c62df7585d1963e034c3612b278dd161
parent6abdd65fc2c70ec0a6524c68c77ccc3861578410 (diff)
downloadangle_dx11-4a5095016a6f2bcb2765ad3b2a7731906c213ab0.tar.gz
Update makefiles after merge of Chromium at r211760
This commit was generated by merge_from_chromium.py. Change-Id: I88cbf0d4ca1a7686b1034c40dbab94e2e1d19670
Diffstat
-rw-r--r--src/preprocessor.target.darwin-arm.mk2
-rw-r--r--src/preprocessor.target.darwin-x86.mk2
-rw-r--r--src/preprocessor.target.linux-arm.mk2
-rw-r--r--src/preprocessor.target.linux-x86.mk2
-rw-r--r--src/translator_common.target.darwin-arm.mk2
-rw-r--r--src/translator_common.target.darwin-x86.mk2
-rw-r--r--src/translator_common.target.linux-arm.mk2
-rw-r--r--src/translator_common.target.linux-x86.mk2
-rw-r--r--src/translator_glsl.target.darwin-arm.mk2
-rw-r--r--src/translator_glsl.target.darwin-x86.mk2
-rw-r--r--src/translator_glsl.target.linux-arm.mk2
-rw-r--r--src/translator_glsl.target.linux-x86.mk2
12 files changed, 0 insertions, 24 deletions
diff --git a/src/preprocessor.target.darwin-arm.mk b/src/preprocessor.target.darwin-arm.mk
index 91b12e96..2ceefa6b 100644
--- a/src/preprocessor.target.darwin-arm.mk
+++ b/src/preprocessor.target.darwin-arm.mk
@@ -77,7 +77,6 @@ MY_DEFS_Debug := \
'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
'-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
@@ -161,7 +160,6 @@ MY_DEFS_Release := \
'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
'-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
diff --git a/src/preprocessor.target.darwin-x86.mk b/src/preprocessor.target.darwin-x86.mk
index 483b4e07..817c4b8e 100644
--- a/src/preprocessor.target.darwin-x86.mk
+++ b/src/preprocessor.target.darwin-x86.mk
@@ -79,7 +79,6 @@ MY_DEFS_Debug := \
'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
'-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
@@ -166,7 +165,6 @@ MY_DEFS_Release := \
'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
'-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
diff --git a/src/preprocessor.target.linux-arm.mk b/src/preprocessor.target.linux-arm.mk
index 91b12e96..2ceefa6b 100644
--- a/src/preprocessor.target.linux-arm.mk
+++ b/src/preprocessor.target.linux-arm.mk
@@ -77,7 +77,6 @@ MY_DEFS_Debug := \
'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
'-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
@@ -161,7 +160,6 @@ MY_DEFS_Release := \
'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
'-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
diff --git a/src/preprocessor.target.linux-x86.mk b/src/preprocessor.target.linux-x86.mk
index 483b4e07..817c4b8e 100644
--- a/src/preprocessor.target.linux-x86.mk
+++ b/src/preprocessor.target.linux-x86.mk
@@ -79,7 +79,6 @@ MY_DEFS_Debug := \
'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
'-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
@@ -166,7 +165,6 @@ MY_DEFS_Release := \
'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
'-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
diff --git a/src/translator_common.target.darwin-arm.mk b/src/translator_common.target.darwin-arm.mk
index 5b9caa38..fd456e78 100644
--- a/src/translator_common.target.darwin-arm.mk
+++ b/src/translator_common.target.darwin-arm.mk
@@ -102,7 +102,6 @@ MY_DEFS_Debug := \
'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
'-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
@@ -189,7 +188,6 @@ MY_DEFS_Release := \
'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
'-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
diff --git a/src/translator_common.target.darwin-x86.mk b/src/translator_common.target.darwin-x86.mk
index 536a389a..011ea14b 100644
--- a/src/translator_common.target.darwin-x86.mk
+++ b/src/translator_common.target.darwin-x86.mk
@@ -104,7 +104,6 @@ MY_DEFS_Debug := \
'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
'-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
@@ -194,7 +193,6 @@ MY_DEFS_Release := \
'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
'-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
diff --git a/src/translator_common.target.linux-arm.mk b/src/translator_common.target.linux-arm.mk
index 5b9caa38..fd456e78 100644
--- a/src/translator_common.target.linux-arm.mk
+++ b/src/translator_common.target.linux-arm.mk
@@ -102,7 +102,6 @@ MY_DEFS_Debug := \
'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
'-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
@@ -189,7 +188,6 @@ MY_DEFS_Release := \
'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
'-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
diff --git a/src/translator_common.target.linux-x86.mk b/src/translator_common.target.linux-x86.mk
index 536a389a..011ea14b 100644
--- a/src/translator_common.target.linux-x86.mk
+++ b/src/translator_common.target.linux-x86.mk
@@ -104,7 +104,6 @@ MY_DEFS_Debug := \
'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
'-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
@@ -194,7 +193,6 @@ MY_DEFS_Release := \
'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
'-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
diff --git a/src/translator_glsl.target.darwin-arm.mk b/src/translator_glsl.target.darwin-arm.mk
index 6cdaaf8d..381b4b6e 100644
--- a/src/translator_glsl.target.darwin-arm.mk
+++ b/src/translator_glsl.target.darwin-arm.mk
@@ -74,7 +74,6 @@ MY_DEFS_Debug := \
'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
'-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
@@ -161,7 +160,6 @@ MY_DEFS_Release := \
'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
'-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
diff --git a/src/translator_glsl.target.darwin-x86.mk b/src/translator_glsl.target.darwin-x86.mk
index 20df6135..dde950f5 100644
--- a/src/translator_glsl.target.darwin-x86.mk
+++ b/src/translator_glsl.target.darwin-x86.mk
@@ -76,7 +76,6 @@ MY_DEFS_Debug := \
'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
'-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
@@ -166,7 +165,6 @@ MY_DEFS_Release := \
'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
'-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
diff --git a/src/translator_glsl.target.linux-arm.mk b/src/translator_glsl.target.linux-arm.mk
index 6cdaaf8d..381b4b6e 100644
--- a/src/translator_glsl.target.linux-arm.mk
+++ b/src/translator_glsl.target.linux-arm.mk
@@ -74,7 +74,6 @@ MY_DEFS_Debug := \
'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
'-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
@@ -161,7 +160,6 @@ MY_DEFS_Release := \
'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
'-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
diff --git a/src/translator_glsl.target.linux-x86.mk b/src/translator_glsl.target.linux-x86.mk
index 20df6135..dde950f5 100644
--- a/src/translator_glsl.target.linux-x86.mk
+++ b/src/translator_glsl.target.linux-x86.mk
@@ -76,7 +76,6 @@ MY_DEFS_Debug := \
'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
'-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
@@ -166,7 +165,6 @@ MY_DEFS_Release := \
'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
'-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 20:42:30 +0000