Turn Chrome Shell's AndroidManifest into a jinja2 template.

chrome/android/BUILD.gn

Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 076e956252802ac3015ca9f4f88efd027f7fb194..f4636f67266d34b53b6593abf041a4086b6a1909 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -7,6 +7,7 @@ import("//build/config/android/rules.gni")
 import("//chrome/version.gni")
 import("//third_party/icu/config.gni")
 
+chrome_shell_manifest = "$target_gen_dir/chrome_shell_manifest/AndroidManifest.xml"

[cjhopman, 2014/10/17 18:54:25]

Move this down near where it's used.

[newt (away), 2014/10/20 22:45:12]

Done.

 
 # GYP: //chrome/chrome.gyp:chrome_java (resources part)
 android_resources("chrome_java_resources") {
@@ -218,7 +219,7 @@ static_library("chrome_shell_base") {
 
 # TODO(GYP, cjhopman): make chrome_shell_base actually link and then move it to
 # deps. Also, actually compile the main delegates at that point.
-# GYP: //chrome/chrome_browser.gypi:libchromeshell
+# GYP: //chrome/chrome_shell.gypi:libchromeshell
 shared_library("chrome_shell") {
   testonly = true
   sources = [
@@ -237,7 +238,7 @@ shared_library("chrome_shell") {
   ]
 }
 
-# GYP: //chrome/chrome_browser.gypi:libchromesyncshell
+# GYP: //chrome/chrome_shell.gypi:libchromesyncshell
 shared_library("chrome_sync_shell") {
   testonly = true
   sources = [
@@ -349,7 +350,14 @@ copy_ex("chrome_shell_assets") {
   }
 }
 
-# GYP: //chrome/chrome_browser.gypi:chrome_shell_apk
+# GYP: //chrome/chrome_shell.gypi:chrome_shell_manifest
+jinja_template("chrome_shell_manifest") {
+  testonly = true  # is this needed?

[cjhopman, 2014/10/17 18:54:25]

this isn't needed (but it doesn't hurt).

gn will throw an error if any testonly=false thing depends on a testonly=true
thing. I'm not sure why chrome_shell_apk has testonly at all (content_shell_apk
has it because content_shell is testonly). I don't know if I consider
chrome_shell_apk a test-thing or not (but since content_shell is considered a
test thing I guess chrome shell should be too).

since this doesn't depend on anything testonly isn't required, adding it here
will just enforce that everything that depends on it is testonly (and thus
ensure that it won't be included in a production build of anything).

[newt (away), 2014/10/20 22:45:12]

Ok, keeping testonly

+  input = "shell/java/AndroidManifest.xml"
+  output = chrome_shell_manifest
+}
+
+# GYP: //chrome/chrome_shell.gypi:chrome_shell_apk
 android_apk("chrome_shell_apk") {
   testonly = true
   deps = [
@@ -359,7 +367,7 @@ android_apk("chrome_shell_apk") {
     ":chrome_shell",
   ]
   apk_name = "ChromeShell"
-  android_manifest = "shell/java/AndroidManifest.xml"
+  android_manifest = chrome_shell_manifest
   native_libs = [
     "$root_build_dir/lib.stripped/libchrome_shell.so"
   ]
@@ -378,7 +386,7 @@ android_apk("chrome_shell_apk") {
 
 }
 
-# GYP: //chrome/chrome_browser.gypi:chrome_sync_shell_apk
+# GYP: //chrome/chrome_shell.gypi:chrome_sync_shell_apk
 android_apk("chrome_sync_shell_apk") {
   testonly = true
   deps = [