[android_webview] Don't unconditionally add pak files to system image.

android_webview/build/resources_config.mk

Index: android_webview/build/resources_config.mk
diff --git a/android_webview/build/resources_config.mk b/android_webview/build/resources_config.mk
index 5f03256c5a4cc0dad85b061cac1b5d6b94b46e4f..5195b6892bdf83c86bdf5982ebb717e1db20937c 100644
--- a/android_webview/build/resources_config.mk
+++ b/android_webview/build/resources_config.mk
@@ -18,7 +18,76 @@ android_webview_resources_dirs := \
     $(call intermediates-dir-for,GYP,ui_strings_grd)/ui_strings_grd/res_grit \
     $(call intermediates-dir-for,GYP,content_strings_grd)/content_strings_grd/res_grit
 
+android_webview_asset_dirs := \

[Primiano Tucci (use gerrit), 2014/07/28 08:01:02]

This seems to be unused, or am I missing something?

[Primiano Tucci (use gerrit), 2014/07/28 08:24:45]

Ok, we just had a discussion offline.
Can you just add a comment to this variable and _additional_deps, to clarify
that these are used both by the upstream Android.mk and the one in the glue
layer?

+    $(call intermediates-dir-for,APPS,webviewchromium-paks)
+
 android_webview_aapt_flags := --auto-add-overlay
 android_webview_aapt_flags += --custom-package com.android.webview.chromium
 android_webview_aapt_flags += --extra-packages org.chromium.ui
 android_webview_aapt_flags += --extra-packages org.chromium.content
+android_webview_aapt_flags += -0 pak
+
+android_webview_system_pak_targets := \

[Primiano Tucci (use gerrit), 2014/07/28 08:01:02]

Do you plan to remove at this point the similar set of dependencies we have in
the Android tree (in frameworks/webview/chromium/Android.mk)?

[mkosiba (inactive), 2014/07/28 09:36:08]

yes.

+        webviewchromium_pak \
+        webviewchromium_webkit_strings_am.pak \
+        webviewchromium_webkit_strings_ar.pak \
+        webviewchromium_webkit_strings_bg.pak \
+        webviewchromium_webkit_strings_bn.pak \
+        webviewchromium_webkit_strings_ca.pak \
+        webviewchromium_webkit_strings_cs.pak \
+        webviewchromium_webkit_strings_da.pak \
+        webviewchromium_webkit_strings_de.pak \
+        webviewchromium_webkit_strings_el.pak \
+        webviewchromium_webkit_strings_en-GB.pak \
+        webviewchromium_webkit_strings_en-US.pak \
+        webviewchromium_webkit_strings_es-419.pak \
+        webviewchromium_webkit_strings_es.pak \
+        webviewchromium_webkit_strings_et.pak \
+        webviewchromium_webkit_strings_fa.pak \
+        webviewchromium_webkit_strings_fil.pak \
+        webviewchromium_webkit_strings_fi.pak \
+        webviewchromium_webkit_strings_fr.pak \
+        webviewchromium_webkit_strings_gu.pak \
+        webviewchromium_webkit_strings_he.pak \
+        webviewchromium_webkit_strings_hi.pak \
+        webviewchromium_webkit_strings_hr.pak \
+        webviewchromium_webkit_strings_hu.pak \
+        webviewchromium_webkit_strings_id.pak \
+        webviewchromium_webkit_strings_it.pak \
+        webviewchromium_webkit_strings_ja.pak \
+        webviewchromium_webkit_strings_kn.pak \
+        webviewchromium_webkit_strings_ko.pak \
+        webviewchromium_webkit_strings_lt.pak \
+        webviewchromium_webkit_strings_lv.pak \
+        webviewchromium_webkit_strings_ml.pak \
+        webviewchromium_webkit_strings_mr.pak \
+        webviewchromium_webkit_strings_ms.pak \
+        webviewchromium_webkit_strings_nb.pak \
+        webviewchromium_webkit_strings_nl.pak \
+        webviewchromium_webkit_strings_pl.pak \
+        webviewchromium_webkit_strings_pt-BR.pak \
+        webviewchromium_webkit_strings_pt-PT.pak \
+        webviewchromium_webkit_strings_ro.pak \
+        webviewchromium_webkit_strings_ru.pak \
+        webviewchromium_webkit_strings_sk.pak \
+        webviewchromium_webkit_strings_sl.pak \
+        webviewchromium_webkit_strings_sr.pak \
+        webviewchromium_webkit_strings_sv.pak \
+        webviewchromium_webkit_strings_sw.pak \
+        webviewchromium_webkit_strings_ta.pak \
+        webviewchromium_webkit_strings_te.pak \
+        webviewchromium_webkit_strings_th.pak \
+        webviewchromium_webkit_strings_tr.pak \
+        webviewchromium_webkit_strings_uk.pak \
+        webviewchromium_webkit_strings_vi.pak \
+        webviewchromium_webkit_strings_zh-CN.pak \
+        webviewchromium_webkit_strings_zh-TW.pak
+
+android_webview_final_pak_names := \
+  $(patsubst webviewchromium_pak,webviewchromium.pak, \
+    $(patsubst webviewchromium_webkit_strings_%,%, \
+      $(android_webview_system_pak_targets)))
+
+android_webview_intermediates_pak_additional_deps := \

[Primiano Tucci (use gerrit), 2014/07/28 08:01:02]

Is this for enforcing a dependency onto the shortname.pak?
Can you add a comment to explain who will be depending on those?

[mkosiba (inactive), 2014/07/28 09:36:08]

Done.

+  $(foreach name,$(android_webview_final_pak_names), \
+    $(call intermediates-dir-for,APPS,webviewchromium-paks)/$(name))