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

Unified Diff: content/shell/BUILD.gn

Issue 1469803006: NOT FOR REVIEW: Aura Android: Content Shell compiles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_wthandroid
Patch Set: Temp Created 5 years 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 | « content/content_shell.gypi ('k') | content/shell/android/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/BUILD.gn
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index 275499d7c7ebd94c281655acd9b8e91b218236b2..e774ce9d22258165a5fdb3e27dac2c7ecd67296e 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -276,7 +276,12 @@ static_library("content_shell_lib") {
deps += [ "//components/crash/content/browser" ]
}
- if (use_aura) {
+ if (is_android && use_aura) {
+ sources -= [
+ "browser/shell_android.cc",
+ "android/shell_manager.cc",
+ "android/shell_manager.h",
+ ]
deps += [
"//ui/aura",
"//ui/aura:test_support",
@@ -311,6 +316,11 @@ static_library("content_shell_lib") {
if (is_chromeos) {
deps += [
"//chromeos",
+ ]
+ }
+
+ if (is_chromeos || (is_android && use_aura)) {
+ deps += [
"//ui/wm:test_support",
]
}
« no previous file with comments | « content/content_shell.gypi ('k') | content/shell/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698