OLD | NEW |
---|---|
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/util/process_version.gni") | 7 import("//build/util/process_version.gni") |
8 import("//chrome/android/chrome_public_apk_tmpl.gni") | 8 import("//chrome/android/chrome_public_apk_tmpl.gni") |
9 import("//chrome/android/monochrome_android_manifest_jinja_variables.gni") | 9 import("//chrome/android/monochrome_android_manifest_jinja_variables.gni") |
10 import("//chrome/chrome_paks.gni") | 10 import("//chrome/chrome_paks.gni") |
(...skipping 897 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
908 "//chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_serv ice:apk_with_webapk_service", | 908 "//chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_serv ice:apk_with_webapk_service", |
909 "//chrome/android/webapk/shell_apk:webapk_javatests", | 909 "//chrome/android/webapk/shell_apk:webapk_javatests", |
910 "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk ", | 910 "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk ", |
911 "//chrome/test/android/chrome_public_test_support:chrome_public_test_support _apk", | 911 "//chrome/test/android/chrome_public_test_support:chrome_public_test_support _apk", |
912 "//net/android:net_test_support_apk", | 912 "//net/android:net_test_support_apk", |
913 ] | 913 ] |
914 proguard_enabled = !is_java_debug | 914 proguard_enabled = !is_java_debug |
915 | 915 |
916 # The test APK contains code from both the APK under test and the | 916 # The test APK contains code from both the APK under test and the |
917 # test APK when proguard is enabled. That causes this APK to exceed | 917 # test APK when proguard is enabled. That causes this APK to exceed |
918 # the dex limit. | 918 # the dex limit. Using android.support.multidex.MultiDexApplication |
jbudorick
2017/06/06 05:44:59
This is not the right place for this comment. It'd
aluo
2017/06/07 00:52:17
Done.
| |
919 enable_multidex = proguard_enabled | 919 # to support this case which requires multidex support. Can't use |
920 # BaseChromiumApplication due to BuildConfig.java conflict with | |
921 # chrome_public_apk. | |
922 enable_multidex = true | |
jbudorick
2017/06/06 05:44:59
I don't think this is the right way to ensure Mult
aluo
2017/06/07 00:52:17
That wasn't enough, still couldn't find class in d
| |
920 } | 923 } |
921 | 924 |
922 if (enable_vr) { | 925 if (enable_vr) { |
923 instrumentation_test_apk("chrome_public_test_vr_apk") { | 926 instrumentation_test_apk("chrome_public_test_vr_apk") { |
924 apk_name = "ChromePublicTestVr" | 927 apk_name = "ChromePublicTestVr" |
925 apk_under_test = ":chrome_public_apk" | 928 apk_under_test = ":chrome_public_apk" |
926 android_manifest = chrome_public_test_vr_apk_manifest | 929 android_manifest = chrome_public_test_vr_apk_manifest |
927 android_manifest_dep = ":chrome_public_test_vr_apk_manifest" | 930 android_manifest_dep = ":chrome_public_test_vr_apk_manifest" |
928 | 931 |
929 deps = [ | 932 deps = [ |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
964 apk_name = "ChromeSyncShellTest" | 967 apk_name = "ChromeSyncShellTest" |
965 apk_under_test = ":chrome_sync_shell_apk" | 968 apk_under_test = ":chrome_sync_shell_apk" |
966 android_manifest = chrome_sync_shell_test_apk_manifest | 969 android_manifest = chrome_sync_shell_test_apk_manifest |
967 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" | 970 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" |
968 deps = [ | 971 deps = [ |
969 ":chrome_sync_shell_test_apk_java", | 972 ":chrome_sync_shell_test_apk_java", |
970 "//third_party/android_support_test_runner:runner_java", | 973 "//third_party/android_support_test_runner:runner_java", |
971 ] | 974 ] |
972 proguard_enabled = !is_java_debug | 975 proguard_enabled = !is_java_debug |
973 } | 976 } |
OLD | NEW |