diff options
| author | leandrogracia@chromium.org <leandrogracia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 15:07:08 +0000 |
|---|---|---|
| committer | leandrogracia@chromium.org <leandrogracia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 15:07:08 +0000 |
| commit | bc0af55bb4c0804a75c0be3294c98ca29e02edca (patch) | |
| tree | ec3aa602330251b54e78a3f71892307eb24c14bc /android_webview/Android.mk | |
| parent | 979e9d848de8365afb6388d21c1aa0713c93183d (diff) | |
| download | chromium_src-bc0af55bb4c0804a75c0be3294c98ca29e02edca.zip chromium_src-bc0af55bb4c0804a75c0be3294c98ca29e02edca.tar.gz chromium_src-bc0af55bb4c0804a75c0be3294c98ca29e02edca.tar.bz2 | |
[Android Webview] Add hand-written R.java files to map resources without DEPS issues.
This applies the fix proposed by 11308140, but moving the R.java files to folders
where they don't introduce a DEPS violation.
BUG=136704
Review URL: https://codereview.chromium.org/11416130
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169047 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/Android.mk')
| -rw-r--r-- | android_webview/Android.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/android_webview/Android.mk b/android_webview/Android.mk index 6d8c9fc..f868621 100644 --- a/android_webview/Android.mk +++ b/android_webview/Android.mk @@ -15,6 +15,11 @@ LOCAL_MODULE_TAGS := optional 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, ../chrome/android/java/resource_map) \ + # contentview and its dependencies LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/../content/public/android/java/src LOCAL_SRC_FILES += \ |