am 2685febd: am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb...

[android-x86/frameworks-base.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index b9157fe..2395f2d 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -74,10 +74,12 @@ LOCAL_SRC_FILES += \
        core/java/android/app/ISearchManager.aidl \
        core/java/android/app/ISearchManagerCallback.aidl \
        core/java/android/app/IServiceConnection.aidl \
+       core/java/android/app/IStopUserCallback.aidl \
        core/java/android/app/IThumbnailReceiver.aidl \
        core/java/android/app/IThumbnailRetriever.aidl \
        core/java/android/app/ITransientNotification.aidl \
        core/java/android/app/IUiModeManager.aidl \
+    core/java/android/app/IUserSwitchObserver.aidl \
        core/java/android/app/IWallpaperManager.aidl \
        core/java/android/app/IWallpaperManagerCallback.aidl \
        core/java/android/app/admin/IDevicePolicyManager.aidl \
@@ -89,7 +91,13 @@ LOCAL_SRC_FILES += \
        core/java/android/bluetooth/IBluetoothA2dp.aidl \
        core/java/android/bluetooth/IBluetoothCallback.aidl \
        core/java/android/bluetooth/IBluetoothHeadset.aidl \
+       core/java/android/bluetooth/IBluetoothHeadsetPhone.aidl \
+       core/java/android/bluetooth/IBluetoothHealth.aidl \
        core/java/android/bluetooth/IBluetoothHealthCallback.aidl \
+       core/java/android/bluetooth/IBluetoothInputDevice.aidl \
+       core/java/android/bluetooth/IBluetoothPan.aidl \
+       core/java/android/bluetooth/IBluetoothManager.aidl \
+       core/java/android/bluetooth/IBluetoothManagerCallback.aidl \
        core/java/android/bluetooth/IBluetoothPbap.aidl \
        core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl \
        core/java/android/content/IClipboard.aidl \
@@ -108,6 +116,8 @@ LOCAL_SRC_FILES += \
        core/java/android/content/pm/IPackageStatsObserver.aidl \
        core/java/android/database/IContentObserver.aidl \
        core/java/android/hardware/ISerialManager.aidl \
+       core/java/android/hardware/display/IDisplayManager.aidl \
+       core/java/android/hardware/display/IDisplayManagerCallback.aidl \
        core/java/android/hardware/input/IInputManager.aidl \
        core/java/android/hardware/input/IInputDevicesChangedListener.aidl \
        core/java/android/hardware/usb/IUsbManager.aidl \
@@ -132,6 +142,7 @@ LOCAL_SRC_FILES += \
        core/java/android/os/IRemoteCallback.aidl \
        core/java/android/os/ISchedulingPolicyService.aidl \
        core/java/android/os/IUpdateLock.aidl \
+        core/java/android/os/IUserManager.aidl \
        core/java/android/os/IVibratorService.aidl \
        core/java/android/service/dreams/IDreamManager.aidl \
        core/java/android/service/dreams/IDreamService.aidl \
@@ -143,6 +154,9 @@ LOCAL_SRC_FILES += \
        core/java/android/view/accessibility/IAccessibilityManager.aidl \
        core/java/android/view/accessibility/IAccessibilityManagerClient.aidl \
        core/java/android/view/IApplicationToken.aidl \
+       core/java/android/view/IDisplayContentChangeListener.aidl \
+       core/java/android/view/IInputFilter.aidl \
+       core/java/android/view/IInputFilterHost.aidl \
        core/java/android/view/IOnKeyguardExitResult.aidl \
        core/java/android/view/IRotationWatcher.aidl \
        core/java/android/view/IWindow.aidl \
@@ -188,8 +202,8 @@ LOCAL_SRC_FILES += \
        location/java/android/location/IGpsStatusProvider.aidl \
        location/java/android/location/ILocationListener.aidl \
        location/java/android/location/ILocationManager.aidl \
-       location/java/android/location/ILocationProvider.aidl \
        location/java/android/location/INetInitiatedListener.aidl \
+       location/java/com/android/internal/location/ILocationProvider.aidl \
        media/java/android/media/IAudioService.aidl \
        media/java/android/media/IAudioFocusDispatcher.aidl \
        media/java/android/media/IAudioRoutesObserver.aidl \
@@ -204,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 \
@@ -227,9 +240,6 @@ LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit ext
 LOCAL_MODULE := framework
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 
-LOCAL_NO_EMMA_INSTRUMENT := true
-LOCAL_NO_EMMA_COMPILE := true
-
 # List of classes and interfaces which should be loaded by the Zygote.
 LOCAL_JAVA_RESOURCE_FILES += $(LOCAL_PATH)/preloaded-classes
 
@@ -297,7 +307,11 @@ aidl_files := \
        frameworks/base/graphics/java/android/graphics/Rect.aidl \
        frameworks/base/graphics/java/android/graphics/Region.aidl \
        frameworks/base/location/java/android/location/Criteria.aidl \
+       frameworks/base/location/java/android/location/Geofence.aidl \
        frameworks/base/location/java/android/location/Location.aidl \
+       frameworks/base/location/java/android/location/LocationRequest.aidl \
+       frameworks/base/location/java/com/android/internal/location/ProviderProperties.aidl \
+       frameworks/base/location/java/com/android/internal/location/ProviderRequest.aidl \
        frameworks/base/telephony/java/android/telephony/ServiceState.aidl \
        frameworks/base/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl \
        frameworks/base/telephony/java/com/android/internal/telephony/ITelephony.aidl \
@@ -414,6 +428,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \
     -since ./frameworks/base/api/14.txt 14 \
     -since ./frameworks/base/api/15.txt 15 \
     -since ./frameworks/base/api/16.txt 16 \
+    -since ./frameworks/base/api/17.txt 17 \
                -werror -hide 113 \
                -overview $(LOCAL_PATH)/core/java/overview.html
 
@@ -426,7 +441,8 @@ sample_dir := development/samples
 
 # the list here should match the list of samples included in the sdk samples package
 # (see development/build/sdk.atree)
-web_docs_sample_code_flags := \
+# remove htmlified samples for now -- samples are still available through the SDK
+# web_docs_sample_code_flags := \
                -hdf android.hasSamples 1 \
                -samplecode $(sample_dir)/AccelerometerPlay \
                            resources/samples/AccelerometerPlay "Accelerometer Play" \
@@ -524,7 +540,7 @@ web_docs_sample_code_flags := \
 
 ## SDK version identifiers used in the published docs
   # major[.minor] version for current SDK. (full releases only)
-framework_docs_SDK_VERSION:=4.1
+framework_docs_SDK_VERSION:=4.2
   # release version (ie "Release x")  (full releases only)
 framework_docs_SDK_REL_ID:=1
 
@@ -631,7 +647,7 @@ $(static_doc_index_redirect): \
 $(full_target): $(static_doc_index_redirect)
 $(full_target): $(framework_built)
 
-# ==== docs for the web (on the google app engine server) =======================
+# ==== docs for the web (on the androiddevdocs app engine server) =======================
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)
@@ -643,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
 
@@ -660,6 +677,37 @@ include $(BUILD_DROIDDOC)
 # explicitly specify that online-sdk depends on framework-res and any generated docs
 $(full_target): framework-res-package-target
 
+# ==== docs for the web (on the devsite app engine server) =======================
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)
+LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)
+LOCAL_STATIC_JAVA_LIBRARIES:=$(framework_docs_LOCAL_STATIC_JAVA_LIBRARIES)
+LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)
+LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)
+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)
+# specify a second html input dir and an output path relative to OUT_DIR)
+LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl /
+
+LOCAL_MODULE := ds
+
+LOCAL_DROIDDOC_OPTIONS:= \
+               $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
+               $(web_docs_sample_code_flags) \
+               -devsite \
+               -toroot / \
+               -hdf android.whichdoc online \
+               -hdf devsite true
+
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
+
+include $(BUILD_DROIDDOC)
+
+# explicitly specify that ds depends on framework-res and any generated docs
+$(full_target): framework-res-package-target
+
 # ==== docs that have all of the stuff that's @hidden =======================
 include $(CLEAR_VARS)
 
@@ -711,9 +759,6 @@ LOCAL_JAVA_RESOURCE_DIRS := $(ext_res_dirs)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := ext
 
-LOCAL_NO_EMMA_INSTRUMENT := true
-LOCAL_NO_EMMA_COMPILE := true
-
 LOCAL_DX_FLAGS := --core-library
 
 include $(BUILD_JAVA_LIBRARY)