| 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/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 523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 534 forward_variables_from(invoker, "*") | 534 forward_variables_from(invoker, "*") |
| 535 | 535 |
| 536 native_lib_version_rule = "//build/util:chrome_version_json" | 536 native_lib_version_rule = "//build/util:chrome_version_json" |
| 537 | 537 |
| 538 deps += [ | 538 deps += [ |
| 539 ":chrome_java", | 539 ":chrome_java", |
| 540 ":chrome_public_apk_assets", | 540 ":chrome_public_apk_assets", |
| 541 ":chrome_public_apk_resources", | 541 ":chrome_public_apk_resources", |
| 542 "//base:base_java", | 542 "//base:base_java", |
| 543 ] | 543 ] |
| 544 | |
| 545 if (enable_webvr && !is_java_debug) { | |
| 546 proguard_configs = [ "//third_party/gvr-android-sdk/proguard/base.flags" ] | |
| 547 } | |
| 548 } | 544 } |
| 549 } | 545 } |
| 550 | 546 |
| 551 chrome_public_apk_tmpl_shared("chrome_public_apk") { | 547 chrome_public_apk_tmpl_shared("chrome_public_apk") { |
| 552 android_manifest = get_target_outputs(":chrome_public_apk_manifest") | 548 android_manifest = get_target_outputs(":chrome_public_apk_manifest") |
| 553 android_manifest = android_manifest[1] | 549 android_manifest = android_manifest[1] |
| 554 android_manifest_dep = ":chrome_public_apk_manifest" | 550 android_manifest_dep = ":chrome_public_apk_manifest" |
| 555 apk_name = "ChromePublic" | 551 apk_name = "ChromePublic" |
| 556 shared_libraries = [ ":chrome" ] | 552 shared_libraries = [ ":chrome" ] |
| 557 | 553 |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 644 instrumentation_test_apk("chrome_sync_shell_test_apk") { | 640 instrumentation_test_apk("chrome_sync_shell_test_apk") { |
| 645 apk_name = "ChromeSyncShellTest" | 641 apk_name = "ChromeSyncShellTest" |
| 646 apk_under_test = ":chrome_sync_shell_apk" | 642 apk_under_test = ":chrome_sync_shell_apk" |
| 647 android_manifest = chrome_sync_shell_test_apk_manifest | 643 android_manifest = chrome_sync_shell_test_apk_manifest |
| 648 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" | 644 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" |
| 649 deps = [ | 645 deps = [ |
| 650 ":chrome_sync_shell_test_apk_java", | 646 ":chrome_sync_shell_test_apk_java", |
| 651 ] | 647 ] |
| 652 proguard_enabled = !is_java_debug | 648 proguard_enabled = !is_java_debug |
| 653 } | 649 } |
| OLD | NEW |