diff options
| author | newt@chromium.org <newt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 21:03:33 +0000 |
|---|---|---|
| committer | newt@chromium.org <newt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 21:03:33 +0000 |
| commit | 99dfcfcead2123f7ee4fe77242086eca82d38d65 (patch) | |
| tree | 60f8841df84b95b5207d3d4eaad5f79005d79c0e /android_webview/Android.mk | |
| parent | 4df5c3ae61bcf1bac4c65b7898406c15afa5d92a (diff) | |
| download | chromium_src-99dfcfcead2123f7ee4fe77242086eca82d38d65.zip chromium_src-99dfcfcead2123f7ee4fe77242086eca82d38d65.tar.gz chromium_src-99dfcfcead2123f7ee4fe77242086eca82d38d65.tar.bz2 | |
[Android Webview] Add hand-written R.java file to map ui resources.
This provides hand-maintained R.java files to enable Webview to provide
resources used in ui, and fix the current webview ToT build break.
BUG=165751
Review URL: https://codereview.chromium.org/11578034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/Android.mk')
| -rw-r--r-- | android_webview/Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/android_webview/Android.mk b/android_webview/Android.mk index 3d40754..948e1e7 100644 --- a/android_webview/Android.mk +++ b/android_webview/Android.mk @@ -17,7 +17,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, java/src) # resource glue layer LOCAL_SRC_FILES += \ - $(call all-java-files-under, ../content/public/android/java/resource_map) + $(call all-java-files-under, ../content/public/android/java/resource_map) \ + $(call all-java-files-under, ../ui/android/java/resource_map) \ # contentview and its dependencies LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/../content/public/android/java/src |