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

Side by Side Diff: build/config/android/rules.gni

Issue 1218053003: [Android] Begin switching from lighttpd + apache to EmbeddedTestServer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « build/config/android/internal_rules.gni ('k') | build/java_apk.gypi » ('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("//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("//third_party/android_platform/config.gni") 8 import("//third_party/android_platform/config.gni")
9 import("//tools/grit/grit_rule.gni") 9 import("//tools/grit/grit_rule.gni")
10 10
(...skipping 1451 matching lines...) Expand 10 before | Expand all | Expand 10 after
1462 } 1462 }
1463 1463
1464 _native_lib_version_rule = "" 1464 _native_lib_version_rule = ""
1465 if (defined(invoker.native_lib_version_rule)) { 1465 if (defined(invoker.native_lib_version_rule)) {
1466 _native_lib_version_rule = invoker.native_lib_version_rule 1466 _native_lib_version_rule = invoker.native_lib_version_rule
1467 } 1467 }
1468 _native_lib_version_arg = "\"\"" 1468 _native_lib_version_arg = "\"\""
1469 if (defined(invoker.native_lib_version_arg)) { 1469 if (defined(invoker.native_lib_version_arg)) {
1470 _native_lib_version_arg = invoker.native_lib_version_arg 1470 _native_lib_version_arg = invoker.native_lib_version_arg
1471 } 1471 }
1472
1473 _native_libraries_template =
1474 "//base/android/java/templates/NativeLibraries.template"
1475 if (defined(invoker.native_libraries_template)) {
1476 _native_libraries_template = invoker.native_libraries_template
1477 }
1472 } 1478 }
1473 1479
1474 _android_manifest_deps = [] 1480 _android_manifest_deps = []
1475 if (defined(invoker.android_manifest_dep)) { 1481 if (defined(invoker.android_manifest_dep)) {
1476 _android_manifest_deps = [ invoker.android_manifest_dep ] 1482 _android_manifest_deps = [ invoker.android_manifest_dep ]
1477 } 1483 }
1478 _android_manifest = invoker.android_manifest 1484 _android_manifest = invoker.android_manifest
1479 1485
1480 _rebased_build_config = rebase_path(_build_config, root_build_dir) 1486 _rebased_build_config = rebase_path(_build_config, root_build_dir)
1481 _create_abi_split = 1487 _create_abi_split =
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
1533 1539
1534 if (_native_libs != []) { 1540 if (_native_libs != []) {
1535 _enable_chromium_linker_tests = false 1541 _enable_chromium_linker_tests = false
1536 if (defined(invoker.enable_chromium_linker_tests)) { 1542 if (defined(invoker.enable_chromium_linker_tests)) {
1537 _enable_chromium_linker_tests = invoker.enable_chromium_linker_tests 1543 _enable_chromium_linker_tests = invoker.enable_chromium_linker_tests
1538 } 1544 }
1539 1545
1540 java_cpp_template("${_template_name}__native_libraries_java") { 1546 java_cpp_template("${_template_name}__native_libraries_java") {
1541 package_name = "org/chromium/base/library_loader" 1547 package_name = "org/chromium/base/library_loader"
1542 sources = [ 1548 sources = [
1543 "//base/android/java/templates/NativeLibraries.template", 1549 _native_libraries_template,
1544 ] 1550 ]
1545 inputs = [ 1551 inputs = [
1546 _build_config, 1552 _build_config,
1547 ] 1553 ]
1548 deps = [ 1554 deps = [
1549 ":$build_config_target", 1555 ":$build_config_target",
1550 ] 1556 ]
1551 if (_native_lib_version_rule != "") { 1557 if (_native_lib_version_rule != "") {
1552 deps += [ _native_lib_version_rule ] 1558 deps += [ _native_lib_version_rule ]
1553 } 1559 }
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
1873 "//tools/android/forwarder2", 1879 "//tools/android/forwarder2",
1874 "//tools/android/md5sum", 1880 "//tools/android/md5sum",
1875 ] 1881 ]
1876 if (defined(test_runner_data_dep)) { 1882 if (defined(test_runner_data_dep)) {
1877 data_deps += test_runner_data_dep 1883 data_deps += test_runner_data_dep
1878 } 1884 }
1879 if (defined(invoker.data_deps)) { 1885 if (defined(invoker.data_deps)) {
1880 data_deps += invoker.data_deps 1886 data_deps += invoker.data_deps
1881 } 1887 }
1882 deps = [ 1888 deps = [
1889 "//base:base_java",
1883 "//testing/android/broker:broker_java", 1890 "//testing/android/broker:broker_java",
1884 ] 1891 ]
1885 if (defined(invoker.deps)) { 1892 if (defined(invoker.deps)) {
1886 deps += invoker.deps 1893 deps += invoker.deps
1887 } 1894 }
1888 if (defined(invoker.java_files)) { 1895 if (defined(invoker.java_files)) {
1889 java_files = invoker.java_files 1896 java_files = invoker.java_files
1890 } 1897 }
1891 if (defined(invoker.srcjar_deps)) { 1898 if (defined(invoker.srcjar_deps)) {
1892 srcjar_deps = invoker.srcjar_deps 1899 srcjar_deps = invoker.srcjar_deps
1893 } 1900 }
1894 if (defined(invoker.apk_name)) { 1901 if (defined(invoker.apk_name)) {
1895 apk_name = invoker.apk_name 1902 apk_name = invoker.apk_name
1896 } 1903 }
1897 if (defined(invoker.final_apk_path)) { 1904 if (defined(invoker.final_apk_path)) {
1898 final_apk_path = invoker.final_apk_path 1905 final_apk_path = invoker.final_apk_path
1899 } 1906 }
1900 if (defined(invoker.native_libs)) { 1907 if (defined(invoker.native_libs)) {
1901 native_libs = invoker.native_libs 1908 native_libs = invoker.native_libs
1909 native_libraries_template =
1910 "//base/android/java/templates/NativeTestLibraries.template"
1902 } 1911 }
1903 if (defined(invoker.apk_under_test)) { 1912 if (defined(invoker.apk_under_test)) {
1904 apk_under_test = invoker.apk_under_test 1913 apk_under_test = invoker.apk_under_test
1905 } 1914 }
1906 if (defined(invoker.DEPRECATED_java_in_dir)) { 1915 if (defined(invoker.DEPRECATED_java_in_dir)) {
1907 DEPRECATED_java_in_dir = invoker.DEPRECATED_java_in_dir 1916 DEPRECATED_java_in_dir = invoker.DEPRECATED_java_in_dir
1908 } 1917 }
1909 } 1918 }
1910 } 1919 }
1911 1920
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
2225 template("uiautomator_test") { 2234 template("uiautomator_test") {
2226 set_sources_assignment_filter([]) 2235 set_sources_assignment_filter([])
2227 if (defined(invoker.testonly)) { 2236 if (defined(invoker.testonly)) {
2228 testonly = invoker.testonly 2237 testonly = invoker.testonly
2229 } 2238 }
2230 assert(target_name != "") 2239 assert(target_name != "")
2231 assert(invoker.deps != [] || true) 2240 assert(invoker.deps != [] || true)
2232 group(target_name) { 2241 group(target_name) {
2233 } 2242 }
2234 } 2243 }
OLDNEW
« no previous file with comments | « build/config/android/internal_rules.gni ('k') | build/java_apk.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698