Update makefiles after merge of Chromium at r167929
This commit was generated by merge_from_chromium.py.
Change-Id: I20f1fec548ac797d6490b66965452b5db876e51f
diff --git a/src/preprocessor.target.mk b/src/preprocessor.target.mk
index 8a71b92..ac81659 100644
--- a/src/preprocessor.target.mk
+++ b/src/preprocessor.target.mk
@@ -22,17 +22,17 @@
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
LOCAL_SRC_FILES := \
- third_party/angle/src/compiler/preprocessor/new/Diagnostics.cpp \
- third_party/angle/src/compiler/preprocessor/new/DirectiveHandler.cpp \
- third_party/angle/src/compiler/preprocessor/new/DirectiveParser.cpp \
- third_party/angle/src/compiler/preprocessor/new/ExpressionParser.cpp \
- third_party/angle/src/compiler/preprocessor/new/Input.cpp \
- third_party/angle/src/compiler/preprocessor/new/Lexer.cpp \
- third_party/angle/src/compiler/preprocessor/new/Macro.cpp \
- third_party/angle/src/compiler/preprocessor/new/MacroExpander.cpp \
- third_party/angle/src/compiler/preprocessor/new/Preprocessor.cpp \
- third_party/angle/src/compiler/preprocessor/new/Token.cpp \
- third_party/angle/src/compiler/preprocessor/new/Tokenizer.cpp
+ third_party/angle/src/compiler/preprocessor/Diagnostics.cpp \
+ third_party/angle/src/compiler/preprocessor/DirectiveHandler.cpp \
+ third_party/angle/src/compiler/preprocessor/DirectiveParser.cpp \
+ third_party/angle/src/compiler/preprocessor/ExpressionParser.cpp \
+ third_party/angle/src/compiler/preprocessor/Input.cpp \
+ third_party/angle/src/compiler/preprocessor/Lexer.cpp \
+ third_party/angle/src/compiler/preprocessor/Macro.cpp \
+ third_party/angle/src/compiler/preprocessor/MacroExpander.cpp \
+ third_party/angle/src/compiler/preprocessor/Preprocessor.cpp \
+ third_party/angle/src/compiler/preprocessor/Token.cpp \
+ third_party/angle/src/compiler/preprocessor/Tokenizer.cpp
# Flags passed to both C and C++ files.
@@ -81,8 +81,7 @@
MY_DEFS := \
'-DANGLE_DISABLE_TRACE' \
- '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL0' \
- '-DANGLE_USE_NEW_PREPROCESSOR=1' \
+ '-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ L"d3dcompiler_46.dll", L"d3dcompiler_43.dll" }' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/src/translator_common.target.mk b/src/translator_common.target.mk
index 3d38598..8ef9c8e 100644
--- a/src/translator_common.target.mk
+++ b/src/translator_common.target.mk
@@ -49,13 +49,6 @@
third_party/angle/src/compiler/ValidateLimitations.cpp \
third_party/angle/src/compiler/VariableInfo.cpp \
third_party/angle/src/compiler/VariablePacker.cpp \
- third_party/angle/src/compiler/preprocessor/atom.c \
- third_party/angle/src/compiler/preprocessor/cpp.c \
- third_party/angle/src/compiler/preprocessor/cppstruct.c \
- third_party/angle/src/compiler/preprocessor/memory.c \
- third_party/angle/src/compiler/preprocessor/scanner.c \
- third_party/angle/src/compiler/preprocessor/symbols.c \
- third_party/angle/src/compiler/preprocessor/tokens.c \
third_party/angle/src/compiler/depgraph/DependencyGraph.cpp \
third_party/angle/src/compiler/depgraph/DependencyGraphBuilder.cpp \
third_party/angle/src/compiler/depgraph/DependencyGraphOutput.cpp \
@@ -111,8 +104,7 @@
MY_DEFS := \
'-DANGLE_DISABLE_TRACE' \
- '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL0' \
- '-DANGLE_USE_NEW_PREPROCESSOR=1' \
+ '-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ L"d3dcompiler_46.dll", L"d3dcompiler_43.dll" }' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
diff --git a/src/translator_glsl.target.mk b/src/translator_glsl.target.mk
index 5412df1..6ccf1c6 100644
--- a/src/translator_glsl.target.mk
+++ b/src/translator_glsl.target.mk
@@ -78,8 +78,7 @@
MY_DEFS := \
'-DANGLE_DISABLE_TRACE' \
- '-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL0' \
- '-DANGLE_USE_NEW_PREPROCESSOR=1' \
+ '-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ L"d3dcompiler_46.dll", L"d3dcompiler_43.dll" }' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
