| 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("//base/android/linker/config.gni") | 5 import("//base/android/linker/config.gni") | 
| 6 import("//build/config/android/config.gni") | 6 import("//build/config/android/config.gni") | 
| 7 import("//build/config/android/internal_rules.gni") | 7 import("//build/config/android/internal_rules.gni") | 
| 8 import("//build/config/sanitizers/sanitizers.gni") | 8 import("//build/config/sanitizers/sanitizers.gni") | 
| 9 import("//build/toolchain/toolchain.gni") | 9 import("//build/toolchain/toolchain.gni") | 
| 10 import("//third_party/android_platform/config.gni") | 10 import("//third_party/android_platform/config.gni") | 
| (...skipping 1534 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1545       defines = [] | 1545       defines = [] | 
| 1546       if (enable_multidex) { | 1546       if (enable_multidex) { | 
| 1547         defines += [ "ENABLE_MULTIDEX" ] | 1547         defines += [ "ENABLE_MULTIDEX" ] | 
| 1548       } | 1548       } | 
| 1549     } | 1549     } | 
| 1550     _srcjar_deps += [ ":${_template_name}__build_config_java" ] | 1550     _srcjar_deps += [ ":${_template_name}__build_config_java" ] | 
| 1551   } | 1551   } | 
| 1552 | 1552 | 
| 1553   java_target = "${_template_name}__java" | 1553   java_target = "${_template_name}__java" | 
| 1554   java_library_impl(java_target) { | 1554   java_library_impl(java_target) { | 
| 1555     forward_variables_from(invoker, [ "run_findbugs" ]) | 1555     forward_variables_from(invoker, | 
|  | 1556                            [ | 
|  | 1557                              "chromium_code", | 
|  | 1558                              "java_files", | 
|  | 1559                              "run_findbugs", | 
|  | 1560                            ]) | 
| 1556     supports_android = true | 1561     supports_android = true | 
| 1557     requires_android = true | 1562     requires_android = true | 
| 1558     override_build_config = _build_config | 1563     override_build_config = _build_config | 
| 1559     deps = _android_manifest_deps + [ ":$build_config_target" ] | 1564     deps = _android_manifest_deps + [ ":$build_config_target" ] | 
| 1560 | 1565 | 
| 1561     android_manifest = _android_manifest | 1566     android_manifest = _android_manifest | 
| 1562     chromium_code = true |  | 
| 1563     if (defined(invoker.chromium_code)) { |  | 
| 1564       chromium_code = invoker.chromium_code |  | 
| 1565     } |  | 
| 1566 |  | 
| 1567     if (defined(invoker.java_files)) { |  | 
| 1568       java_files = invoker.java_files |  | 
| 1569     } else { |  | 
| 1570       java_files = [] |  | 
| 1571     } |  | 
| 1572     srcjar_deps = _srcjar_deps | 1567     srcjar_deps = _srcjar_deps | 
| 1573     jar_path = _jar_path | 1568     jar_path = _jar_path | 
| 1574     dex_path = _lib_dex_path | 1569     dex_path = _lib_dex_path | 
| 1575     emma_never_instrument = _emma_never_instrument | 1570     emma_never_instrument = _emma_never_instrument | 
| 1576 | 1571 | 
| 1577     if (defined(invoker.deps)) { | 1572     if (defined(invoker.deps)) { | 
| 1578       deps += invoker.deps | 1573       deps += invoker.deps | 
| 1579     } | 1574     } | 
| 1580     if (defined(invoker.apk_under_test)) { | 1575     if (defined(invoker.apk_under_test)) { | 
| 1581       deps += [ "${invoker.apk_under_test}__java" ] | 1576       deps += [ "${invoker.apk_under_test}__java" ] | 
| (...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2117           "//testing/android/native_test/java/AndroidManifest.xml" | 2112           "//testing/android/native_test/java/AndroidManifest.xml" | 
| 2118     } | 2113     } | 
| 2119 | 2114 | 
| 2120     if (!defined(unittests_binary)) { | 2115     if (!defined(unittests_binary)) { | 
| 2121       unittests_binary = "lib${test_suite_name}${shlib_extension}" | 2116       unittests_binary = "lib${test_suite_name}${shlib_extension}" | 
| 2122     } | 2117     } | 
| 2123 | 2118 | 
| 2124     final_apk_path = "$root_build_dir/${apk_name}_apk/${apk_name}-debug.apk" | 2119     final_apk_path = "$root_build_dir/${apk_name}_apk/${apk_name}-debug.apk" | 
| 2125 | 2120 | 
| 2126     if (!defined(use_default_launcher) || use_default_launcher) { | 2121     if (!defined(use_default_launcher) || use_default_launcher) { | 
| 2127       java_files = [ | 2122       deps += [ "//testing/android/native_test:native_test_java" ] | 
| 2128         "//testing/android/native_test/java/src/org/chromium/native_test/NativeB
      rowserTestActivity.java", |  | 
| 2129         "//testing/android/native_test/java/src/org/chromium/native_test/NativeT
      estActivity.java", |  | 
| 2130         "//testing/android/native_test/java/src/org/chromium/native_test/NativeU
      nitTestActivity.java", |  | 
| 2131         "//testing/android/native_test/java/src/org/chromium/native_test/NativeT
      estInstrumentationTestRunner.java", |  | 
| 2132       ] |  | 
| 2133     } | 2123     } | 
| 2134     native_libs = [ unittests_binary ] | 2124     native_libs = [ unittests_binary ] | 
| 2135     deps += [ | 2125     deps += [ | 
| 2136       "//base:base_java", | 2126       "//base:base_java", | 
| 2137       "//testing/android/appurify_support:appurify_support_java", | 2127       "//testing/android/appurify_support:appurify_support_java", | 
| 2138       "//testing/android/reporter:reporter_java", | 2128       "//testing/android/reporter:reporter_java", | 
| 2139     ] | 2129     ] | 
| 2140     data_deps += [ | 2130     data_deps += [ | 
| 2141       "//build/android/pylib/remote/device/dummy:remote_device_dummy_apk", | 2131       "//build/android/pylib/remote/device/dummy:remote_device_dummy_apk", | 
| 2142       "//tools/android/md5sum", | 2132       "//tools/android/md5sum", | 
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2406       "--target", | 2396       "--target", | 
| 2407       rebase_path(invoker.target, root_build_dir), | 2397       rebase_path(invoker.target, root_build_dir), | 
| 2408       "--output-directory", | 2398       "--output-directory", | 
| 2409       rebase_path(root_out_dir, root_build_dir), | 2399       rebase_path(root_out_dir, root_build_dir), | 
| 2410     ] | 2400     ] | 
| 2411     if (defined(invoker.flag_name)) { | 2401     if (defined(invoker.flag_name)) { | 
| 2412       args += [ "--flag-name=${invoker.flag_name}" ] | 2402       args += [ "--flag-name=${invoker.flag_name}" ] | 
| 2413     } | 2403     } | 
| 2414   } | 2404   } | 
| 2415 } | 2405 } | 
| OLD | NEW | 
|---|