Fix downstream android webview build

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 25 matching lines @@
     $(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) \
 
 
-# Generated by net.gyp:net_errors_java, net.gyp:certificate_mime_types_java,
-# net.gyp:private_key_types_java and content.gyp:page_transition_types_java
+# 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.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 \
-$(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)
 
 
 ########################################################
 # These packages are the resource paks used by webview.
@@ skipping 321 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