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

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: Changing from 2 apks to gn arg which controls optimizations 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
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 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 variables = chrome_public_jinja_variables 541 variables = chrome_public_jinja_variables
542 } 542 }
543 543
544 # GYP: //chrome/android/chrome_apk.gyp:chrome_sync_shell_test_apk_manifest 544 # GYP: //chrome/android/chrome_apk.gyp:chrome_sync_shell_test_apk_manifest
545 jinja_template("chrome_sync_shell_test_apk_manifest") { 545 jinja_template("chrome_sync_shell_test_apk_manifest") {
546 input = "sync_shell/javatests/AndroidManifest.xml" 546 input = "sync_shell/javatests/AndroidManifest.xml"
547 output = chrome_sync_shell_test_apk_manifest 547 output = chrome_sync_shell_test_apk_manifest
548 variables = chrome_sync_shell_jinja_variables 548 variables = chrome_sync_shell_jinja_variables
549 } 549 }
550 550
551 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk 551 if (!enable_all_proguard_optimizations) {
552 instrumentation_test_apk("chrome_public_test_apk") { 552 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk
553 apk_name = "ChromePublicTest" 553 instrumentation_test_apk("chrome_public_test_apk") {
554 apk_under_test = ":chrome_public_apk" 554 apk_name = "ChromePublicTest"
555 android_manifest = chrome_public_test_apk_manifest 555 apk_under_test = ":chrome_public_apk"
556 android_manifest_dep = ":chrome_public_test_apk_manifest" 556 android_manifest = chrome_public_test_apk_manifest
557 android_manifest_dep = ":chrome_public_test_apk_manifest"
557 558
558 deps = [ 559 deps = [
559 ":chrome_test_java", 560 ":chrome_test_java",
560 "//chrome/android/webapk/shell_apk:shell_apk_javatests", 561 "//chrome/android/webapk/shell_apk:shell_apk_javatests",
561 ] 562 ]
562 additional_apks = [ 563 additional_apks = [
563 "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk ", 564 "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_a pk",
564 "//chrome/test/android/chrome_public_test_support:chrome_public_test_support _apk", 565 "//chrome/test/android/chrome_public_test_support:chrome_public_test_suppo rt_apk",
565 "//net/android:net_test_support_apk", 566 "//net/android:net_test_support_apk",
566 ] 567 ]
567 isolate_file = "../chrome_public_test_apk.isolate" 568 isolate_file = "../chrome_public_test_apk.isolate"
568 proguard_enabled = !is_java_debug 569 proguard_enabled = !is_java_debug
570 }
569 } 571 }
570 572
571 android_library("chrome_sync_shell_test_apk_java") { 573 android_library("chrome_sync_shell_test_apk_java") {
572 testonly = true 574 testonly = true
573 575
574 # From java_sources.jni. 576 # From java_sources.jni.
575 java_files = sync_shell_test_java_sources 577 java_files = sync_shell_test_java_sources
576 578
577 deps = [ 579 deps = [
578 "//base:base_java", 580 "//base:base_java",
579 "//base:base_java_test_support", 581 "//base:base_java_test_support",
580 "//chrome/android:chrome_java", 582 "//chrome/android:chrome_java",
581 "//chrome/test/android:chrome_java_test_support", 583 "//chrome/test/android:chrome_java_test_support",
582 "//components/bookmarks/common/android:bookmarks_java", 584 "//components/bookmarks/common/android:bookmarks_java",
583 "//components/policy/android:policy_java", 585 "//components/policy/android:policy_java",
584 "//content/public/android:content_java", 586 "//content/public/android:content_java",
585 "//content/public/test/android:content_java_test_support", 587 "//content/public/test/android:content_java_test_support",
586 "//sync:sync_java_test_support", 588 "//sync:sync_java_test_support",
587 "//sync:test_support_sync_proto_java", 589 "//sync:test_support_sync_proto_java",
588 "//sync/android:sync_java", 590 "//sync/android:sync_java",
589 "//third_party/android_protobuf:protobuf_nano_javalib", 591 "//third_party/android_protobuf:protobuf_nano_javalib",
590 "//third_party/android_tools:android_support_v13_java", 592 "//third_party/android_tools:android_support_v13_java",
591 "//third_party/android_tools:android_support_v7_appcompat_java", 593 "//third_party/android_tools:android_support_v7_appcompat_java",
592 "//ui/android:ui_java", 594 "//ui/android:ui_java",
593 ] 595 ]
594 } 596 }
595 597
596 # GYP: //chrome/android/chrome_apk.gyp:chrome_sync_shell_test_apk 598 if (!enable_all_proguard_optimizations) {
597 instrumentation_test_apk("chrome_sync_shell_test_apk") { 599 # GYP: //chrome/android/chrome_apk.gyp:chrome_sync_shell_test_apk
598 apk_name = "ChromeSyncShellTest" 600 instrumentation_test_apk("chrome_sync_shell_test_apk") {
599 apk_under_test = ":chrome_sync_shell_apk" 601 apk_name = "ChromeSyncShellTest"
600 android_manifest = chrome_sync_shell_test_apk_manifest 602 apk_under_test = ":chrome_sync_shell_apk"
601 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" 603 android_manifest = chrome_sync_shell_test_apk_manifest
602 deps = [ 604 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
603 ":chrome_sync_shell_test_apk_java", 605 deps = [
604 ] 606 ":chrome_sync_shell_test_apk_java",
605 proguard_enabled = !is_java_debug 607 ]
608 proguard_enabled = !is_java_debug
609 }
606 } 610 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698