Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
| 6 | 6 |
| 7 content_app_sources = [ | 7 content_app_sources = [ |
| 8 "android/app_jni_registrar.cc", | 8 "android/app_jni_registrar.cc", |
| 9 "android/app_jni_registrar.h", | 9 "android/app_jni_registrar.h", |
| 10 "android/child_process_service.cc", | 10 "android/child_process_service.cc", |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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 "//device/usb", | |
|
Reilly Grant (use Gerrit)
2016/02/27 02:22:56
This seems like an awfully high level place to add
juncai
2016/02/29 18:55:23
ok, I moved this dep to the above:
else if (is_and
| |
| 60 "//mojo/shell/public/interfaces", | 61 "//mojo/shell/public/interfaces", |
| 61 "//mojo/edk/system", | 62 "//mojo/edk/system", |
| 62 "//mojo/environment:chromium", | 63 "//mojo/environment:chromium", |
| 63 ] | 64 ] |
| 64 } | 65 } |
| 65 | 66 |
| 66 content_app_extra_configs = [ | 67 content_app_extra_configs = [ |
| 67 "//build/config/compiler:wexit_time_destructors", | 68 "//build/config/compiler:wexit_time_destructors", |
| 68 "//content:content_implementation", | 69 "//content:content_implementation", |
| 69 "//content/public/common:mojo_shell_client", | 70 "//content/public/common:mojo_shell_client", |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 102 source_set("child") { | 103 source_set("child") { |
| 103 visibility = [ "//content/public/app:child" ] | 104 visibility = [ "//content/public/app:child" ] |
| 104 | 105 |
| 105 sources = content_app_sources | 106 sources = content_app_sources |
| 106 configs += content_app_extra_configs | 107 configs += content_app_extra_configs |
| 107 deps = content_app_deps | 108 deps = content_app_deps |
| 108 | 109 |
| 109 defines = [ "CHROME_MULTIPLE_DLL_CHILD" ] | 110 defines = [ "CHROME_MULTIPLE_DLL_CHILD" ] |
| 110 } | 111 } |
| 111 } | 112 } |
| OLD | NEW |