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

Side by Side 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, 8 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 unified diff | Download patch
« no previous file with comments | « no previous file | shell/android/main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/ui.gni") 5 import("//build/config/ui.gni")
6 import("//mojo/public/mojo.gni") 6 import("//mojo/public/mojo.gni")
7 import("//mojo/public/mojo_application.gni") 7 import("//mojo/public/mojo_application.gni")
8 import("//mojo/public/tools/bindings/mojom.gni") 8 import("//mojo/public/tools/bindings/mojom.gni")
9 import("//mojo/tools/embed/rules.gni") 9 import("//mojo/tools/embed/rules.gni")
10 import("//testing/test.gni") 10 import("//testing/test.gni")
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 ] 42 ]
43 } 43 }
44 44
45 if (is_android) { 45 if (is_android) {
46 import("//build/config/android/config.gni") 46 import("//build/config/android/config.gni")
47 import("//build/config/android/rules.gni") 47 import("//build/config/android/rules.gni")
48 } 48 }
49 49
50 if (!mojo_use_prebuilt_mojo_shell) { 50 if (!mojo_use_prebuilt_mojo_shell) {
51 executable("mojo_shell") { 51 executable("mojo_shell") {
52 sources = [ 52 sources = []
53 "desktop/main.cc",
54 ]
55 53
56 deps = [ 54 deps = [
57 ":init", 55 ":init",
58 ":lib", 56 ":lib",
59 "//base", 57 "//base",
60 "//build/config/sanitizers:deps", 58 "//build/config/sanitizers:deps",
61 "//mojo/common", 59 "//mojo/common",
62 "//mojo/environment:chromium", 60 "//mojo/environment:chromium",
63 ] 61 ]
64 62
65 if (is_android) { 63 if (!is_android) {
64 sources += [ "desktop/main.cc" ]
65 } else {
66 sources += [ 66 sources += [
67 "android/library_loader.cc", 67 "android/library_loader.cc",
68 "android/main.cc", 68 "android/main.cc",
69 "android/main.h", 69 "android/main.h",
70 ] 70 ]
71 71
72 # On android, the executable is also the native library used by the apk. 72 # On android, the executable is also the native library used by the apk.
73 # It means dynamic symbols must be preserved and exported. 73 # It means dynamic symbols must be preserved and exported.
74 ldflags = [ "-Wl,--export-dynamic" ] 74 ldflags = [ "-Wl,--export-dynamic" ]
75 75
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 "//mojo/public/cpp/system:system", 552 "//mojo/public/cpp/system:system",
553 "//mojo/services/http_server/public/cpp", 553 "//mojo/services/http_server/public/cpp",
554 "//mojo/services/http_server/public/interfaces", 554 "//mojo/services/http_server/public/interfaces",
555 "//mojo/services/network/public/interfaces", 555 "//mojo/services/network/public/interfaces",
556 "//shell/test:bindings", 556 "//shell/test:bindings",
557 ":embed_pingable", 557 ":embed_pingable",
558 ] 558 ]
559 559
560 data_deps = [ "//services/http_server:http_server($default_toolchain)" ] 560 data_deps = [ "//services/http_server:http_server($default_toolchain)" ]
561 } 561 }
OLDNEW
« 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