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_webview | |
| 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_webview')
| -rw-r--r-- | android_webview/Android.mk | 9 | ||||
| -rw-r--r-- | android_webview/all_webview.gyp | 2 |
2 files changed, 8 insertions, 3 deletions
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 |