Revert of Android: Store language .pak files in res/raw rather than assets

Revert of Android: Store language .pak files in res/raw rather than assets (patchset #7 id:120001 of https://codereview.chromium.org/1158053005/)

Reason for revert:
this change breaks android TOT bot

Original issue's description:
> Android: Store language .pak files in res/raw rather than assets
> 
> This is a prerequisite for having them live within APK splits.
> 
> Although pak files need to be renamed to be stored under res/raw,
> ResourceExtractor restores their original name during extraction (so no
> change to native code).
> 
> All sub-locales are stored and extracted together, just as before.
> 
> BUG=371610
> 
> Committed: https://crrev.com/f30e04470453ccd7e6a9abf586185b991d174902
> Cr-Commit-Position: refs/heads/master@{#335350}

TBR=yfriedman@chromium.org,torne@chromium.org,cjhopman@chromium.org,jaekyun@chromium.org,jhawkins@chromium.org,gunsch@chromium.org,newt@chromium.org,agrieve@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=371610

[qinmin, 2015-06-20 02:53:13]

Created Revert of Android: Store language .pak files in res/raw rather than
assets

[commit-bot: I haz the power, 2015-06-20 02:53:50]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1193113004/1

[commit-bot: I haz the power, 2015-06-20 02:54:43]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-06-20 02:54:45]

Failed to apply patch for build/config/android/rules.gni:
While running git apply --index -3 -p1;
  error: patch failed: build/config/android/rules.gni:540
  Falling back to three-way merge...
  Applied patch to 'build/config/android/rules.gni' with conflicts.
  U build/config/android/rules.gni

Patch:       build/config/android/rules.gni
Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index
96cbe44f1ca6d5a8ddd2d78217e4f6ab2360c15b..4c22fac76814df3c0aeaa14a54d096b755c238a2
100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -540,63 +540,6 @@
     deps = [
       ":${target_name}__build_config",
       ":${target_name}__template",
-    ]
-  }
-}
-
-# Creates a resources.zip with locale.pak files placed into appropriate
-# resource configs (e.g. en-GB.pak -> res/raw-en/en_gb.pak). Also generates
-# a locale_paks TypedArray so that resource files can be enumerated at runtime.
-#
-# If this target is included in the deps of an android resources/library/apk,
-# the resources will be included with that target.
-#
-# Variables:
-#   sources: List of .pak files. Names must be of the form "en.pak" or
-#       "en-US.pak".
-#
-# Example
-#   locale_pak_resources("locale_paks") {
-#     sources = [ "path/en-US.pak", "path/fr.pak", ... ]
-#   }
-template("locale_pak_resources") {
-  set_sources_assignment_filter([])
-  assert(defined(invoker.sources))
-
-  _base_path = "$target_gen_dir/$target_name"
-  _resources_zip = _base_path + ".resources.zip"
-  _build_config = _base_path + ".build_config"
-
-  write_build_config("${target_name}__build_config") {
-    build_config = _build_config
-    resources_zip = _resources_zip
-    type = "android_resources"
-  }
-
-  action("${target_name}__create_resources_zip") {
-    sources = invoker.sources
-    script = "//build/android/gyp/locale_pak_resources.py"
-    depfile = "$target_gen_dir/$target_name.d"
-
-    outputs = [
-      depfile,
-      _resources_zip,
-    ]
-
-    _rebased_sources = rebase_path(invoker.sources, root_build_dir)
-    args = [
-      "--locale-paks=${_rebased_sources}",
-      "--resources-zip",
-      rebase_path(_resources_zip, root_build_dir),
-      "--depfile",
-      rebase_path(depfile, root_build_dir),
-    ]
-  }
-
-  group(target_name) {
-    deps = [
-      ":${target_name}__build_config",
-      ":${target_name}__create_resources_zip",
     ]
   }
 }

[qinmin, 2015-06-20 02:54:57]

The CQ bit was checked by qinmin@chromium.org

[commit-bot: I haz the power, 2015-06-20 02:55:40]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1193113004/1

[commit-bot: I haz the power, 2015-06-20 03:00:35]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-06-20 03:00:37]

Failed to apply patch for build/config/android/rules.gni:
While running git apply --index -3 -p1;
  error: patch failed: build/config/android/rules.gni:540
  Falling back to three-way merge...
  Applied patch to 'build/config/android/rules.gni' with conflicts.
  U build/config/android/rules.gni

Patch:       build/config/android/rules.gni
Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index
96cbe44f1ca6d5a8ddd2d78217e4f6ab2360c15b..4c22fac76814df3c0aeaa14a54d096b755c238a2
100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -540,63 +540,6 @@
     deps = [
       ":${target_name}__build_config",
       ":${target_name}__template",
-    ]
-  }
-}
-
-# Creates a resources.zip with locale.pak files placed into appropriate
-# resource configs (e.g. en-GB.pak -> res/raw-en/en_gb.pak). Also generates
-# a locale_paks TypedArray so that resource files can be enumerated at runtime.
-#
-# If this target is included in the deps of an android resources/library/apk,
-# the resources will be included with that target.
-#
-# Variables:
-#   sources: List of .pak files. Names must be of the form "en.pak" or
-#       "en-US.pak".
-#
-# Example
-#   locale_pak_resources("locale_paks") {
-#     sources = [ "path/en-US.pak", "path/fr.pak", ... ]
-#   }
-template("locale_pak_resources") {
-  set_sources_assignment_filter([])
-  assert(defined(invoker.sources))
-
-  _base_path = "$target_gen_dir/$target_name"
-  _resources_zip = _base_path + ".resources.zip"
-  _build_config = _base_path + ".build_config"
-
-  write_build_config("${target_name}__build_config") {
-    build_config = _build_config
-    resources_zip = _resources_zip
-    type = "android_resources"
-  }
-
-  action("${target_name}__create_resources_zip") {
-    sources = invoker.sources
-    script = "//build/android/gyp/locale_pak_resources.py"
-    depfile = "$target_gen_dir/$target_name.d"
-
-    outputs = [
-      depfile,
-      _resources_zip,
-    ]
-
-    _rebased_sources = rebase_path(invoker.sources, root_build_dir)
-    args = [
-      "--locale-paks=${_rebased_sources}",
-      "--resources-zip",
-      rebase_path(_resources_zip, root_build_dir),
-      "--depfile",
-      rebase_path(depfile, root_build_dir),
-    ]
-  }
-
-  group(target_name) {
-    deps = [
-      ":${target_name}__build_config",
-      ":${target_name}__create_resources_zip",
     ]
   }
 }

[commit-bot: I haz the power, 2015-06-20 03:01:07]

The CQ bit was unchecked by commit-bot@chromium.org