OSDN Git Service

am 2685febd: am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb...
[android-x86/frameworks-base.git] / Android.mk
index 954d0a9..2395f2d 100644 (file)
@@ -218,7 +218,6 @@ LOCAL_SRC_FILES += \
        telephony/java/com/android/internal/telephony/ITelephony.aidl \
        telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \
        telephony/java/com/android/internal/telephony/IWapPushManager.aidl \
-       telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl \
        wifi/java/android/net/wifi/IWifiManager.aidl \
        wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \
        voip/java/android/net/sip/ISipSession.aidl \
@@ -660,6 +659,7 @@ LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH)
 LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR)
 LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR)
 LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)
+LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl /intl/
 
 LOCAL_MODULE := online-sdk