[android_webview] Enable new android_webview resource target on Android.

This enables compiling the android_webview_java target against R.java
files generated by aapt (and not against the static resource map files).

BUG=387155
TEST=compile on android_aosp bot
Change only relevant to android_aosp, builds fine there.
NOTRY=true

Review URL: https://codereview.chromium.org/350173004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279402 0039d316-1c4b-4281-b951-d872f2087c98

android_webview/Android.mk

@@ -13,6 +13,8 @@ LOCAL_MODULE := android_webview_java
 
 LOCAL_MODULE_TAGS := optional
 
+LOCAL_ADDITIONAL_DEPENDENCIES := android_webview_java_with_new_resources
+
 include $(LOCAL_PATH)/java_library_common.mk
 # resource glue layer
 LOCAL_SRC_FILES += \

android_webview/build/res_hack/values/values.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Chromium Authors. All rights reserved.
+
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file.
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Do not put resources here. This file is intentionally empty.
+         It's only to work around a build system issue. -->
+</resources>

android_webview/build/resources_config.mk

@@ -4,8 +4,15 @@
 
 android_webview_manifest_file := $(call my-dir)/AndroidManifest.xml
 
-# resources
+# 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 intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/android_webview_jarjar_content_resources/jarjar_res \
     $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/android_webview_jarjar_ui_resources/jarjar_res \
     $(call intermediates-dir-for,GYP,ui_strings_grd,,,$(TARGET_2ND_ARCH))/ui_strings_grd/res_grit \