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

Unified Diff: build/config/android/rules.gni

Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002) (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fixed bad android build patch Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/config/BUILDCONFIG.gn ('k') | build/config/clang/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index aa1fd2a6a3c803905b1636a440e157460449b70a..28608cbdd75a455749b6cdc776e98fe7cf91a78e 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -160,11 +160,13 @@ template("generate_jar_jni") {
jni_target_name = "${target_name}__jni_${classname}"
jni_actions += [ ":$jni_target_name" ]
action(jni_target_name) {
+ # The sources aren't compiled so don't check their dependencies.
+ check_includes = false
depfile = "$target_gen_dir/$target_name.d"
script = "//base/android/jni_generator/jni_generator.py"
sources = [
- jni_generator_include,
jar_file,
+ jni_generator_include,
]
outputs = [
depfile,
@@ -1499,7 +1501,6 @@ template("unittest_apk") {
deps = [
"//base:base_java",
"//build/android/pylib/remote/device/dummy:remote_device_dummy_apk",
- "//net/android:net_java_test_support",
]
if (defined(invoker.deps)) {
deps += invoker.deps
« no previous file with comments | « build/config/BUILDCONFIG.gn ('k') | build/config/clang/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698