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

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

Issue 1926803002: 👓 Don't run android_lint() on targets that have only generated files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/android/internal_rules.gni ('k') | no next file » | 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 d627b7f258d5530a7a18366678e422a7b670d43e..f3986d492677795cd3788c136cb1bf90796d00e3 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1552,23 +1552,18 @@ template("android_apk") {
java_target = "${_template_name}__java"
java_library_impl(java_target) {
- forward_variables_from(invoker, [ "run_findbugs" ])
+ forward_variables_from(invoker,
+ [
+ "chromium_code",
+ "java_files",
+ "run_findbugs",
+ ])
supports_android = true
requires_android = true
override_build_config = _build_config
deps = _android_manifest_deps + [ ":$build_config_target" ]
android_manifest = _android_manifest
- chromium_code = true
- if (defined(invoker.chromium_code)) {
- chromium_code = invoker.chromium_code
- }
-
- if (defined(invoker.java_files)) {
- java_files = invoker.java_files
- } else {
- java_files = []
- }
srcjar_deps = _srcjar_deps
jar_path = _jar_path
dex_path = _lib_dex_path
@@ -2124,12 +2119,7 @@ template("unittest_apk") {
final_apk_path = "$root_build_dir/${apk_name}_apk/${apk_name}-debug.apk"
if (!defined(use_default_launcher) || use_default_launcher) {
- java_files = [
- "//testing/android/native_test/java/src/org/chromium/native_test/NativeBrowserTestActivity.java",
- "//testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java",
- "//testing/android/native_test/java/src/org/chromium/native_test/NativeUnitTestActivity.java",
- "//testing/android/native_test/java/src/org/chromium/native_test/NativeTestInstrumentationTestRunner.java",
- ]
+ deps += [ "//testing/android/native_test:native_test_java" ]
}
native_libs = [ unittests_binary ]
deps += [
« no previous file with comments | « build/config/android/internal_rules.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698