Fix android_aosp after r251461

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)
 
 LOCAL_MODULE := android_webview_java
 
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(call all-java-files-under, java/src)
 
 # resource glue layer
 LOCAL_SRC_FILES += \
     $(call all-java-files-under, ../content/public/android/java/resource_map) \
     $(call all-java-files-under, ../ui/android/java/resource_map) \
 
 # contentview and its dependencies
 LOCAL_AIDL_INCLUDES := \
     $(LOCAL_PATH)/../content/public/android/java/src \
+    $(LOCAL_PATH)/../net/android/java/src \
     $(LOCAL_PATH)/../third_party/eyesfree/src/android/java/src
 LOCAL_SRC_FILES += \
     $(call all-java-files-under, ../content/public/android/java/src) \
     ../content/public/android/java/src/org/chromium/content/common/IChildProcessCallback.aidl \
     ../content/public/android/java/src/org/chromium/content/common/IChildProcessService.aidl \
+    ../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStoreCallbacks.aidl \
+    ../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStore.aidl \
     $(call all-java-files-under, ../base/android/java/src) \
     $(call all-java-files-under, ../media/base/android/java/src) \
     $(call all-java-files-under, ../net/android/java/src) \
     $(call all-java-files-under, ../ui/android/java/src) \
     $(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, \
@@ skipping 350 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