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

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

Issue 1436083002: Revert of GN: Enable proguard for apks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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/version.gni") 9 import("//chrome/version.gni")
10 import("//testing/test.gni") 10 import("//testing/test.gni")
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 448
449 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk_manifest 449 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk_manifest
450 jinja_template("chrome_public_test_apk_manifest") { 450 jinja_template("chrome_public_test_apk_manifest") {
451 input = "javatests/AndroidManifest.xml" 451 input = "javatests/AndroidManifest.xml"
452 output = chrome_public_test_apk_manifest 452 output = chrome_public_test_apk_manifest
453 variables = jinja_variables 453 variables = jinja_variables
454 } 454 }
455 455
456 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk 456 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk
457 instrumentation_test_apk("chrome_public_test_apk") { 457 instrumentation_test_apk("chrome_public_test_apk") {
458 # TODO(GYP,cjhopman): Does this need version code/name?
458 apk_name = "ChromePublicTest" 459 apk_name = "ChromePublicTest"
459 apk_under_test = ":chrome_public_apk" 460 apk_under_test = ":chrome_public_apk"
460 android_manifest = chrome_public_test_apk_manifest 461 android_manifest = chrome_public_test_apk_manifest
461 deps = [ 462 deps = [
462 ":chrome_public_test_apk_manifest", 463 ":chrome_public_test_apk_manifest",
463 "//chrome/android:chrome_shared_test_java", 464 "//chrome/android:chrome_shared_test_java",
464 ] 465 ]
465 isolate_file = "../chrome_public_test_apk.isolate" 466 isolate_file = "../chrome_public_test_apk.isolate"
466 proguard_enabled = !is_debug
467 } 467 }
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