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

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

Issue 2082453003: 🎅 Use GN's dependency info for native libraries in write_build_config.py (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix osmesa on non-android Created 4 years, 6 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 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 ":chrome_public_apk_resources", 488 ":chrome_public_apk_resources",
489 "//base:base_java", 489 "//base:base_java",
490 ] 490 ]
491 } 491 }
492 } 492 }
493 493
494 chrome_public_apk_tmpl_shared("chrome_public_apk") { 494 chrome_public_apk_tmpl_shared("chrome_public_apk") {
495 android_manifest = get_target_outputs(":chrome_public_apk_manifest") 495 android_manifest = get_target_outputs(":chrome_public_apk_manifest")
496 android_manifest = android_manifest[1] 496 android_manifest = android_manifest[1]
497 apk_name = "ChromePublic" 497 apk_name = "ChromePublic"
498 native_libs = [ "libchrome.so" ] 498 shared_libraries = [ ":chrome" ]
499 499
500 deps = [ 500 deps = [
501 ":chrome",
502 ":chrome_public_apk_manifest", 501 ":chrome_public_apk_manifest",
503 ":chrome_public_apk_template_resources", 502 ":chrome_public_apk_template_resources",
504 ] 503 ]
505 } 504 }
506 505
507 chrome_public_apk_tmpl_shared("chrome_sync_shell_apk") { 506 chrome_public_apk_tmpl_shared("chrome_sync_shell_apk") {
508 testonly = true 507 testonly = true
509 android_manifest = get_target_outputs(":chrome_sync_shell_apk_manifest") 508 android_manifest = get_target_outputs(":chrome_sync_shell_apk_manifest")
510 android_manifest = android_manifest[1] 509 android_manifest = android_manifest[1]
511 apk_name = "ChromeSyncShell" 510 apk_name = "ChromeSyncShell"
512 native_libs = [ "libchrome_sync_shell.so" ] 511 shared_libraries = [ ":chrome_sync_shell" ]
513 512
514 deps = [ 513 deps = [
515 ":chrome_sync_shell",
516 ":chrome_sync_shell_apk_manifest", 514 ":chrome_sync_shell_apk_manifest",
517 ":chrome_sync_shell_apk_template_resources", 515 ":chrome_sync_shell_apk_template_resources",
518 516
519 # This exists here because com.google.protobuf.nano is needed in tests, 517 # This exists here because com.google.protobuf.nano is needed in tests,
520 # but that code is stripped out via proguard. Adding this deps adds 518 # but that code is stripped out via proguard. Adding this deps adds
521 # usages and prevents removal of the proto code. 519 # usages and prevents removal of the proto code.
522 "//sync:test_support_sync_proto_java", 520 "//sync:test_support_sync_proto_java",
523 ] 521 ]
524 } 522 }
525 523
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 instrumentation_test_apk("chrome_sync_shell_test_apk") { 589 instrumentation_test_apk("chrome_sync_shell_test_apk") {
592 apk_name = "ChromeSyncShellTest" 590 apk_name = "ChromeSyncShellTest"
593 apk_under_test = ":chrome_sync_shell_apk" 591 apk_under_test = ":chrome_sync_shell_apk"
594 android_manifest = chrome_sync_shell_test_apk_manifest 592 android_manifest = chrome_sync_shell_test_apk_manifest
595 deps = [ 593 deps = [
596 ":chrome_sync_shell_test_apk_java", 594 ":chrome_sync_shell_test_apk_java",
597 ":chrome_sync_shell_test_apk_manifest", 595 ":chrome_sync_shell_test_apk_manifest",
598 ] 596 ]
599 proguard_enabled = !is_java_debug 597 proguard_enabled = !is_java_debug
600 } 598 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698