diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 2a94f3a5ae32..2d0d1f7462c0 100644 --- a/Android.mk +++ b/Android.mk @@ -174,6 +174,9 @@ LOCAL_SRC_FILES += \ core/java/android/hardware/location/IGeofenceHardwareMonitorCallback.aidl \ core/java/android/hardware/soundtrigger/IRecognitionStatusCallback.aidl \ core/java/android/hardware/usb/IUsbManager.aidl \ + core/java/android/midi/IMidiDeviceServer.aidl \ + core/java/android/midi/IMidiListener.aidl \ + core/java/android/midi/IMidiManager.aidl \ core/java/android/net/IConnectivityManager.aidl \ core/java/android/net/IEthernetManager.aidl \ core/java/android/net/IEthernetServiceListener.aidl \ @@ -336,6 +339,12 @@ LOCAL_SRC_FILES += \ 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 +393,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 +415,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 +427,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 +440,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 +450,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 +598,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) |