Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1457)

Unified Diff: tools/gn/secondary/third_party/angle/BUILD.gn

Issue 335693004: Hook up content/browser compile in GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/protobuf/proto_library.gni ('k') | tools/gn/secondary/third_party/angle/angle_commit.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/secondary/third_party/angle/BUILD.gn
diff --git a/tools/gn/secondary/third_party/angle/BUILD.gn b/tools/gn/secondary/third_party/angle/BUILD.gn
index 651d42f7ae9b87c22a49f006da39e7f728819fad..bf151d1433b23b7b1f1a071d79caafcfa9bcbe6d 100644
--- a/tools/gn/secondary/third_party/angle/BUILD.gn
+++ b/tools/gn/secondary/third_party/angle/BUILD.gn
@@ -45,7 +45,46 @@ source_set("includes") {
]
}
-source_set("translator_lib") {
+static_library("preprocessor") {
+ sources = [
+ "src/compiler/preprocessor/DiagnosticsBase.cpp",
+ "src/compiler/preprocessor/DiagnosticsBase.h",
+ "src/compiler/preprocessor/DirectiveHandlerBase.cpp",
+ "src/compiler/preprocessor/DirectiveHandlerBase.h",
+ "src/compiler/preprocessor/DirectiveParser.cpp",
+ "src/compiler/preprocessor/DirectiveParser.h",
+ "src/compiler/preprocessor/ExpressionParser.cpp",
+ "src/compiler/preprocessor/ExpressionParser.h",
+ "src/compiler/preprocessor/ExpressionParser.y",
+ "src/compiler/preprocessor/Input.cpp",
+ "src/compiler/preprocessor/Input.h",
+ "src/compiler/preprocessor/Lexer.cpp",
+ "src/compiler/preprocessor/Lexer.h",
+ "src/compiler/preprocessor/Macro.cpp",
+ "src/compiler/preprocessor/Macro.h",
+ "src/compiler/preprocessor/MacroExpander.cpp",
+ "src/compiler/preprocessor/MacroExpander.h",
+ "src/compiler/preprocessor/Preprocessor.cpp",
+ "src/compiler/preprocessor/Preprocessor.h",
+ "src/compiler/preprocessor/SourceLocation.h",
+ "src/compiler/preprocessor/Token.cpp",
+ "src/compiler/preprocessor/Token.h",
+ "src/compiler/preprocessor/Tokenizer.cpp",
+ "src/compiler/preprocessor/Tokenizer.h",
+ "src/compiler/preprocessor/Tokenizer.l",
+ "src/compiler/preprocessor/numeric_lex.h",
+ "src/compiler/preprocessor/pp_utils.h",
+ ]
+
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [
+ ":internal_config",
+ "//build/config/compiler:no_chromium_code",
+ ]
+
+}
+
+static_library("translator_lib") {
sources = [
"src/common/RefCountObject.cpp",
"src/common/RefCountObject.h",
@@ -194,6 +233,7 @@ source_set("translator_lib") {
deps = [
":includes",
+ ":preprocessor",
]
}
@@ -201,7 +241,7 @@ config("translator_static_config") {
defines = [ "ANGLE_TRANSLATOR_STATIC" ]
}
-source_set("translator_static") {
+static_library("translator_static") {
sources = [
"src/compiler/translator/ShaderLang.cpp",
]
@@ -233,7 +273,23 @@ if (false) {
]
}
} else {
- group("commit_id") {}
+ # While Angle is being updated, we copy a temporary hardcoded commit.h. This
+ # is copied both as commit.h and angle_commit.h. The angle roll will rename
+ # this file from commit.h to angle_commit.h and we don't want to make the
+ # udpate more complicated than necessary.
+ group("commit_id") {
+ deps = [ ":copy_angle_commit_h", ":copy_commit_h" ]
+ }
+
+ hardcoded_commit = [ "//tools/gn/secondary/third_party/angle/angle_commit.h" ]
+ copy("copy_angle_commit_h") {
+ sources = hardcoded_commit
+ outputs = [ "$root_gen_dir/angle_commit.h" ]
+ }
+ copy("copy_commit_h") {
+ sources = hardcoded_commit
+ outputs = [ "$root_gen_dir/commit.h" ]
+ }
}
if (is_win) {
@@ -357,7 +413,10 @@ if (is_win) {
defines = [
"ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ " +
- "TEXT(\"d3dcompiler_46.dll\"), \"TEXT(\"d3dcompiler_43.dll\") }"
+ "TEXT(\"d3dcompiler_46.dll\"), TEXT(\"d3dcompiler_43.dll\") }",
+ "GL_APICALL=",
+ "GL_GLEXT_PROTOTYPES=",
+ "EGLAPI=",
]
libs = []
« no previous file with comments | « third_party/protobuf/proto_library.gni ('k') | tools/gn/secondary/third_party/angle/angle_commit.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698