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

Unified Diff: remoting/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 side-by-side diff with in-line comments
Download patch
Index: remoting/android/BUILD.gn
diff --git a/remoting/android/BUILD.gn b/remoting/android/BUILD.gn
index 45a184b84a3858d771c945ced5685a36aa900101..ffe4edc1dad8fadd5c6d72174f0753cffb473244 100644
--- a/remoting/android/BUILD.gn
+++ b/remoting/android/BUILD.gn
@@ -148,26 +148,28 @@ remoting_localize("remoting_test_apk_manifest") {
output = "$root_gen_dir/remoting/android_test/{{source_name_part}}"
}
-instrumentation_test_apk("remoting_test_apk") {
- android_manifest = "$root_gen_dir/remoting/android_test/AndroidManifest.xml"
- android_manifest_dep = ":remoting_test_apk_manifest"
- apk_name = "ChromotingTest"
- apk_under_test = ":remoting_apk"
- java_files = [
- "javatests/src/org/chromium/chromoting/EventTest.java",
- "javatests/src/org/chromium/chromoting/MockInputStub.java",
- "javatests/src/org/chromium/chromoting/SwipePinchDetectorTest.java",
- "javatests/src/org/chromium/chromoting/TapGestureDetectorTest.java",
- "javatests/src/org/chromium/chromoting/TouchEventBuilder.java",
- "javatests/src/org/chromium/chromoting/TouchEventGenerator.java",
- "javatests/src/org/chromium/chromoting/TouchInputStrategyTest.java",
- "javatests/src/org/chromium/chromoting/test/util/MutableReference.java",
- ]
- deps = [
- ":remoting_android_client_java",
- "//base:base_java",
- "//base:base_java_test_support",
- ]
+if (!enable_all_proguard_optimizations) {
+ instrumentation_test_apk("remoting_test_apk") {
+ android_manifest = "$root_gen_dir/remoting/android_test/AndroidManifest.xml"
+ android_manifest_dep = ":remoting_test_apk_manifest"
+ apk_name = "ChromotingTest"
+ apk_under_test = ":remoting_apk"
+ java_files = [
+ "javatests/src/org/chromium/chromoting/EventTest.java",
+ "javatests/src/org/chromium/chromoting/MockInputStub.java",
+ "javatests/src/org/chromium/chromoting/SwipePinchDetectorTest.java",
+ "javatests/src/org/chromium/chromoting/TapGestureDetectorTest.java",
+ "javatests/src/org/chromium/chromoting/TouchEventBuilder.java",
+ "javatests/src/org/chromium/chromoting/TouchEventGenerator.java",
+ "javatests/src/org/chromium/chromoting/TouchInputStrategyTest.java",
+ "javatests/src/org/chromium/chromoting/test/util/MutableReference.java",
+ ]
+ deps = [
+ ":remoting_android_client_java",
+ "//base:base_java",
+ "//base:base_java_test_support",
+ ]
+ }
}
shared_library("remoting_host_jni") {

Powered by Google App Engine
This is Rietveld 408576698