diff options
| author | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-11 20:00:32 +0000 |
|---|---|---|
| committer | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-11 20:00:32 +0000 |
| commit | 0101fd51c082e9061d7e1e0c6d43a92053276f28 (patch) | |
| tree | cf1f3e1a7356b29f654bbc932cab0e070dcbfff5 | |
| parent | c430b1af99e20e1f36ff10b0960ab5b70a280864 (diff) | |
| download | chromium_src-0101fd51c082e9061d7e1e0c6d43a92053276f28.zip chromium_src-0101fd51c082e9061d7e1e0c6d43a92053276f28.tar.gz chromium_src-0101fd51c082e9061d7e1e0c6d43a92053276f28.tar.bz2 | |
Fix android build issue.
r172350 added a new generated java file.
dcommit because these files do not affect chromium builds
BUG=
Review URL: https://codereview.chromium.org/11537015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172381 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | android_webview/Android.mk | 4 | ||||
| -rw-r--r-- | android_webview/all_webview.gyp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/android_webview/Android.mk b/android_webview/Android.mk index 96dd2c901..3d40754 100644 --- a/android_webview/Android.mk +++ b/android_webview/Android.mk @@ -37,10 +37,12 @@ LOCAL_SRC_FILES += \ $(call all-java-files-under, \ ../content/components/navigation_interception/java/src) \ -# This file is generated by net.gyp:net_errors_java +# Generated by net.gyp:net_errors_java and certificate_mime_types_java. LOCAL_GENERATED_SOURCES := \ +$(call intermediates-dir-for,GYP,shared)/templates/org.chromium.net/CertificateMimeType.java \ $(call intermediates-dir-for,GYP,shared)/templates/org.chromium.net/NetError.java + include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/android_webview/all_webview.gyp b/android_webview/all_webview.gyp index 0eaf5bc..6bc13ad 100644 --- a/android_webview/all_webview.gyp +++ b/android_webview/all_webview.gyp @@ -13,7 +13,9 @@ 'type': 'none', 'dependencies': [ 'android_webview.gyp:libwebviewchromium', + # Needed by android_webview_java + '../net/net.gyp:certificate_mime_types_java', '../net/net.gyp:net_errors_java', ], }, # target_name: All |