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

Side by Side 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 unified diff | Download patch
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 # TODO(GYP) enable chrome_multiple_dll support
6 is_chrome_multiple_dll = false
7
5 content_app_sources = [ 8 content_app_sources = [
6 "android/app_jni_registrar.cc", 9 "android/app_jni_registrar.cc",
7 "android/app_jni_registrar.h", 10 "android/app_jni_registrar.h",
8 "android/child_process_service.cc", 11 "android/child_process_service.cc",
9 "android/child_process_service.h", 12 "android/child_process_service.h",
10 "android/content_main.cc", 13 "android/content_main.cc",
11 "android/content_main.h", 14 "android/content_main.h",
12 "android/library_loader_hooks.cc", 15 "android/library_loader_hooks.cc",
13 "content_main.cc", 16 "content_main.cc",
14 "content_main_runner.cc", 17 "content_main_runner.cc",
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 "//mojo/environment:chromium", 59 "//mojo/environment:chromium",
57 "//mojo/public/interfaces/application", 60 "//mojo/public/interfaces/application",
58 ] 61 ]
59 } 62 }
60 63
61 content_app_extra_configs = [ 64 content_app_extra_configs = [
62 "//build/config/compiler:wexit_time_destructors", 65 "//build/config/compiler:wexit_time_destructors",
63 "//content:content_implementation", 66 "//content:content_implementation",
64 ] 67 ]
65 68
69 if (!is_chrome_multiple_dll) {
70 content_app_deps += [ "//content/gpu" ]
71 }
72
66 # This includes the app sources for both the browser and child processes. 73 # This includes the app sources for both the browser and child processes.
67 source_set("both") { 74 source_set("both") {
68 # Only the public target should depend on this. All other targets (even 75 # Only the public target should depend on this. All other targets (even
69 # internal content ones) should depend on the public one. 76 # internal content ones) should depend on the public one.
70 visibility = [ "//content/public/app:*" ] 77 visibility = [ "//content/public/app:*" ]
71 78
72 sources = content_app_sources 79 sources = content_app_sources
73 configs += content_app_extra_configs 80 configs += content_app_extra_configs
74 deps = content_app_deps 81 deps = content_app_deps
75 } 82 }
76 83
77 # TODO(GYP) enable chrome_multiple_dll support
78 is_chrome_multiple_dll = false
79
80 if (is_chrome_multiple_dll) { 84 if (is_chrome_multiple_dll) {
81 # It doesn't make sense to do the browser/child dll split in component mode. 85 # It doesn't make sense to do the browser/child dll split in component mode.
82 assert(!is_component_build) 86 assert(!is_component_build)
83 87
84 source_set("browser") { 88 source_set("browser") {
85 visibility = [ "//content/public/app:browser" ] 89 visibility = [ "//content/public/app:browser" ]
86 90
87 sources = content_app_sources 91 sources = content_app_sources
88 configs += content_app_extra_configs 92 configs += content_app_extra_configs
89 deps = content_app_deps 93 deps = content_app_deps
90 94
91 defines += [ "CHROME_MULTIPLE_DLL_BROWSER" ] 95 defines += [ "CHROME_MULTIPLE_DLL_BROWSER" ]
92 } 96 }
93 97
94 source_set("child") { 98 source_set("child") {
95 visibility = [ "//content/public/app:child" ] 99 visibility = [ "//content/public/app:child" ]
96 100
97 sources = content_app_sources 101 sources = content_app_sources
98 configs += content_app_extra_configs 102 configs += content_app_extra_configs
99 deps = content_app_deps 103 deps = content_app_deps
100 104
101 defines += [ "CHROME_MULTIPLE_DLL_CHILD" ] 105 defines += [ "CHROME_MULTIPLE_DLL_CHILD" ]
102 } 106 }
103 } 107 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698