| Index: android_webview/build/resources_config.mk
|
| diff --git a/android_webview/build/resources_config.mk b/android_webview/build/resources_config.mk
|
| index 107928b8a54fdc160a47a48a96e5dbc29d3540e8..cf4a3b06851141add304f8415a68e1db5529ef23 100644
|
| --- a/android_webview/build/resources_config.mk
|
| +++ b/android_webview/build/resources_config.mk
|
| @@ -9,14 +9,7 @@
|
| 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 \
|
|
|