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

Side by Side Diff: content/app/BUILD.gn

Issue 814543006: Move //mojo/{public, edk} underneath //third_party (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 11 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 | « components/nacl.gyp ('k') | content/browser/BUILD.gn » ('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 # TODO(GYP) enable chrome_multiple_dll support 5 # TODO(GYP) enable chrome_multiple_dll support
6 is_chrome_multiple_dll = false 6 is_chrome_multiple_dll = false
7 7
8 content_app_sources = [ 8 content_app_sources = [
9 "android/app_jni_registrar.cc", 9 "android/app_jni_registrar.cc",
10 "android/app_jni_registrar.h", 10 "android/app_jni_registrar.h",
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 } 50 }
51 51
52 if (is_ios) { 52 if (is_ios) {
53 content_app_sources -= [ 53 content_app_sources -= [
54 "content_main.cc", 54 "content_main.cc",
55 "mojo/mojo_init.cc", 55 "mojo/mojo_init.cc",
56 "mojo/mojo_init.h", 56 "mojo/mojo_init.h",
57 ] 57 ]
58 } else { 58 } else {
59 content_app_deps += [ 59 content_app_deps += [
60 "//mojo/edk/system",
61 "//mojo/environment:chromium", 60 "//mojo/environment:chromium",
62 "//mojo/public/interfaces/application", 61 "//third_party/mojo/src/mojo/edk/system",
62 "//third_party/mojo/src/mojo/public/interfaces/application",
63 ] 63 ]
64 } 64 }
65 65
66 content_app_extra_configs = [ 66 content_app_extra_configs = [
67 "//build/config/compiler:wexit_time_destructors", 67 "//build/config/compiler:wexit_time_destructors",
68 "//content:content_implementation", 68 "//content:content_implementation",
69 ] 69 ]
70 70
71 if (!is_chrome_multiple_dll) { 71 if (!is_chrome_multiple_dll) {
72 content_app_deps += [ "//content/gpu" ] 72 content_app_deps += [ "//content/gpu" ]
(...skipping 27 matching lines...) Expand all
100 source_set("child") { 100 source_set("child") {
101 visibility = [ "//content/public/app:child" ] 101 visibility = [ "//content/public/app:child" ]
102 102
103 sources = content_app_sources 103 sources = content_app_sources
104 configs += content_app_extra_configs 104 configs += content_app_extra_configs
105 deps = content_app_deps 105 deps = content_app_deps
106 106
107 defines += [ "CHROME_MULTIPLE_DLL_CHILD" ] 107 defines += [ "CHROME_MULTIPLE_DLL_CHILD" ]
108 } 108 }
109 } 109 }
OLDNEW
« no previous file with comments | « components/nacl.gyp ('k') | content/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698