diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 16:21:03 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 16:21:03 +0000 |
| commit | 91a8053e29da22e403bf943f7d184a068f51b49b (patch) | |
| tree | 90aef1c855ae60580e451651726c05635671bb82 /Android.mk | |
| parent | 96e8f28bd036b57fea0e79473b76b72ac0bb940e (diff) | |
| download | chromium_src-91a8053e29da22e403bf943f7d184a068f51b49b.zip chromium_src-91a8053e29da22e403bf943f7d184a068f51b49b.tar.gz chromium_src-91a8053e29da22e403bf943f7d184a068f51b49b.tar.bz2 | |
Android WebView: fix build issues and nits.
1) The top-level Android.mk mustn't use my-dir after including another
file as it returns the wrong answer.
2) We need "All" to depend on net_errors_java as it's used by the
Android.mk.
3) Fix nits from previous review of android_webview/Android.mk - make it
clearer that only one of the dependencies is temporary.
BUG=
Review URL: https://codereview.chromium.org/11187052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162716 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -9,6 +9,7 @@ # Android.mk that may exist in the Chromium tree. ifdef CHROME_ANDROID_BUILD_WEBVIEW -include $(call my-dir)/GypAndroid.mk -include $(call my-dir)/android_webview/Android.mk +CHROMIUM_WEBVIEW_DIR := $(call my-dir) +include $(CHROMIUM_WEBVIEW_DIR)/GypAndroid.mk +include $(CHROMIUM_WEBVIEW_DIR)/android_webview/Android.mk endif |