diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 73 |
1 files changed, 35 insertions, 38 deletions
@@ -24,7 +24,7 @@ LOCAL_PATH := $(call my-dir) # Instead, it depends on the R.stamp file, which lists the corresponding # R.java file as a prerequisite. # TODO: find a more appropriate way to do this. -framework-res-source-path := APPS/framework-res_intermediates/src +framework_res_source_path := APPS/framework-res_intermediates/src # the library # ============================================================ @@ -86,7 +86,6 @@ 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/IStatusBar.aidl \ core/java/android/app/IThumbnailReceiver.aidl \ core/java/android/app/ITransientNotification.aidl \ core/java/android/app/IUiModeManager.aidl \ @@ -114,15 +113,11 @@ LOCAL_SRC_FILES += \ core/java/android/content/pm/IPackageMoveObserver.aidl \ core/java/android/content/pm/IPackageStatsObserver.aidl \ core/java/android/database/IContentObserver.aidl \ - core/java/android/hardware/ISensorService.aidl \ core/java/android/net/IConnectivityManager.aidl \ core/java/android/net/INetworkManagementEventObserver.aidl \ core/java/android/net/IThrottleManager.aidl \ core/java/android/os/IHardwareService.aidl \ core/java/android/os/IMessenger.aidl \ - core/java/android/os/storage/IMountService.aidl \ - core/java/android/os/storage/IMountServiceListener.aidl \ - core/java/android/os/storage/IMountShutdownObserver.aidl \ core/java/android/os/INetworkManagementService.aidl \ core/java/android/os/INetStatService.aidl \ core/java/android/os/IPermissionController.aidl \ @@ -155,6 +150,8 @@ LOCAL_SRC_FILES += \ core/java/com/android/internal/backup/IBackupTransport.aidl \ core/java/com/android/internal/os/IDropBoxManagerService.aidl \ core/java/com/android/internal/os/IResultReceiver.aidl \ + core/java/com/android/internal/statusbar/IStatusBar.aidl \ + core/java/com/android/internal/statusbar/IStatusBarService.aidl \ core/java/com/android/internal/view/IInputContext.aidl \ core/java/com/android/internal/view/IInputContextCallback.aidl \ core/java/com/android/internal/view/IInputMethod.aidl \ @@ -182,22 +179,29 @@ LOCAL_SRC_FILES += \ wifi/java/android/net/wifi/IWifiManager.aidl \ telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl \ vpn/java/android/net/vpn/IVpnService.aidl \ + voip/java/android/net/sip/ISipSession.aidl \ + voip/java/android/net/sip/ISipSessionListener.aidl \ + voip/java/android/net/sip/ISipService.aidl +# # FRAMEWORKS_BASE_JAVA_SRC_DIRS comes from build/core/pathmap.mk LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS) LOCAL_INTERMEDIATE_SOURCES := \ - $(framework-res-source-path)/android/R.java \ - $(framework-res-source-path)/android/Manifest.java \ - $(framework-res-source-path)/com/android/internal/R.java + $(framework_res_source_path)/android/R.java \ + $(framework_res_source_path)/android/Manifest.java \ + $(framework_res_source_path)/com/android/internal/R.java LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core ext +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 @@ -298,34 +302,14 @@ fwbase_dirs_to_document += core/config/sdk # Intentionally not included from libcore: # icu openssl suncompat support libcore_to_document := \ - annotation/src/main/java/java \ - archive/src/main/java/java \ - auth/src/main/java/javax \ - awt-kernel/src/main/java/java \ - concurrent/src/main/java \ - crypto/src/main/java/javax \ dalvik/src/main/java/dalvik \ json/src/main/java \ junit/src/main/java \ - logging/src/main/java/java \ luni/src/main/java/java \ - luni-kernel/src/main/java/java \ - math/src/main/java/java \ - nio/src/main/java/java \ - nio_char/src/main/java/java \ - prefs/src/main/java/java \ - regex/src/main/java/java \ - security/src/main/java/java \ - security/src/main/java/javax \ - security-kernel/src/main/java/java \ - sql/src/main/java/java \ - sql/src/main/java/javax \ - text/src/main/java/java \ - x-net/src/main/java/javax \ - xml/src/main/java/javax \ - xml/src/main/java/org/xml/sax \ + luni/src/main/java/javax \ + luni/src/main/java/org/xml/sax \ + luni/src/main/java/org/w3c \ xml/src/main/java/org/xmlpull/v1 \ - xml/src/main/java/org/w3c non_base_dirs := \ ../../external/apache-http/src/org/apache/http @@ -345,15 +329,20 @@ framework_docs_LOCAL_SRC_FILES := \ $(call find-other-java-files, $(dirs_to_document)) \ $(call find-other-html-files, $(html_dirs)) +# This is used by ide.mk as the list of source files that are +# always included. +INTERNAL_SDK_SOURCE_DIRS := $(addprefix $(LOCAL_PATH)/,$(dirs_to_document)) + framework_docs_LOCAL_DROIDDOC_SOURCE_PATH := \ $(FRAMEWORKS_BASE_JAVA_SRC_DIRS) framework_docs_LOCAL_INTERMEDIATE_SOURCES := \ - $(framework-res-source-path)/android/R.java \ - $(framework-res-source-path)/android/Manifest.java \ - $(framework-res-source-path)/com/android/internal/R.java + $(framework_res_source_path)/android/R.java \ + $(framework_res_source_path)/android/Manifest.java \ + $(framework_res_source_path)/com/android/internal/R.java framework_docs_LOCAL_JAVA_LIBRARIES := \ + bouncycastle \ core \ ext \ framework \ @@ -382,6 +371,8 @@ sample_dir := development/samples # (see development/build/sdk.atree) web_docs_sample_code_flags := \ -hdf android.hasSamples 1 \ + -samplecode $(sample_dir)/AccessibilityService \ + resources/samples/AccessibilityService "Accessibility Service" \ -samplecode $(sample_dir)/ApiDemos \ resources/samples/ApiDemos "API Demos" \ -samplecode $(sample_dir)/BackupRestore \ @@ -396,6 +387,8 @@ web_docs_sample_code_flags := \ resources/samples/CubeLiveWallpaper "Live Wallpaper" \ -samplecode $(sample_dir)/Home \ resources/samples/Home "Home" \ + -samplecode $(sample_dir)/HeavyWeight \ + resources/samples/HeavyWeight "Heavy Weight App" \ -samplecode $(sample_dir)/JetBoy \ resources/samples/JetBoy "JetBoy" \ -samplecode $(sample_dir)/LunarLander \ @@ -404,8 +397,8 @@ web_docs_sample_code_flags := \ resources/samples/MultiResolution "Multiple Resolutions" \ -samplecode $(sample_dir)/NotePad \ resources/samples/NotePad "Note Pad" \ - -samplecode $(sample_dir)/SampleSyncAdapter \ - resources/samples/SampleSyncAdapter "Sample Sync Adapter" \ + -samplecode $(sample_dir)/SampleSyncAdapter \ + resources/samples/SampleSyncAdapter "Sample Sync Adapter" \ -samplecode $(sample_dir)/SearchableDictionary \ resources/samples/SearchableDictionary "Searchable Dictionary v2" \ -samplecode $(sample_dir)/Snake \ @@ -577,6 +570,7 @@ include $(BUILD_DROIDDOC) # ============================================================ ext_dirs := \ + ../../external/nist-sip/java \ ../../external/apache-http/src \ ../../external/tagsoup/src @@ -592,6 +586,9 @@ LOCAL_JAVA_LIBRARIES := core LOCAL_MODULE := ext +LOCAL_NO_EMMA_INSTRUMENT := true +LOCAL_NO_EMMA_COMPILE := true + include $(BUILD_JAVA_LIBRARY) |