diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 108 |
1 files changed, 68 insertions, 40 deletions
diff --git a/Android.mk b/Android.mk index 3fcfea94d666..dc7ebd66271d 100644 --- a/Android.mk +++ b/Android.mk @@ -114,38 +114,40 @@ LOCAL_SRC_FILES += \ core/java/android/app/backup/IRestoreObserver.aidl \ core/java/android/app/backup/IRestoreSession.aidl \ core/java/android/app/backup/ISelectBackupTransportCallback.aidl \ + core/java/android/app/timezone/ICallback.aidl \ + core/java/android/app/timezone/IRulesManager.aidl \ core/java/android/app/usage/ICacheQuotaService.aidl \ core/java/android/app/usage/IStorageStatsManager.aidl \ core/java/android/app/usage/IUsageStatsManager.aidl \ - core/java/android/bluetooth/IBluetooth.aidl \ - core/java/android/bluetooth/IBluetoothA2dp.aidl \ - core/java/android/bluetooth/IBluetoothA2dpSink.aidl \ - core/java/android/bluetooth/IBluetoothAvrcpController.aidl \ - core/java/android/bluetooth/IBluetoothCallback.aidl \ - core/java/android/bluetooth/IBluetoothProfileServiceConnection.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/IBluetoothMap.aidl \ - core/java/android/bluetooth/IBluetoothMapClient.aidl \ - core/java/android/bluetooth/IBluetoothPbap.aidl \ - core/java/android/bluetooth/IBluetoothPbapClient.aidl \ - core/java/android/bluetooth/IBluetoothSap.aidl \ - core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl \ - core/java/android/bluetooth/IBluetoothHeadsetClient.aidl \ - core/java/android/bluetooth/IBluetoothInputHost.aidl \ - core/java/android/bluetooth/IBluetoothHidDeviceCallback.aidl \ - core/java/android/bluetooth/IBluetoothGatt.aidl \ - core/java/android/bluetooth/IBluetoothGattCallback.aidl \ - core/java/android/bluetooth/IBluetoothGattServerCallback.aidl \ - core/java/android/bluetooth/le/IAdvertisingSetCallback.aidl \ - core/java/android/bluetooth/le/IPeriodicAdvertisingCallback.aidl \ - core/java/android/bluetooth/le/IScannerCallback.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetooth.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothA2dp.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothA2dpSink.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothAvrcpController.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothCallback.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothProfileServiceConnection.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothHeadset.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothHeadsetPhone.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothHealth.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothHealthCallback.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothInputDevice.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothPan.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothManager.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothManagerCallback.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothMap.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothMapClient.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothPbap.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothPbapClient.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothSap.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothStateChangeCallback.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothHeadsetClient.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothInputHost.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothHidDeviceCallback.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothGatt.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothGattCallback.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothGattServerCallback.aidl \ + ../../system/bt/binder/android/bluetooth/le/IAdvertisingSetCallback.aidl \ + ../../system/bt/binder/android/bluetooth/le/IPeriodicAdvertisingCallback.aidl \ + ../../system/bt/binder/android/bluetooth/le/IScannerCallback.aidl \ core/java/android/content/IClipboard.aidl \ core/java/android/content/IContentService.aidl \ core/java/android/content/IIntentReceiver.aidl \ @@ -503,8 +505,8 @@ LOCAL_SRC_FILES += \ telecomm/java/com/android/internal/telecom/ITelecomService.aidl \ telecomm/java/com/android/internal/telecom/RemoteServiceCallback.aidl \ telephony/java/android/telephony/mbms/IMbmsDownloadManagerCallback.aidl \ - telephony/java/android/telephony/mbms/IMbmsStreamingManagerCallback.aidl \ - telephony/java/android/telephony/mbms/IDownloadCallback.aidl \ + telephony/java/android/telephony/mbms/IMbmsStreamingSessionCallback.aidl \ + telephony/java/android/telephony/mbms/IDownloadStateCallback.aidl \ telephony/java/android/telephony/mbms/IStreamingServiceCallback.aidl \ telephony/java/android/telephony/mbms/vendor/IMbmsDownloadService.aidl \ telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl \ @@ -578,7 +580,8 @@ LOCAL_AIDL_INCLUDES += \ frameworks/av/camera/aidl \ frameworks/av/drm/libmediadrm/aidl \ frameworks/native/aidl/gui \ - system/netd/server/binder + system/netd/server/binder \ + system/bt/binder LOCAL_INTERMEDIATE_SOURCES := \ $(framework_res_source_path)/android/R.java \ @@ -630,6 +633,32 @@ $(framework_module): | $(dir $(framework_module))framework-res.apk framework_built := $(call java-lib-deps,framework) +# HwBinder +# ======================================================= +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + core/java/android/os/HidlSupport.java \ + core/java/android/annotation/NonNull.java \ + core/java/android/os/HwBinder.java \ + core/java/android/os/HwBlob.java \ + core/java/android/os/HwParcel.java \ + core/java/android/os/IHwBinder.java \ + core/java/android/os/IHwInterface.java \ + core/java/android/os/DeadObjectException.java \ + core/java/android/os/DeadSystemException.java \ + core/java/android/os/RemoteException.java \ + core/java/android/util/AndroidException.java \ + +LOCAL_NO_STANDARD_LIBRARIES := true +LOCAL_JAVA_LIBRARIES := core-oj core-libart +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := hwbinder + +LOCAL_DX_FLAGS := --core-library +LOCAL_UNINSTALLABLE_MODULE := true +include $(BUILD_JAVA_LIBRARY) + # Copy AIDL files to be preprocessed and included in the SDK, # specified relative to the root of the build tree. # ============================================================ @@ -637,7 +666,6 @@ include $(CLEAR_VARS) aidl_files := \ frameworks/base/telephony/java/android/telephony/mbms/DownloadRequest.aidl \ - frameworks/base/telephony/java/android/telephony/mbms/DownloadStatus.aidl \ frameworks/base/telephony/java/android/telephony/mbms/FileInfo.aidl \ frameworks/base/telephony/java/android/telephony/mbms/FileServiceInfo.aidl \ frameworks/base/telephony/java/android/telephony/mbms/ServiceInfo.aidl \ @@ -830,16 +858,16 @@ aidl_files := \ frameworks/base/core/java/android/nfc/Tag.aidl \ frameworks/base/core/java/android/nfc/NdefRecord.aidl \ frameworks/base/core/java/android/nfc/NdefMessage.aidl \ - frameworks/base/core/java/android/bluetooth/BluetoothHealthAppConfiguration.aidl \ - frameworks/base/core/java/android/bluetooth/le/AdvertiseSettings.aidl \ - frameworks/base/core/java/android/bluetooth/le/ScanSettings.aidl \ - frameworks/base/core/java/android/bluetooth/le/AdvertiseData.aidl \ - 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/service/quicksettings/Tile.aidl \ frameworks/native/aidl/binder/android/os/PersistableBundle.aidl \ + system/bt/binder/android/bluetooth/BluetoothHealthAppConfiguration.aidl \ + system/bt/binder/android/bluetooth/le/AdvertiseSettings.aidl \ + system/bt/binder/android/bluetooth/le/ScanSettings.aidl \ + system/bt/binder/android/bluetooth/le/AdvertiseData.aidl \ + system/bt/binder/android/bluetooth/le/ScanFilter.aidl \ + system/bt/binder/android/bluetooth/le/ScanResult.aidl \ + system/bt/binder/android/bluetooth/BluetoothDevice.aidl \ system/netd/server/binder/android/net/UidRange.aidl \ frameworks/base/telephony/java/android/telephony/PcoData.aidl \ |