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

@@ -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

android_webview/Android.mk

@@ -15,7 +15,7 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(call all-java-files-under, java/src)
 
-# contentview
+# contentview and its dependencies
 LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/../content/public/android/java/src
 LOCAL_SRC_FILES += \
     $(call all-java-files-under, ../content/public/android/java/src) \
@@ -26,12 +26,15 @@ LOCAL_SRC_FILES += \
     $(call all-java-files-under, ../net/android/java/src) \
     $(call all-java-files-under, ../ui/android/java/src) \
 
+# browser components
+LOCAL_SRC_FILES += \
+    $(call all-java-files-under, ../chrome/browser/component/web_contents_delegate_android/java/src) \
+    $(call all-java-files-under, ../chrome/browser/component/navigation_interception/java/src) \
+
 # TODO(mkosiba): Remove chromium_chrome dep once required browser
 # components are in (replace it with contentview).
 LOCAL_SRC_FILES += \
     $(call all-java-files-under, ../chrome/android/java/src) \
-    $(call all-java-files-under, ../chrome/browser/component/web_contents_delegate_android/java/src) \
-    $(call all-java-files-under, ../chrome/browser/component/navigation_interception/java/src) \
 
 # This file is generated by net.gyp:net_errors_java
 LOCAL_GENERATED_SOURCES := $(call intermediates-dir-for,GYP,shared)/net/template/NetError.java \

android_webview/all_webview.gyp

@@ -13,6 +13,8 @@
       'type': 'none',
       'dependencies': [
         'android_webview.gyp:libwebview',
+        # Needed by android_webview_java
+        '../net/net.gyp:net_errors_java',
       ],
     }, # target_name: All
   ],  # targets