From 91a8053e29da22e403bf943f7d184a068f51b49b Mon Sep 17 00:00:00 2001 From: "torne@chromium.org" Date: Thu, 18 Oct 2012 16:21:03 +0000 Subject: 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 --- Android.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index cc87c89..5e94479 100644 --- a/Android.mk +++ b/Android.mk @@ -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 -- cgit v1.1