diff options
| author | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-08 22:18:05 +0000 |
|---|---|---|
| committer | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-08 22:18:05 +0000 |
| commit | 89ad59733f5ea7d54f99ca5ce49a716c54486ebc (patch) | |
| tree | e4b17ee25914b9f8d968b363cf262292c382cc51 /android_webview/Android.mk | |
| parent | c4d8d38b76de0209e0065f6e5d74e70530721bd8 (diff) | |
| download | chromium_src-89ad59733f5ea7d54f99ca5ce49a716c54486ebc.zip chromium_src-89ad59733f5ea7d54f99ca5ce49a716c54486ebc.tar.gz chromium_src-89ad59733f5ea7d54f99ca5ce49a716c54486ebc.tar.bz2 | |
Fix downstream android webview build from r175537
guava and jsr305 libraries are already present in the downstream build,
just need to not use the upstream third_party version and modify the
build script
BUG=
TBR=torne@chromium.org
Android only build fix. Ran through android bots with compile step.
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/11822002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175600 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/Android.mk')
| -rw-r--r-- | android_webview/Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/android_webview/Android.mk b/android_webview/Android.mk index 6455be2..c1aa86a 100644 --- a/android_webview/Android.mk +++ b/android_webview/Android.mk @@ -42,6 +42,7 @@ LOCAL_SRC_FILES += \ $(call all-java-files-under, \ ../content/components/navigation_interception/java/src) \ + # Generated by net.gyp:net_errors_java, net.gyp:certificate_mime_types_java, # and content.gyp:page_transition_types_java LOCAL_GENERATED_SOURCES := \ @@ -49,6 +50,9 @@ $(call intermediates-dir-for,GYP,shared)/templates/org.chromium.content.browser/ $(call intermediates-dir-for,GYP,shared)/templates/org.chromium.net/CertificateMimeType.java \ $(call intermediates-dir-for,GYP,shared)/templates/org.chromium.net/NetError.java +# content dependencies on java components that are provided by the system on +# android +LOCAL_STATIC_JAVA_LIBRARIES += jsr305 guava include $(BUILD_STATIC_JAVA_LIBRARY) |