Make the build control what library(/ies) to load

android_webview/Android.mk

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This package provides the parts of the WebView java code which live in the
 # Chromium tree. This is built into a static library so it can be used by the
 # glue layer in the Android tree.
 
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
@@ skipping 24 matching lines @@
     $(call all-java-files-under, ../third_party/eyesfree/src/android/java/src) \
     $(call all-Iaidl-files-under, ../third_party/eyesfree/src/android/java/src)
 
 # browser components
 LOCAL_SRC_FILES += \
     $(call all-java-files-under, \
         ../components/web_contents_delegate_android/android/java/src) \
     $(call all-java-files-under, \
         ../components/navigation_interception/android/java/src) \
 
+# This directory includes .java files that are generated by the normal gyp build, but are checked in
+# for the Android build.
+# TODO(torne, cjhopman): Consider removing this.
+LOCAL_SRC_FILES += \
+    $(call all-java-files-under, java/generated_src)
 
 # Java files generated from .template rules. This list should match list of java dependencies in
 # android_webview/all_webview.gyp
 LOCAL_GENERATED_SOURCES := \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/PageTransitionTypes.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/common/ResultCodes.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertificateMimeType.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertVerifyResultAndroid.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/NetError.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/PrivateKeyType.java \
@@ skipping 324 matching lines @@
 LOCAL_MODULE := webviewchromium_webkit_strings_zh-CN.pak
 LOCAL_MODULE_STEM := zh-CN
 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-CN.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_zh-TW.pak
 LOCAL_MODULE_STEM := zh-TW
 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-TW.pak
 include $(LOCAL_PATH)/webview_pak.mk