diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 58 |
1 files changed, 33 insertions, 25 deletions
diff --git a/Android.mk b/Android.mk index e299250380e2..07b76d85e872 100644 --- a/Android.mk +++ b/Android.mk @@ -100,9 +100,11 @@ LOCAL_SRC_FILES += \ core/java/android/bluetooth/IBluetoothCallback.aidl \ core/java/android/bluetooth/IBluetoothHeadset.aidl \ core/java/android/bluetooth/IBluetoothPbap.aidl \ + core/java/android/content/IClipboard.aidl \ core/java/android/content/IContentService.aidl \ core/java/android/content/IIntentReceiver.aidl \ core/java/android/content/IIntentSender.aidl \ + core/java/android/content/IOnPrimaryClipChangedListener.aidl \ core/java/android/content/ISyncAdapter.aidl \ core/java/android/content/ISyncContext.aidl \ core/java/android/content/ISyncStatusObserver.aidl \ @@ -132,12 +134,9 @@ LOCAL_SRC_FILES += \ core/java/android/os/IPowerManager.aidl \ core/java/android/os/IRemoteCallback.aidl \ core/java/android/os/IVibratorService.aidl \ - core/java/android/service/urlrenderer/IUrlRendererService.aidl \ - core/java/android/service/urlrenderer/IUrlRendererCallback.aidl \ core/java/android/service/wallpaper/IWallpaperConnection.aidl \ core/java/android/service/wallpaper/IWallpaperEngine.aidl \ core/java/android/service/wallpaper/IWallpaperService.aidl \ - core/java/android/text/IClipboard.aidl \ core/java/android/view/accessibility/IAccessibilityManager.aidl \ core/java/android/view/accessibility/IAccessibilityManagerClient.aidl \ core/java/android/view/IApplicationToken.aidl \ @@ -167,6 +166,9 @@ LOCAL_SRC_FILES += \ core/java/com/android/internal/view/IInputMethodClient.aidl \ core/java/com/android/internal/view/IInputMethodManager.aidl \ core/java/com/android/internal/view/IInputMethodSession.aidl \ + core/java/com/android/internal/widget/IRemoteViewsFactory.aidl \ + location/java/android/location/ICountryDetector.aidl \ + location/java/android/location/ICountryListener.aidl \ location/java/android/location/IGeocodeProvider.aidl \ location/java/android/location/IGpsStatusListener.aidl \ location/java/android/location/IGpsStatusProvider.aidl \ @@ -359,7 +361,7 @@ framework_docs_LOCAL_JAVA_LIBRARIES := \ framework \ framework_docs_LOCAL_MODULE_CLASS := JAVA_LIBRARIES -framework_docs_LOCAL_DROIDDOC_HTML_DIR := $(LOCAL_PATH)/docs/html $(OUT_DOCS)/gen +framework_docs_LOCAL_DROIDDOC_HTML_DIR := docs/html # The since flag (-since N.xml API_LEVEL) is used to add API Level information # to the reference documentation. Must be in order of oldest to newest. framework_docs_LOCAL_DROIDDOC_OPTIONS := \ @@ -373,8 +375,9 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ -since ./frameworks/base/api/7.xml 7 \ -since ./frameworks/base/api/8.xml 8 \ -since ./frameworks/base/api/9.xml 9 \ - -werror -hide 13 \ - -overview $(LOCAL_PATH)/core/java/overview.html + -since ./frameworks/base/api/current.xml HC \ + -werror -hide 113 \ + -overview $(LOCAL_PATH)/core/java/overview.html framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:= $(call intermediates-dir-for,JAVA_LIBRARIES,framework) @@ -437,20 +440,20 @@ web_docs_sample_code_flags := \ resources/samples/WiktionarySimple "Wiktionary (Simplified)" \ -samplecode $(sample_dir)/VoiceRecognitionService \ resources/samples/VoiceRecognitionService "Voice Recognition Service" \ - -samplecode $(sample_dir)/NFCDemo \ - resources/samples/NFCDemo "NFC Demo" + -samplecode $(sample_dir)/XmlAdapters \ + resources/samples/XmlAdapters "XML Adapters" ## SDK version identifiers used in the published docs # major[.minor] version for current SDK. (full releases only) framework_docs_SDK_VERSION:=2.3 # release version (ie "Release x") (full releases only) framework_docs_SDK_REL_ID:=1 - # flag to build offline docs for a preview release -framework_docs_SDK_PREVIEW:=0 framework_docs_LOCAL_DROIDDOC_OPTIONS += \ -hdf sdk.version $(framework_docs_SDK_VERSION) \ - -hdf sdk.rel.id $(framework_docs_SDK_REL_ID) + -hdf sdk.rel.id $(framework_docs_SDK_REL_ID) \ + -hdf sdk.preview true \ + -hdf sdk.preview.version Honeycomb # ==== the api stubs and current.xml =========================== include $(CLEAR_VARS) @@ -473,11 +476,13 @@ LOCAL_DROIDDOC_OPTIONS:=\ -nodocs LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk -LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk + +LOCAL_UNINSTALLABLE_MODULE := true include $(BUILD_DROIDDOC) -$(full_target): $(framework_built) +# $(gen), i.e. framework.aidl, is also needed while building against the current stub. +$(full_target): $(framework_built) $(gen) $(INTERNAL_PLATFORM_API_FILE): $(full_target) $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_API_FILE)) @@ -500,7 +505,8 @@ LOCAL_DROIDDOC_OPTIONS:=\ -parsecomments LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk -LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk + +LOCAL_UNINSTALLABLE_MODULE := true include $(BUILD_DROIDDOC) @@ -533,12 +539,8 @@ LOCAL_DROIDDOC_OPTIONS:=\ -sdkvalues $(OUT_DOCS) \ -hdf android.whichdoc offline -ifeq ($(framework_docs_SDK_PREVIEW),true) - LOCAL_DROIDDOC_OPTIONS += -hdf sdk.preview true -endif LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk -LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk include $(BUILD_DROIDDOC) @@ -551,7 +553,6 @@ $(static_doc_index_redirect): \ $(full_target): $(static_doc_index_redirect) $(full_target): $(framework_built) - # ==== docs for the web (on the google app engine server) ======================= include $(CLEAR_VARS) @@ -575,12 +576,11 @@ LOCAL_DROIDDOC_OPTIONS:= \ -hdf template.showLanguageMenu true LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk -LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk include $(BUILD_DROIDDOC) # explicitly specify that online-sdk depends on framework-res and any generated docs -$(full_target): framework-res-package-target $(ALL_GENERATED_DOCS) +$(full_target): framework-res-package-target # ==== docs that have all of the stuff that's @hidden ======================= include $(CLEAR_VARS) @@ -597,24 +597,31 @@ LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES) LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=\ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ - -title "Android SDK - Including hidden APIs." -# -hidden + -title "Android SDK - Including hidden APIs." +# -hidden LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk -LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk include $(BUILD_DROIDDOC) # Build ext.jar # ============================================================ +# NOTICE notes for non-obvious sections +# apache-http - covered by the Apache Commons section. + + ext_dirs := \ ../../external/nist-sip/java \ ../../external/apache-http/src \ - ../../external/tagsoup/src + ../../external/tagsoup/src \ + ../../external/libphonenumber/java/src ext_src_files := $(call all-java-files-under,$(ext_dirs)) +ext_res_dirs := \ + ../../external/libphonenumber/java/src + # ==== the library ========================================= include $(CLEAR_VARS) @@ -622,6 +629,7 @@ LOCAL_SRC_FILES := $(ext_src_files) LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVA_LIBRARIES := core +LOCAL_JAVA_RESOURCE_DIRS := $(ext_res_dirs) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := ext |