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

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: another printf 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 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 if (is_win) { 187 if (is_win) {
188 deps -= [ "//shell/domain_socket" ] 188 deps -= [ "//shell/domain_socket" ]
189 } 189 }
190 190
191 if (is_android) { 191 if (is_android) {
192 sources += [ 192 sources += [
193 "android/android_handler.cc", 193 "android/android_handler.cc",
194 "android/android_handler.h", 194 "android/android_handler.h",
195 "android/android_handler_loader.cc", 195 "android/android_handler_loader.cc",
196 "android/android_handler_loader.h", 196 "android/android_handler_loader.h",
197 "android/background_application_loader.cc",
198 "android/background_application_loader.h",
197 "android/ui_application_loader_android.cc", 199 "android/ui_application_loader_android.cc",
198 "android/ui_application_loader_android.h", 200 "android/ui_application_loader_android.h",
199 ] 201 ]
200 202
201 deps += [ 203 deps += [
202 ":jni_headers", 204 ":jni_headers",
203 ":run_android_application_function", 205 ":run_android_application_function",
204 "//mojo/application:content_handler", 206 "//mojo/application:content_handler",
205 "//services/gles2", 207 "//services/gles2",
206 "//services/native_viewport:lib", 208 "//services/native_viewport:lib",
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 "//mojo/public/cpp/bindings", 385 "//mojo/public/cpp/bindings",
384 "//services/test_service:bindings", 386 "//services/test_service:bindings",
385 ] 387 ]
386 388
387 datadeps = [ 389 datadeps = [
388 "//services/test_service:test_app", 390 "//services/test_service:test_app",
389 "//services/test_service:test_request_tracker_app", 391 "//services/test_service:test_request_tracker_app",
390 ] 392 ]
391 393
392 if (is_android) { 394 if (is_android) {
395 sources += [ "android/background_application_loader_unittest.cc" ]
qsr 2014/12/17 10:34:34 This test is not run on android at the moment :( I
396
393 deps += [ 397 deps += [
394 # TODO(GYP): 398 # TODO(GYP):
395 #'../testing/android/native_test.gyp:native_test_native_code', 399 #'../testing/android/native_test.gyp:native_test_native_code',
396 ] 400 ]
397 } 401 }
398 } 402 }
399 403
400 # GYP version: mojo/mojo.gyp:mojo_shell_test_support 404 # GYP version: mojo/mojo.gyp:mojo_shell_test_support
401 source_set("test_support") { 405 source_set("test_support") {
402 sources = [ 406 sources = [
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 449
446 deps -= [ 450 deps -= [
447 ":lib", 451 ":lib",
448 ":external_application_registrar_connection", 452 ":external_application_registrar_connection",
449 ":external_application_registrar_bindings", 453 ":external_application_registrar_bindings",
450 "//shell/domain_socket", 454 "//shell/domain_socket",
451 "//shell/domain_socket:tests", 455 "//shell/domain_socket:tests",
452 ] 456 ]
453 } 457 }
454 } 458 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698