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

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

Issue 2123753005: Creating new gn arg: enable_all_proguard_optimizations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased again Created 4 years, 5 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
« no previous file with comments | « build/config/android/rules.gni ('k') | chrome/android/chrome_public_apk_tmpl.gni » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 variables = chrome_public_jinja_variables 545 variables = chrome_public_jinja_variables
546 } 546 }
547 547
548 # GYP: //chrome/android/chrome_apk.gyp:chrome_sync_shell_test_apk_manifest 548 # GYP: //chrome/android/chrome_apk.gyp:chrome_sync_shell_test_apk_manifest
549 jinja_template("chrome_sync_shell_test_apk_manifest") { 549 jinja_template("chrome_sync_shell_test_apk_manifest") {
550 input = "sync_shell/javatests/AndroidManifest.xml" 550 input = "sync_shell/javatests/AndroidManifest.xml"
551 output = chrome_sync_shell_test_apk_manifest 551 output = chrome_sync_shell_test_apk_manifest
552 variables = chrome_sync_shell_jinja_variables 552 variables = chrome_sync_shell_jinja_variables
553 } 553 }
554 554
555 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk 555 if (!enable_all_proguard_optimizations) {
556 instrumentation_test_apk("chrome_public_test_apk") { 556 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk
557 apk_name = "ChromePublicTest" 557 instrumentation_test_apk("chrome_public_test_apk") {
558 apk_under_test = ":chrome_public_apk" 558 apk_name = "ChromePublicTest"
559 android_manifest = chrome_public_test_apk_manifest 559 apk_under_test = ":chrome_public_apk"
560 android_manifest_dep = ":chrome_public_test_apk_manifest" 560 android_manifest = chrome_public_test_apk_manifest
561 android_manifest_dep = ":chrome_public_test_apk_manifest"
561 562
562 deps = [ 563 deps = [
563 ":chrome_test_java", 564 ":chrome_test_java",
564 "//chrome/android/webapk/libs/runtime_library:runtime_library_javatests", 565 "//chrome/android/webapk/libs/runtime_library:runtime_library_javatests",
565 "//chrome/android/webapk/shell_apk:shell_apk_javatests", 566 "//chrome/android/webapk/shell_apk:shell_apk_javatests",
566 ] 567 ]
567 additional_apks = [ 568 additional_apks = [
568 "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk ", 569 "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_a pk",
569 "//chrome/test/android/chrome_public_test_support:chrome_public_test_support _apk", 570 "//chrome/test/android/chrome_public_test_support:chrome_public_test_suppo rt_apk",
570 "//net/android:net_test_support_apk", 571 "//net/android:net_test_support_apk",
571 ] 572 ]
572 isolate_file = "../chrome_public_test_apk.isolate" 573 isolate_file = "../chrome_public_test_apk.isolate"
573 proguard_enabled = !is_java_debug 574 proguard_enabled = !is_java_debug
575 }
574 } 576 }
575 577
576 android_library("chrome_sync_shell_test_apk_java") { 578 android_library("chrome_sync_shell_test_apk_java") {
577 testonly = true 579 testonly = true
578 580
579 # From java_sources.jni. 581 # From java_sources.jni.
580 java_files = sync_shell_test_java_sources 582 java_files = sync_shell_test_java_sources
581 583
582 deps = [ 584 deps = [
583 "//base:base_java", 585 "//base:base_java",
584 "//base:base_java_test_support", 586 "//base:base_java_test_support",
585 "//chrome/android:chrome_java", 587 "//chrome/android:chrome_java",
586 "//chrome/test/android:chrome_java_test_support", 588 "//chrome/test/android:chrome_java_test_support",
587 "//components/bookmarks/common/android:bookmarks_java", 589 "//components/bookmarks/common/android:bookmarks_java",
588 "//components/policy/android:policy_java", 590 "//components/policy/android:policy_java",
589 "//content/public/android:content_java", 591 "//content/public/android:content_java",
590 "//content/public/test/android:content_java_test_support", 592 "//content/public/test/android:content_java_test_support",
591 "//sync:sync_java_test_support", 593 "//sync:sync_java_test_support",
592 "//sync:test_support_sync_proto_java", 594 "//sync:test_support_sync_proto_java",
593 "//sync/android:sync_java", 595 "//sync/android:sync_java",
594 "//third_party/android_protobuf:protobuf_nano_javalib", 596 "//third_party/android_protobuf:protobuf_nano_javalib",
595 "//third_party/android_tools:android_support_v13_java", 597 "//third_party/android_tools:android_support_v13_java",
596 "//third_party/android_tools:android_support_v7_appcompat_java", 598 "//third_party/android_tools:android_support_v7_appcompat_java",
597 "//ui/android:ui_java", 599 "//ui/android:ui_java",
598 ] 600 ]
599 } 601 }
600 602
601 # GYP: //chrome/android/chrome_apk.gyp:chrome_sync_shell_test_apk 603 if (!enable_all_proguard_optimizations) {
602 instrumentation_test_apk("chrome_sync_shell_test_apk") { 604 # GYP: //chrome/android/chrome_apk.gyp:chrome_sync_shell_test_apk
603 apk_name = "ChromeSyncShellTest" 605 instrumentation_test_apk("chrome_sync_shell_test_apk") {
604 apk_under_test = ":chrome_sync_shell_apk" 606 apk_name = "ChromeSyncShellTest"
605 android_manifest = chrome_sync_shell_test_apk_manifest 607 apk_under_test = ":chrome_sync_shell_apk"
606 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" 608 android_manifest = chrome_sync_shell_test_apk_manifest
607 deps = [ 609 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
608 ":chrome_sync_shell_test_apk_java", 610 deps = [
609 ] 611 ":chrome_sync_shell_test_apk_java",
610 proguard_enabled = !is_java_debug 612 ]
613 proguard_enabled = !is_java_debug
614 }
611 } 615 }
OLDNEW
« no previous file with comments | « build/config/android/rules.gni ('k') | chrome/android/chrome_public_apk_tmpl.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698