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

Side by Side Diff: content/shell/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("//third_party/icu/config.gni") 8 import("//third_party/icu/config.gni")
9 9
10 generate_jni("content_shell_jni_headers") { 10 generate_jni("content_shell_jni_headers") {
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 "//content/shell/android:content_shell_java", 145 "//content/shell/android:content_shell_java",
146 ] 146 ]
147 java_files = [ 147 java_files = [
148 "javatests/src/org/chromium/content_shell_apk/ContentShellPreconditionsTest. java", 148 "javatests/src/org/chromium/content_shell_apk/ContentShellPreconditionsTest. java",
149 "javatests/src/org/chromium/content_shell_apk/ContentShellShellManagementTes t.java", 149 "javatests/src/org/chromium/content_shell_apk/ContentShellShellManagementTes t.java",
150 "javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java", 150 "javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java",
151 "javatests/src/org/chromium/content_shell_apk/ContentShellUrlTest.java", 151 "javatests/src/org/chromium/content_shell_apk/ContentShellUrlTest.java",
152 ] 152 ]
153 } 153 }
154 154
155 instrumentation_test_apk("content_shell_test_apk") { 155 if (!enable_all_proguard_optimizations) {
156 deps = [ 156 instrumentation_test_apk("content_shell_test_apk") {
157 "//base:base_javatests", 157 deps = [
158 "//content/public/android:content_javatests", 158 "//base:base_javatests",
159 "//net/android:net_javatests", 159 "//content/public/android:content_javatests",
160 ] 160 "//net/android:net_javatests",
161 data_deps = [ 161 ]
162 ":content_shell_apk", 162 data_deps = [
163 ] 163 ":content_shell_apk",
164 apk_under_test = ":content_shell_apk" 164 ]
165 apk_name = "ContentShellTest" 165 apk_under_test = ":content_shell_apk"
166 android_manifest = "javatests/AndroidManifest.xml" 166 apk_name = "ContentShellTest"
167 isolate_file = "../../content_shell_test_data.isolate" 167 android_manifest = "javatests/AndroidManifest.xml"
168 isolate_file = "../../content_shell_test_data.isolate"
169 }
168 } 170 }
169 171
170 if (current_cpu != "x64") { 172 if (current_cpu != "x64") {
171 chromium_linker_test_manifest = 173 chromium_linker_test_manifest =
172 "$target_gen_dir/linker_test_apk/AndroidManifest.xml" 174 "$target_gen_dir/linker_test_apk/AndroidManifest.xml"
173 175
174 jinja_template("chromium_linker_test_manifest") { 176 jinja_template("chromium_linker_test_manifest") {
175 testonly = true 177 testonly = true
176 input = "linker_test_apk/AndroidManifest.xml.jinja2" 178 input = "linker_test_apk/AndroidManifest.xml.jinja2"
177 output = chromium_linker_test_manifest 179 output = chromium_linker_test_manifest
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 testonly = true 245 testonly = true
244 deps = [ 246 deps = [
245 ":content_shell_java", 247 ":content_shell_java",
246 "//base:base_java", 248 "//base:base_java",
247 "//content/public/android:content_java", 249 "//content/public/android:content_java",
248 "//testing/android/native_test:native_test_java", 250 "//testing/android/native_test:native_test_java",
249 "//ui/android:ui_java", 251 "//ui/android:ui_java",
250 ] 252 ]
251 java_files = [ "browsertests/src/org/chromium/content_shell/browsertests/Conte ntShellBrowserTestActivity.java" ] 253 java_files = [ "browsertests/src/org/chromium/content_shell/browsertests/Conte ntShellBrowserTestActivity.java" ]
252 } 254 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698