diff options
| -rw-r--r-- | android_webview/Android.mk | 4 | ||||
| -rw-r--r-- | content/content.gyp | 2 |
2 files changed, 5 insertions, 1 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) diff --git a/content/content.gyp b/content/content.gyp index 913cadd..f295a4f 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -284,7 +284,6 @@ 'dependencies': [ '../base/base.gyp:base', '../net/net.gyp:net', - '../third_party/guava/guava.gyp:guava_javalib', '../ui/ui.gyp:ui_java', 'common_aidl', 'content_common', @@ -301,6 +300,7 @@ ['android_build_type == 0', { 'dependencies': [ '../third_party/eyesfree/eyesfree.gyp:eyesfree_java', + '../third_party/guava/guava.gyp:guava_javalib', ], }], ], |