CC'ing a few more folks in ANGLE. The work here would be to rename MacroExpander in ANGLE or SwiftShader to something unique.

Looks like the namespace is included in the mangled names, maybe it's time to wrap everything in the angle namespace.

Yeah was thinking something like that... basically s/pp/angle/g for namespaces.

The following revision refers to this bug:
  https://chromium.googlesource.com/angle/angle/+/197d52949eeddc338d9e7315dc8f07de37eb90b8

commit 197d52949eeddc338d9e7315dc8f07de37eb90b8
Author: Geoff Lang <geofflang@chromium.org>
Date: Wed Apr 25 22:25:24 2018

Wrap all preprocessor code in the angle namespace.

BUG= 836820 
BUG= 801364 

Change-Id: I08b6a2f9f12b689e09df6efd916c313e71e8a051
Reviewed-on: https://chromium-review.googlesource.com/1028581
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>

[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/translator/Diagnostics.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/SourceLocation.h
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/translator/glslang.l
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/ExpressionParser.y
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/Preprocessor.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/tests/preprocessor_tests/pragma_test.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/DirectiveHandlerBase.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/MacroExpander.h
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/tests/preprocessor_tests/space_test.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/tests/preprocessor_tests/extension_test.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/tests/preprocessor_tests/error_test.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/ExpressionParser.h
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/translator/DirectiveHandler.h
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/Lexer.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/Tokenizer.h
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/MacroExpander.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/Tokenizer.l
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/tests/preprocessor_tests/input_test.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/DirectiveParser.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/translator/glslang_lex.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/tests/preprocessor_tests/define_test.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/Token.h
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/Macro.h
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/tests/preprocessor_tests/location_test.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/DirectiveHandlerBase.h
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/tests/preprocessor_tests/char_test.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/Tokenizer.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/ExpressionParser.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/tests/preprocessor_tests/operator_test.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/tests/preprocessor_tests/MockDirectiveHandler.h
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/numeric_lex.h
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/tests/preprocessor_tests/identifier_test.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/DirectiveParser.h
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/DiagnosticsBase.h
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/translator/Diagnostics.h
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/tests/preprocessor_tests/number_test.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/tests/preprocessor_tests/PreprocessorTest.h
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/Lexer.h
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/Input.h
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/tests/preprocessor_tests/token_test.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/Macro.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/Preprocessor.h
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/translator/DirectiveHandler.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/Input.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/tests/preprocessor_tests/if_test.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/tests/preprocessor_tests/MockDiagnostics.h
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/translator/util.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/tests/preprocessor_tests/version_test.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/translator/ParseContext.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/translator/ParseContext.h
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/tests/preprocessor_tests/comment_test.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/DiagnosticsBase.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/compiler/preprocessor/Token.cpp
[modify] https://crrev.com/197d52949eeddc338d9e7315dc8f07de37eb90b8/src/tests/preprocessor_tests/PreprocessorTest.cpp

Thanks a ton for the rapid fix!!!

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/158cb3e2476795076977c6641e5791dff33e6c1e

commit 158cb3e2476795076977c6641e5791dff33e6c1e
Author: angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Thu Apr 26 05:44:43 2018

Roll src/third_party/angle/ 23dc90b81..197d52949 (1 commit)

https://chromium.googlesource.com/angle/angle.git/+log/23dc90b81efb..197d52949eed

$ git log 23dc90b81..197d52949 --date=short --no-merges --format='%ad %ae %s'
2018-04-25 geofflang Wrap all preprocessor code in the angle namespace.

Created with:
  roll-dep src/third_party/angle
BUG= chromium:836820 , chromium:801364 


The AutoRoll server is located here: https://angle-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


CQ_INCLUDE_TRYBOTS=luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
TBR=geofflang@chromium.org

Change-Id: I4e73dc6ca51b5b8863fbcd0b266f8cd1a5df2500
Reviewed-on: https://chromium-review.googlesource.com/1029194
Reviewed-by: angle-chromium-autoroll <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: angle-chromium-autoroll <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#553928}
[modify] https://crrev.com/158cb3e2476795076977c6641e5791dff33e6c1e/DEPS

No problem, let me know if there are other functions in ANGLE that need the same treatment.