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

Unified Diff: content/app/BUILD.gn

Issue 666813002: GN: Fix Android component build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-clank
Patch Set: Actually undo gyp change Created 6 years, 2 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
Index: content/app/BUILD.gn
diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn
index f68c6ded8f9f4bf2b9b15f19453e5028c08f4a40..8d70a51004ad5bf058e986a340a9b46fddccd345 100644
--- a/content/app/BUILD.gn
+++ b/content/app/BUILD.gn
@@ -2,6 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+# TODO(GYP) enable chrome_multiple_dll support
+is_chrome_multiple_dll = false
+
content_app_sources = [
"android/app_jni_registrar.cc",
"android/app_jni_registrar.h",
@@ -63,6 +66,10 @@ content_app_extra_configs = [
"//content:content_implementation",
]
+if (!is_chrome_multiple_dll) {
+ content_app_deps += [ "//content/gpu" ]
+}
+
# This includes the app sources for both the browser and child processes.
source_set("both") {
# Only the public target should depend on this. All other targets (even
@@ -74,9 +81,6 @@ source_set("both") {
deps = content_app_deps
}
-# TODO(GYP) enable chrome_multiple_dll support
-is_chrome_multiple_dll = false
-
if (is_chrome_multiple_dll) {
# It doesn't make sense to do the browser/child dll split in component mode.
assert(!is_component_build)

Powered by Google App Engine
This is Rietveld 408576698