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

Unified Diff: shell/BUILD.gn

Issue 1044943003: Stop linking in desktop/main.cc into the Android build. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 9 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 | « no previous file | shell/android/main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/BUILD.gn
diff --git a/shell/BUILD.gn b/shell/BUILD.gn
index e83e9e4bc4ecc0a1cf37ce3e982fb73ce9d92222..a9f81b1445943088b3f68727c09d40e94da94833 100644
--- a/shell/BUILD.gn
+++ b/shell/BUILD.gn
@@ -49,9 +49,7 @@ if (is_android) {
if (!mojo_use_prebuilt_mojo_shell) {
executable("mojo_shell") {
- sources = [
- "desktop/main.cc",
- ]
+ sources = []
deps = [
":init",
@@ -62,7 +60,9 @@ if (!mojo_use_prebuilt_mojo_shell) {
"//mojo/environment:chromium",
]
- if (is_android) {
+ if (!is_android) {
+ sources += [ "desktop/main.cc" ]
+ } else {
sources += [
"android/library_loader.cc",
"android/main.cc",
« no previous file with comments | « no previous file | shell/android/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698