Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / android_webview / build / resources_config.mk

diff --git a/src/android_webview/build/resources_config.mk b/src/android_webview/build/resources_config.mk
index 9795f9b..cf4a3b0 100644 (file)
--- a/src/android_webview/build/resources_config.mk
+++ b/src/android_webview/build/resources_config.mk
@@ -9,18 +9,13 @@
 android_webview_manifest_file := $(call my-dir)/AndroidManifest.xml
 
 # Resources.
-# The res_hack folder is necessary to defeat a build system "optimization" which
-# ends up skipping running aapt if there are no resource files in any of the
-# resources dirs. Unfortunately, because all of our resources are generated at
-# build time and because this check is performed when processing the Makefile
-# it tests positive when building from clean resulting in a build failure.
-# We defeat the optimization by including an empty values.xml file in the list.
 android_webview_resources_dirs := \
-    $(call my-dir)/res_hack \
+    $(call my-dir)/../java/res \
     $(call intermediates-dir-for,GYP,shared)/android_webview_jarjar_content_resources/jarjar_res \
     $(call intermediates-dir-for,GYP,shared)/android_webview_jarjar_ui_resources/jarjar_res \
     $(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
+    $(call intermediates-dir-for,GYP,content_strings_grd)/content_strings_grd/res_grit \
+    $(call intermediates-dir-for,GYP,android_webview_strings_grd)/android_webview_strings_grd/res_grit
 
 android_webview_asset_dirs := \
     $(call intermediates-dir-for,APPS,webviewchromium-paks)