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

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

Issue 1278573002: [Android] Add gyp support for multidex. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase + robolectric shadow for MultiDex Created 5 years, 4 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
Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index f627e43699ec53c375921868f619e07dd789f2cf..9fa1f80b4c8bd6ef74be9bbc0848908231daddf3 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1085,6 +1085,9 @@ template("java_library") {
# proguard_preprocess: If true, proguard preprocessing will be run. This can
# be used to remove unwanted parts of the library.
# proguard_config: Path to the proguard config for preprocessing.
+# supports_android: If true, Android targets (android_library, android_apk)
Yaron 2015/08/24 15:28:44 Am I missing something? I don't see where this is
jbudorick 2015/08/24 21:13:51 requires_android and supports_android are enforced
+# may depend on this target. Note: if true, this target must only use the
+# subset of Java available on Android.
#
# Example
# java_prebuilt("foo_java") {
@@ -1116,6 +1119,9 @@ template("java_prebuilt") {
if (defined(invoker.proguard_preprocess)) {
proguard_preprocess = invoker.proguard_preprocess
}
+ if (defined(invoker.supports_android)) {
+ supports_android = invoker.supports_android
+ }
}
}

Powered by Google App Engine
This is Rietveld 408576698