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

Unified Diff: net/BUILD.gn

Issue 361633002: [Android][gn] Add android resources templates (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-java
Patch Set: Fix bad rebase Created 6 years, 5 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/secondary/tools/grit/grit_rule.gni ('k') | ui/android/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/BUILD.gn
diff --git a/net/BUILD.gn b/net/BUILD.gn
index a77fac24fa3860f738cfa7149711ff6ecbde44ea..dacfad3451596461a92505f6a01e9deaab229293 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -5,9 +5,15 @@
import("//build/config/crypto.gni")
import("//build/config/features.gni")
import("//build/config/ui.gni")
-import("//tools/grit/grit_rule.gni")
import("//url/config.gni")
+# TODO(cjhopman): //build/config/android/rules.gni also imports grit_rule.gni.
+# Currently, that file can't be imported multiple times. Make this always
+# imported when http://crbug.com/393704 is fixed.
+if (!is_android) {
+ import("//tools/grit/grit_rule.gni")
+}
+
if (is_android) {
import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
« no previous file with comments | « build/secondary/tools/grit/grit_rule.gni ('k') | ui/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698