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

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

Issue 1423633002: GN: Fix up net_unittests to match GYP (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments Created 5 years, 2 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 | « no previous file | net/BUILD.gn » ('j') | net/BUILD.gn » ('J')
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("//build/toolchain/toolchain.gni") 8 import("//build/toolchain/toolchain.gni")
9 import("//third_party/android_platform/config.gni") 9 import("//third_party/android_platform/config.gni")
10 import("//tools/grit/grit_rule.gni") 10 import("//tools/grit/grit_rule.gni")
(...skipping 1762 matching lines...) Expand 10 before | Expand all | Expand 10 after
1773 unittests_binary = "lib${test_suite_name}${shlib_extension}" 1773 unittests_binary = "lib${test_suite_name}${shlib_extension}"
1774 } 1774 }
1775 1775
1776 if (defined(invoker.apk_name)) { 1776 if (defined(invoker.apk_name)) {
1777 apk_name = invoker.apk_name 1777 apk_name = invoker.apk_name
1778 } else { 1778 } else {
1779 apk_name = test_suite_name 1779 apk_name = test_suite_name
1780 } 1780 }
1781 1781
1782 android_apk(target_name) { 1782 android_apk(target_name) {
1783 forward_variables_from(invoker, [ "asset_location" ]) 1783 forward_variables_from(invoker,
1784 [
1785 "asset_location",
1786 "android_manifest",
1787 ])
1784 final_apk_path = "$root_build_dir/${apk_name}_apk/${apk_name}-debug.apk" 1788 final_apk_path = "$root_build_dir/${apk_name}_apk/${apk_name}-debug.apk"
1785 java_files = [ 1789 java_files = [
1786 "//testing/android/native_test/java/src/org/chromium/native_test/NativeBro wserTestActivity.java", 1790 "//testing/android/native_test/java/src/org/chromium/native_test/NativeBro wserTestActivity.java",
1787 "//testing/android/native_test/java/src/org/chromium/native_test/NativeTes tActivity.java", 1791 "//testing/android/native_test/java/src/org/chromium/native_test/NativeTes tActivity.java",
1788 "//testing/android/native_test/java/src/org/chromium/native_test/NativeUni tTestActivity.java", 1792 "//testing/android/native_test/java/src/org/chromium/native_test/NativeUni tTestActivity.java",
1789 "//testing/android/native_test/java/src/org/chromium/native_test/NativeTes tInstrumentationTestRunner.java", 1793 "//testing/android/native_test/java/src/org/chromium/native_test/NativeTes tInstrumentationTestRunner.java",
1790 ] 1794 ]
1791 android_manifest = "//testing/android/native_test/java/AndroidManifest.xml" 1795 if (!defined(invoker.android_manifest)) {
1796 android_manifest =
1797 "//testing/android/native_test/java/AndroidManifest.xml"
1798 }
1792 native_libs = [ unittests_binary ] 1799 native_libs = [ unittests_binary ]
1793 deps = [ 1800 deps = [
1794 "//base:base_java", 1801 "//base:base_java",
1795 "//build/android/pylib/remote/device/dummy:remote_device_dummy_apk", 1802 "//build/android/pylib/remote/device/dummy:remote_device_dummy_apk",
1796 "//testing/android/appurify_support:appurify_support_java", 1803 "//testing/android/appurify_support:appurify_support_java",
1797 "//testing/android/reporter:reporter_java", 1804 "//testing/android/reporter:reporter_java",
1798 ] 1805 ]
1799 if (defined(invoker.deps)) { 1806 if (defined(invoker.deps)) {
1800 deps += invoker.deps 1807 deps += invoker.deps
1801 } 1808 }
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
2028 } 2035 }
2029 2036
2030 android_library(target_name) { 2037 android_library(target_name) {
2031 java_files = [] 2038 java_files = []
2032 srcjar_deps = [ ":${_template_name}__protoc_java" ] 2039 srcjar_deps = [ ":${_template_name}__protoc_java" ]
2033 deps = [ 2040 deps = [
2034 "//third_party/android_protobuf:protobuf_nano_javalib", 2041 "//third_party/android_protobuf:protobuf_nano_javalib",
2035 ] 2042 ]
2036 } 2043 }
2037 } 2044 }
OLDNEW
« no previous file with comments | « no previous file | net/BUILD.gn » ('j') | net/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698