diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-01-02 15:18:04 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-01-02 15:18:04 +0000 |
| commit | b66a170dc2a090787fc7b4d532c3f9917b6f1b83 (patch) | |
| tree | 6132072c8d563a128aeb49d34c1b3d5353eef896 | |
| parent | f6d7891f56e67952a39005ec54860b5214931174 (diff) | |
| parent | e325e06acc0f5a00f9c046f10f25c42da4db5847 (diff) | |
| download | angle-kitkat-mr2.2-release.tar.gz | |
Merge from Chromium at DEPS revision 241107android-4.4w_r1android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1kitkat-wearkitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-dev
This commit was generated by merge_to_master.py.
Change-Id: Ib6033dfde2411b5094529ecd218efb1ddeb3c73a
| -rw-r--r-- | src/preprocessor.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | src/preprocessor.target.darwin-mips.mk | 2 | ||||
| -rw-r--r-- | src/preprocessor.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | src/preprocessor.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | src/preprocessor.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | src/preprocessor.target.linux-x86.mk | 2 | ||||
| -rw-r--r-- | src/translator.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | src/translator.target.darwin-mips.mk | 2 | ||||
| -rw-r--r-- | src/translator.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | src/translator.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | src/translator.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | src/translator.target.linux-x86.mk | 2 |
12 files changed, 0 insertions, 24 deletions
diff --git a/src/preprocessor.target.darwin-arm.mk b/src/preprocessor.target.darwin-arm.mk index 81c11ab7..66ce3b49 100644 --- a/src/preprocessor.target.darwin-arm.mk +++ b/src/preprocessor.target.darwin-arm.mk @@ -72,7 +72,6 @@ MY_CFLAGS_Debug := \ -ffunction-sections MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-DANGLE_DISABLE_TRACE' \ '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \ @@ -159,7 +158,6 @@ MY_CFLAGS_Release := \ -fomit-frame-pointer MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-DANGLE_DISABLE_TRACE' \ '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \ diff --git a/src/preprocessor.target.darwin-mips.mk b/src/preprocessor.target.darwin-mips.mk index b7d29650..db37b6f0 100644 --- a/src/preprocessor.target.darwin-mips.mk +++ b/src/preprocessor.target.darwin-mips.mk @@ -72,7 +72,6 @@ MY_CFLAGS_Debug := \ -ffunction-sections MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-DANGLE_DISABLE_TRACE' \ '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \ @@ -159,7 +158,6 @@ MY_CFLAGS_Release := \ -fomit-frame-pointer MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-DANGLE_DISABLE_TRACE' \ '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \ diff --git a/src/preprocessor.target.darwin-x86.mk b/src/preprocessor.target.darwin-x86.mk index 86a34d62..13bf901c 100644 --- a/src/preprocessor.target.darwin-x86.mk +++ b/src/preprocessor.target.darwin-x86.mk @@ -74,7 +74,6 @@ MY_CFLAGS_Debug := \ -ffunction-sections MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-DANGLE_DISABLE_TRACE' \ '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \ @@ -164,7 +163,6 @@ MY_CFLAGS_Release := \ -fno-asynchronous-unwind-tables MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-DANGLE_DISABLE_TRACE' \ '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \ diff --git a/src/preprocessor.target.linux-arm.mk b/src/preprocessor.target.linux-arm.mk index 81c11ab7..66ce3b49 100644 --- a/src/preprocessor.target.linux-arm.mk +++ b/src/preprocessor.target.linux-arm.mk @@ -72,7 +72,6 @@ MY_CFLAGS_Debug := \ -ffunction-sections MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-DANGLE_DISABLE_TRACE' \ '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \ @@ -159,7 +158,6 @@ MY_CFLAGS_Release := \ -fomit-frame-pointer MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-DANGLE_DISABLE_TRACE' \ '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \ diff --git a/src/preprocessor.target.linux-mips.mk b/src/preprocessor.target.linux-mips.mk index b7d29650..db37b6f0 100644 --- a/src/preprocessor.target.linux-mips.mk +++ b/src/preprocessor.target.linux-mips.mk @@ -72,7 +72,6 @@ MY_CFLAGS_Debug := \ -ffunction-sections MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-DANGLE_DISABLE_TRACE' \ '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \ @@ -159,7 +158,6 @@ MY_CFLAGS_Release := \ -fomit-frame-pointer MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-DANGLE_DISABLE_TRACE' \ '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \ diff --git a/src/preprocessor.target.linux-x86.mk b/src/preprocessor.target.linux-x86.mk index 86a34d62..13bf901c 100644 --- a/src/preprocessor.target.linux-x86.mk +++ b/src/preprocessor.target.linux-x86.mk @@ -74,7 +74,6 @@ MY_CFLAGS_Debug := \ -ffunction-sections MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-DANGLE_DISABLE_TRACE' \ '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \ @@ -164,7 +163,6 @@ MY_CFLAGS_Release := \ -fno-asynchronous-unwind-tables MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-DANGLE_DISABLE_TRACE' \ '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \ diff --git a/src/translator.target.darwin-arm.mk b/src/translator.target.darwin-arm.mk index d396d985..69488510 100644 --- a/src/translator.target.darwin-arm.mk +++ b/src/translator.target.darwin-arm.mk @@ -112,7 +112,6 @@ MY_CFLAGS_Debug := \ -ffunction-sections MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-DANGLE_DISABLE_TRACE' \ '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \ @@ -202,7 +201,6 @@ MY_CFLAGS_Release := \ -fomit-frame-pointer MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-DANGLE_DISABLE_TRACE' \ '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \ diff --git a/src/translator.target.darwin-mips.mk b/src/translator.target.darwin-mips.mk index bd541a88..7ddf180f 100644 --- a/src/translator.target.darwin-mips.mk +++ b/src/translator.target.darwin-mips.mk @@ -112,7 +112,6 @@ MY_CFLAGS_Debug := \ -ffunction-sections MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-DANGLE_DISABLE_TRACE' \ '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \ @@ -202,7 +201,6 @@ MY_CFLAGS_Release := \ -fomit-frame-pointer MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-DANGLE_DISABLE_TRACE' \ '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \ diff --git a/src/translator.target.darwin-x86.mk b/src/translator.target.darwin-x86.mk index 9d3b11bd..015cc981 100644 --- a/src/translator.target.darwin-x86.mk +++ b/src/translator.target.darwin-x86.mk @@ -114,7 +114,6 @@ MY_CFLAGS_Debug := \ -ffunction-sections MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-DANGLE_DISABLE_TRACE' \ '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \ @@ -207,7 +206,6 @@ MY_CFLAGS_Release := \ -fno-asynchronous-unwind-tables MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-DANGLE_DISABLE_TRACE' \ '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \ diff --git a/src/translator.target.linux-arm.mk b/src/translator.target.linux-arm.mk index d396d985..69488510 100644 --- a/src/translator.target.linux-arm.mk +++ b/src/translator.target.linux-arm.mk @@ -112,7 +112,6 @@ MY_CFLAGS_Debug := \ -ffunction-sections MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-DANGLE_DISABLE_TRACE' \ '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \ @@ -202,7 +201,6 @@ MY_CFLAGS_Release := \ -fomit-frame-pointer MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-DANGLE_DISABLE_TRACE' \ '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \ diff --git a/src/translator.target.linux-mips.mk b/src/translator.target.linux-mips.mk index bd541a88..7ddf180f 100644 --- a/src/translator.target.linux-mips.mk +++ b/src/translator.target.linux-mips.mk @@ -112,7 +112,6 @@ MY_CFLAGS_Debug := \ -ffunction-sections MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-DANGLE_DISABLE_TRACE' \ '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \ @@ -202,7 +201,6 @@ MY_CFLAGS_Release := \ -fomit-frame-pointer MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-DANGLE_DISABLE_TRACE' \ '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \ diff --git a/src/translator.target.linux-x86.mk b/src/translator.target.linux-x86.mk index 9d3b11bd..015cc981 100644 --- a/src/translator.target.linux-x86.mk +++ b/src/translator.target.linux-x86.mk @@ -114,7 +114,6 @@ MY_CFLAGS_Debug := \ -ffunction-sections MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-DANGLE_DISABLE_TRACE' \ '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \ @@ -207,7 +206,6 @@ MY_CFLAGS_Release := \ -fno-asynchronous-unwind-tables MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-DANGLE_DISABLE_TRACE' \ '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \ |