diff options
| -rw-r--r-- | Android.mk | 5 | ||||
| -rw-r--r-- | android_webview/Android.mk | 9 | ||||
| -rw-r--r-- | android_webview/all_webview.gyp | 2 |
3 files changed, 11 insertions, 5 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 diff --git a/android_webview/Android.mk b/android_webview/Android.mk index 56e51e8..ceb7f55 100644 --- a/android_webview/Android.mk +++ b/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 \ diff --git a/android_webview/all_webview.gyp b/android_webview/all_webview.gyp index f5731c2..ef4b9ca 100644 --- a/android_webview/all_webview.gyp +++ b/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 |