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

Side by Side Diff: chrome/android/BUILD.gn

Issue 1947983006: ☯ Remove deprecated libchrome_public target. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 import("//build/config/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/android/rules.gni") 6 import("//build/config/android/rules.gni")
7 import("//build_overrides/v8.gni") 7 import("//build_overrides/v8.gni")
8 import("//chrome/android/chrome_public_apk_tmpl.gni") 8 import("//chrome/android/chrome_public_apk_tmpl.gni")
9 import("//chrome/common/features.gni") 9 import("//chrome/common/features.gni")
10 import("//chrome/version.gni") 10 import("//chrome/version.gni")
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 # GYP: //chrome/android/chrome_apk.gyp:chrome_sync_shell_apk_template_resources 420 # GYP: //chrome/android/chrome_apk.gyp:chrome_sync_shell_apk_template_resources
421 jinja_template_resources("chrome_sync_shell_apk_template_resources") { 421 jinja_template_resources("chrome_sync_shell_apk_template_resources") {
422 resources = [ 422 resources = [
423 "java/res_template/xml/searchable.xml", 423 "java/res_template/xml/searchable.xml",
424 "java/res_template/xml/syncadapter.xml", 424 "java/res_template/xml/syncadapter.xml",
425 ] 425 ]
426 res_dir = "java/res_template" 426 res_dir = "java/res_template"
427 variables = chrome_sync_shell_jinja_variables 427 variables = chrome_sync_shell_jinja_variables
428 } 428 }
429 429
430 # GYP: //chrome/android/chrome_apk.gyp:libchrome_public
431 # TODO(yfriedman): Remove and re-use chrome target.
432 shared_library("chrome_public") {
433 deps = [
434 "//build/config/sanitizers:deps",
435 "//chrome:chrome_android_core",
436 ]
437 sources = chrome_apk_gypi.chrome_app_native_sources
438 }
439
440 # GYP: none 430 # GYP: none
441 shared_library("chrome") { 431 shared_library("chrome") {
442 sources = chrome_apk_gypi.chrome_app_native_sources 432 sources = chrome_apk_gypi.chrome_app_native_sources
443 deps = [ 433 deps = [
444 "//build/config/sanitizers:deps", 434 "//build/config/sanitizers:deps",
445 "//chrome:chrome_android_core", 435 "//chrome:chrome_android_core",
446 ] 436 ]
447 437
448 if (is_android && use_order_profiling) { 438 if (is_android && use_order_profiling) {
449 deps += [ "//tools/cygprofile" ] 439 deps += [ "//tools/cygprofile" ]
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 "//base:base_java", 486 "//base:base_java",
497 google_play_services_resources, 487 google_play_services_resources,
498 ] 488 ]
499 } 489 }
500 } 490 }
501 491
502 chrome_public_apk_tmpl_shared("chrome_public_apk") { 492 chrome_public_apk_tmpl_shared("chrome_public_apk") {
503 android_manifest = get_target_outputs(":chrome_public_apk_manifest") 493 android_manifest = get_target_outputs(":chrome_public_apk_manifest")
504 android_manifest = android_manifest[1] 494 android_manifest = android_manifest[1]
505 apk_name = "ChromePublic" 495 apk_name = "ChromePublic"
506 native_libs = [ "libchrome_public.so" ] 496 native_libs = [ "libchrome.so" ]
507 497
508 deps = [ 498 deps = [
509 ":chrome_public", 499 ":chrome",
510 ":chrome_public_apk_manifest", 500 ":chrome_public_apk_manifest",
511 ":chrome_public_apk_template_resources", 501 ":chrome_public_apk_template_resources",
512 ] 502 ]
513 } 503 }
514 504
515 chrome_public_apk_tmpl_shared("chrome_sync_shell_apk") { 505 chrome_public_apk_tmpl_shared("chrome_sync_shell_apk") {
516 testonly = true 506 testonly = true
517 android_manifest = get_target_outputs(":chrome_sync_shell_apk_manifest") 507 android_manifest = get_target_outputs(":chrome_sync_shell_apk_manifest")
518 android_manifest = android_manifest[1] 508 android_manifest = android_manifest[1]
519 apk_name = "ChromeSyncShell" 509 apk_name = "ChromeSyncShell"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
598 instrumentation_test_apk("chrome_sync_shell_test_apk") { 588 instrumentation_test_apk("chrome_sync_shell_test_apk") {
599 apk_name = "ChromeSyncShellTest" 589 apk_name = "ChromeSyncShellTest"
600 apk_under_test = ":chrome_sync_shell_apk" 590 apk_under_test = ":chrome_sync_shell_apk"
601 android_manifest = chrome_sync_shell_test_apk_manifest 591 android_manifest = chrome_sync_shell_test_apk_manifest
602 deps = [ 592 deps = [
603 ":chrome_sync_shell_test_apk_java", 593 ":chrome_sync_shell_test_apk_java",
604 ":chrome_sync_shell_test_apk_manifest", 594 ":chrome_sync_shell_test_apk_manifest",
605 ] 595 ]
606 proguard_enabled = !is_debug 596 proguard_enabled = !is_debug
607 } 597 }
OLDNEW
« no previous file with comments | « base/allocator/allocator_shim_override_linker_wrapped_symbols.h ('k') | chrome/android/chrome_apk.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698