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

Side by Side Diff: shell/BUILD.gn

Issue 788243007: Moves BackgroundShellApplicationLoader to shell/android (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: merge 2 trunk Created 6 years 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 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/tools/bindings/mojom.gni") 7 import("//mojo/public/tools/bindings/mojom.gni")
8 8
9 # We don't support building in the component build since mojo apps are 9 # We don't support building in the component build since mojo apps are
10 # inherently components. 10 # inherently components.
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 if (is_win) { 189 if (is_win) {
190 deps -= [ "//shell/domain_socket" ] 190 deps -= [ "//shell/domain_socket" ]
191 } 191 }
192 192
193 if (is_android) { 193 if (is_android) {
194 sources += [ 194 sources += [
195 "android/android_handler.cc", 195 "android/android_handler.cc",
196 "android/android_handler.h", 196 "android/android_handler.h",
197 "android/android_handler_loader.cc", 197 "android/android_handler_loader.cc",
198 "android/android_handler_loader.h", 198 "android/android_handler_loader.h",
199 "android/background_application_loader.cc",
200 "android/background_application_loader.h",
199 "android/native_viewport_application_loader.cc", 201 "android/native_viewport_application_loader.cc",
200 "android/native_viewport_application_loader.h", 202 "android/native_viewport_application_loader.h",
201 "android/ui_application_loader_android.cc", 203 "android/ui_application_loader_android.cc",
202 "android/ui_application_loader_android.h", 204 "android/ui_application_loader_android.h",
203 ] 205 ]
204 206
205 deps += [ 207 deps += [
206 ":jni_headers", 208 ":jni_headers",
207 ":run_android_application_function", 209 ":run_android_application_function",
208 "//mojo/application:content_handler", 210 "//mojo/application:content_handler",
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 "//mojo/public/cpp/bindings", 393 "//mojo/public/cpp/bindings",
392 "//services/test_service:bindings", 394 "//services/test_service:bindings",
393 ] 395 ]
394 396
395 datadeps = [ 397 datadeps = [
396 "//services/test_service:test_app", 398 "//services/test_service:test_app",
397 "//services/test_service:test_request_tracker_app", 399 "//services/test_service:test_request_tracker_app",
398 ] 400 ]
399 401
400 if (is_android) { 402 if (is_android) {
403 sources += [ "android/background_application_loader_unittest.cc" ]
404
401 deps += [ 405 deps += [
402 # TODO(GYP): 406 # TODO(GYP):
403 #'../testing/android/native_test.gyp:native_test_native_code', 407 #'../testing/android/native_test.gyp:native_test_native_code',
404 ] 408 ]
405 } 409 }
406 } 410 }
407 411
408 # GYP version: mojo/mojo.gyp:mojo_shell_test_support 412 # GYP version: mojo/mojo.gyp:mojo_shell_test_support
409 source_set("test_support") { 413 source_set("test_support") {
410 sources = [ 414 sources = [
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 457
454 deps -= [ 458 deps -= [
455 ":lib", 459 ":lib",
456 ":external_application_registrar_connection", 460 ":external_application_registrar_connection",
457 ":external_application_registrar_bindings", 461 ":external_application_registrar_bindings",
458 "//shell/domain_socket", 462 "//shell/domain_socket",
459 "//shell/domain_socket:tests", 463 "//shell/domain_socket:tests",
460 ] 464 ]
461 } 465 }
462 } 466 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698