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

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

Issue 1681223007: Android Add java_group() template to GN (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: maintain ordering Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/gyp/write_build_config.py ('k') | build/config/android/rules.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index 86e7cb041807304b992b84facf28c47262847b99..405bacfe7c8cc3c48d04644fb487cdca040a52f1 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -352,7 +352,7 @@ template("write_build_config") {
assert(type == "android_apk" || type == "java_library" ||
type == "android_resources" || type == "deps_dex" ||
type == "android_assets" || type == "resource_rewriter" ||
- type == "java_binary")
+ type == "java_binary" || type == "group")
deps = []
forward_variables_from(invoker,
@@ -395,11 +395,12 @@ template("write_build_config") {
is_android_assets = type == "android_assets"
is_android_resources = type == "android_resources"
is_deps_dex = type == "deps_dex"
+ is_group = type == "group"
- supports_android =
- is_apk || is_android_assets || is_android_resources || is_deps_dex ||
- (is_java && defined(invoker.supports_android) &&
- invoker.supports_android)
+ supports_android = is_apk || is_android_assets || is_android_resources ||
+ is_deps_dex || is_group ||
+ (is_java && defined(invoker.supports_android) &&
+ invoker.supports_android)
requires_android =
is_apk || is_android_assets || is_android_resources || is_deps_dex ||
(is_java && defined(invoker.requires_android) &&
@@ -413,6 +414,7 @@ template("write_build_config") {
assert(is_apk || true)
assert(is_android_resources || true)
assert(is_deps_dex || true)
+ assert(is_group || true)
if (is_java || is_apk) {
args += [
« no previous file with comments | « build/android/gyp/write_build_config.py ('k') | build/config/android/rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698