diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 30 |
1 files changed, 21 insertions, 9 deletions
@@ -199,6 +199,7 @@ LOCAL_SRC_FILES += \ core/java/android/os/INetworkActivityListener.aidl \ core/java/android/os/INetworkManagementService.aidl \ core/java/android/os/IPermissionController.aidl \ + core/java/android/os/IProcessInfoService.aidl \ core/java/android/os/IPowerManager.aidl \ core/java/android/os/IRemoteCallback.aidl \ core/java/android/os/ISchedulingPolicyService.aidl \ @@ -331,11 +332,20 @@ LOCAL_SRC_FILES += \ media/java/android/media/IRemoteVolumeObserver.aidl \ media/java/android/media/IRingtonePlayer.aidl \ media/java/android/media/IVolumeController.aidl \ - media/java/android/media/audiopolicy/IAudioPolicyCallback.aidl \ + media/java/android/media/audiopolicy/IAudioPolicyCallback.aidl \ + media/java/android/media/midi/IMidiDeviceServer.aidl \ + media/java/android/media/midi/IMidiListener.aidl \ + media/java/android/media/midi/IMidiManager.aidl \ media/java/android/media/projection/IMediaProjection.aidl \ media/java/android/media/projection/IMediaProjectionCallback.aidl \ media/java/android/media/projection/IMediaProjectionManager.aidl \ media/java/android/media/projection/IMediaProjectionWatcherCallback.aidl \ + media/java/android/media/routing/IMediaRouteService.aidl \ + media/java/android/media/routing/IMediaRouteClientCallback.aidl \ + media/java/android/media/routing/IMediaRouter.aidl \ + media/java/android/media/routing/IMediaRouterDelegate.aidl \ + media/java/android/media/routing/IMediaRouterRoutingCallback.aidl \ + media/java/android/media/routing/IMediaRouterStateCallback.aidl \ media/java/android/media/session/IActiveSessionsListener.aidl \ media/java/android/media/session/ISessionController.aidl \ media/java/android/media/session/ISessionControllerCallback.aidl \ @@ -384,6 +394,7 @@ LOCAL_SRC_FILES += \ telephony/java/com/android/internal/telephony/ISub.aidl \ telephony/java/com/android/internal/telephony/IMms.aidl \ wifi/java/android/net/wifi/IWifiManager.aidl \ + wifi/java/android/net/wifi/passpoint/IWifiPasspointManager.aidl \ wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \ wifi/java/android/net/wifi/IWifiScanner.aidl \ wifi/java/android/net/wifi/IRttManager.aidl \ @@ -405,6 +416,7 @@ LOCAL_JAVA_LIBRARIES := core-libart conscrypt okhttp core-junit bouncycastle ext LOCAL_MODULE := framework LOCAL_DX_FLAGS := --core-library --multi-dex +LOCAL_JACK_FLAGS := --multi-dex native LOCAL_RMTYPEDEFS := true @@ -416,6 +428,7 @@ framework_module := $(LOCAL_INSTALLED_MODULE) framework_res_R_stamp := \ $(call intermediates-dir-for,APPS,framework-res,,COMMON)/src/R.stamp $(full_classes_compiled_jar): $(framework_res_R_stamp) +$(built_dex_intermediate): $(framework_res_R_stamp) $(framework_module): | $(dir $(framework_module))framework-res.apk @@ -428,6 +441,7 @@ include $(CLEAR_VARS) aidl_files := \ frameworks/base/telephony/java/android/telephony/ServiceState.aidl \ + frameworks/base/telephony/java/android/telephony/SubscriptionInfo.aidl \ frameworks/base/telephony/java/android/telephony/CellInfo.aidl \ frameworks/base/telephony/java/android/telephony/SignalStrength.aidl \ frameworks/base/telephony/java/android/telephony/IccOpenLogicalChannelResponse.aidl \ @@ -437,6 +451,7 @@ aidl_files := \ frameworks/base/location/java/android/location/Criteria.aidl \ frameworks/base/media/java/android/media/MediaMetadata.aidl \ frameworks/base/media/java/android/media/MediaDescription.aidl \ + frameworks/base/media/java/android/media/routing/MediaRouteSelector.aidl \ frameworks/base/media/java/android/media/Rating.aidl \ frameworks/base/media/java/android/media/AudioAttributes.aidl \ frameworks/base/media/java/android/media/AudioFocusInfo.aidl \ @@ -584,7 +599,7 @@ aidl_files := \ frameworks/base/core/java/android/bluetooth/le/ScanFilter.aidl \ frameworks/base/core/java/android/bluetooth/le/ScanResult.aidl \ frameworks/base/core/java/android/bluetooth/BluetoothDevice.aidl \ - frameworks/base/core/java/android/database/CursorWindow.aidl + frameworks/base/core/java/android/database/CursorWindow.aidl \ gen := $(TARGET_OUT_COMMON_INTERMEDIATES)/framework.aidl $(gen): PRIVATE_SRC_FILES := $(aidl_files) @@ -599,7 +614,10 @@ $(gen): $(aidl_files) | $(AIDL) # TODO: deal with com/google/android/googleapps packages_to_document := \ android \ - javax/microedition/khronos + javax/microedition/khronos \ + org/apache/http/conn \ + org/apache/http/params + # Search through the base framework dirs for these packages. # The result will be relative to frameworks/base. @@ -620,7 +638,6 @@ include libcore/Docs.mk include external/junit/Common.mk non_base_dirs := \ - ../../external/apache-http/src/org/apache/http \ ../opt/telephony/src/java/android/provider \ ../opt/telephony/src/java/android/telephony \ ../opt/telephony/src/java/android/telephony/gsm \ @@ -1010,13 +1027,8 @@ 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 \ ext_src_files := $(call all-java-files-under,$(ext_dirs)) |