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

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

Issue 920883002: Use combined native/manual JNI registration. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Factor out common code in test Created 5 years, 10 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
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("//tools/grit/grit_rule.gni") 8 import("//tools/grit/grit_rule.gni")
9 import("//tools/relocation_packer/config.gni") 9 import("//tools/relocation_packer/config.gni")
10 10
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 rebase_path(jni_output_dir, root_build_dir), 67 rebase_path(jni_output_dir, root_build_dir),
68 "--includes", 68 "--includes",
69 rebase_path(jni_generator_include, "//"), 69 rebase_path(jni_generator_include, "//"),
70 ] 70 ]
71 if (defined(invoker.jni_generator_jarjar_file)) { 71 if (defined(invoker.jni_generator_jarjar_file)) {
72 args += [ 72 args += [
73 "--jarjar", 73 "--jarjar",
74 rebase_path(jni_generator_jarjar_file, root_build_dir), 74 rebase_path(jni_generator_jarjar_file, root_build_dir),
75 ] 75 ]
76 } 76 }
77 if (!is_clang) {
78 # Clang builds currently fail with --native_exports_optional due to
79 # http://llvm.org/bugs/show_bug.cgi?id=22602 - only enable for gcc.
80 # http://crbug.com/442327
81 args += [ "--native_exports_optional" ]
82 }
77 } 83 }
78 84
79 config("jni_includes_${target_name}") { 85 config("jni_includes_${target_name}") {
80 # TODO(cjhopman): #includes should probably all be relative to 86 # TODO(cjhopman): #includes should probably all be relative to
81 # base_output_dir. Remove that from this config once the includes are 87 # base_output_dir. Remove that from this config once the includes are
82 # updated. 88 # updated.
83 include_dirs = [ 89 include_dirs = [
84 base_output_dir, 90 base_output_dir,
85 package_output_dir, 91 package_output_dir,
86 ] 92 ]
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 rebase_path(jar_file, root_build_dir), 183 rebase_path(jar_file, root_build_dir),
178 "--input_file", 184 "--input_file",
179 class, 185 class,
180 "--optimize_generation=1", 186 "--optimize_generation=1",
181 "--ptr_type=long", 187 "--ptr_type=long",
182 "--output_dir", 188 "--output_dir",
183 rebase_path(jni_output_dir, root_build_dir), 189 rebase_path(jni_output_dir, root_build_dir),
184 "--includes", 190 "--includes",
185 rebase_path(jni_generator_include, root_build_dir), 191 rebase_path(jni_generator_include, root_build_dir),
186 ] 192 ]
193 if (!is_clang) {
194 # Clang builds currently fail with --native_exports_optional due to
195 # http://llvm.org/bugs/show_bug.cgi?id=22602 - only enable for gcc.
196 # http://crbug.com/442327
197 args += [ "--native_exports_optional" ]
198 }
187 } 199 }
188 } 200 }
189 201
190 config("jni_includes_${target_name}") { 202 config("jni_includes_${target_name}") {
191 include_dirs = [ base_output_dir ] 203 include_dirs = [ base_output_dir ]
192 } 204 }
193 205
194 group(target_name) { 206 group(target_name) {
195 deps = jni_actions 207 deps = jni_actions
196 if (defined(invoker.deps)) { 208 if (defined(invoker.deps)) {
(...skipping 1538 matching lines...) Expand 10 before | Expand all | Expand 10 after
1735 template("uiautomator_test") { 1747 template("uiautomator_test") {
1736 set_sources_assignment_filter([]) 1748 set_sources_assignment_filter([])
1737 if (defined(invoker.testonly)) { 1749 if (defined(invoker.testonly)) {
1738 testonly = invoker.testonly 1750 testonly = invoker.testonly
1739 } 1751 }
1740 assert(target_name != "") 1752 assert(target_name != "")
1741 assert(invoker.deps != [] || true) 1753 assert(invoker.deps != [] || true)
1742 group(target_name) { 1754 group(target_name) {
1743 } 1755 }
1744 } 1756 }
OLDNEW
« no previous file with comments | « base/android/jni_generator/testNativeExportsOptionalOption.golden ('k') | build/jar_file_jni_generator.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698