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

Unified Diff: chrome/browser/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: chrome/browser/BUILD.gn
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 217ac9c75dfc20b882ddd552b826d2306c102e1f..f8220f18b81c5ff1db09282ffd85c7368e8d09ab 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -133,7 +133,7 @@ static_library("browser") {
"//third_party/zlib:minizip",
"//third_party/zlib:zip",
"//ui/base",
- "//ui/events",
+ "//ui/events:events_base",
"//ui/gfx",
"//ui/gfx/geometry",
"//ui/message_center",
@@ -182,6 +182,7 @@ static_library("browser") {
"//content/app/resources",
"//media",
"//media/cast:net",
+ "//mojo/common",
"//mojo/edk/system",
"//mojo/environment:chromium",
"//mojo/public/cpp/bindings",
@@ -305,7 +306,10 @@ static_library("browser") {
sources += rebase_path(gypi_values.chrome_browser_policy_desktop_sources,
".", "//chrome")
}
- if (!is_android && !is_ios) { # Non-mobile
+ if (is_android || is_ios) {
+ sources += rebase_path(gypi_values.chrome_browser_policy_mobile_sources,
+ ".", "//chrome")
+ } else {
deps += [
"//chrome/browser/policy:path_parser",
]
@@ -489,7 +493,10 @@ static_library("browser") {
deps += [
":jni_headers",
"//components/cdm/browser",
- #"../components/components.gyp:web_contents_delegate_android", TODO(GYP)
+ "//components/enhanced_bookmarks",
+ "//components/web_contents_delegate_android",
+ "//components/history/core/android",
+ "//third_party/android_opengl/etc1",
]
deps -= [
"//third_party/libaddressinput",

Powered by Google App Engine
This is Rietveld 408576698