diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2017-07-13 00:21:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-13 00:21:33 +0000 |
| commit | efbffba8bf3836ef7425147811c784c25392ff8a (patch) | |
| tree | 36d771357ca19206f38218539b8450b5aecc4146 | |
| parent | 8322eded6f565e71568f962f760805d4caddc237 (diff) | |
| parent | ca0ba7bb8773f83e3f8b8277987cb6b3a0c8209b (diff) | |
| download | hikey-efbffba8bf3836ef7425147811c784c25392ff8a.tar.gz | |
Merge "hikey: Add HIKEY_USE_LEGACY_TI_BLUETOOTH build option to transition to common bluetooth HAL" am: c9f62d3f91 am: 8c02f8f9b6
am: ca0ba7bb87
Change-Id: Ibeff866d28ae167bdb305fcfbba276a927447b98
| -rw-r--r-- | BoardConfigCommon.mk | 1 | ||||
| -rw-r--r-- | device-common.mk | 10 | ||||
| -rw-r--r-- | hikey.mk | 11 | ||||
| -rw-r--r-- | hikey960.mk | 2 |
4 files changed, 20 insertions, 4 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 63062c11..003fea7e 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -37,6 +37,7 @@ TARGET_USE_PAN_DISPLAY := true SF_START_GRAPHICS_ALLOCATOR_SERVICE := true BOARD_SEPOLICY_DIRS += device/linaro/hikey/sepolicy +BOARD_SEPOLICY_DIRS += system/bt/vendor_libs/linux/sepolicy DEVICE_MANIFEST_FILE := device/linaro/hikey/manifest.xml DEVICE_MATRIX_FILE := device/linaro/hikey/compatibility_matrix.xml diff --git a/device-common.mk b/device-common.mk index 059139e0..8a365a81 100644 --- a/device-common.mk +++ b/device-common.mk @@ -21,7 +21,7 @@ $(call inherit-product-if-exists, frameworks/native/build/tablet-10in-xhdpi-2048 DEVICE_PACKAGE_OVERLAYS := device/linaro/hikey/overlay # Add openssh support for remote debugging and job submission -PRODUCT_PACKAGES += ssh sftp scp sshd ssh-keygen sshd_config start-ssh uim +PRODUCT_PACKAGES += ssh sftp scp sshd ssh-keygen sshd_config start-ssh # Add wifi-related packages PRODUCT_PACKAGES += libwpa_client wpa_supplicant hostapd wificond wifilogd @@ -40,7 +40,6 @@ PRODUCT_PACKAGES += audio.a2dp.default \ PRODUCT_PACKAGES += \ android.hardware.audio@2.0-impl \ android.hardware.audio.effect@2.0-impl \ - android.hardware.bluetooth@1.0-service.hikey \ android.hardware.broadcastradio@1.0-impl \ android.hardware.soundtrigger@2.0-impl @@ -62,6 +61,13 @@ PRODUCT_PACKAGES += TIInit_11.8.32.bts \ wl18xx-fw-4.bin \ wl18xx-conf.bin + +ifeq ($(HIKEY_USE_LEGACY_TI_BLUETOOTH), true) +PRODUCT_PACKAGES += android.hardware.bluetooth@1.0-service.hikey uim +else +PRODUCT_PACKAGES += android.hardware.bluetooth@1.0-service.btlinux +endif + # PowerHAL PRODUCT_PACKAGES += android.hardware.power@1.0-impl @@ -3,10 +3,17 @@ TARGET_KERNEL_USE=4.9 endif TARGET_PREBUILT_KERNEL := device/linaro/hikey-kernel/Image-dtb-$(TARGET_KERNEL_USE) TARGET_PREBUILT_DTB := device/linaro/hikey-kernel/hi6220-hikey.dtb-$(TARGET_KERNEL_USE) + ifeq ($(TARGET_KERNEL_USE), 3.18) -TARGET_FSTAB := fstab.hikey-$(TARGET_KERNEL_USE) + TARGET_FSTAB := fstab.hikey-$(TARGET_KERNEL_USE) + HIKEY_USE_LEGACY_TI_BLUETOOTH := true else -TARGET_FSTAB := fstab.hikey + ifeq ($(TARGET_KERNEL_USE), 4.4) + HIKEY_USE_LEGACY_TI_BLUETOOTH := true + else + HIKEY_USE_LEGACY_TI_BLUETOOTH := false + endif + TARGET_FSTAB := fstab.hikey endif # diff --git a/hikey960.mk b/hikey960.mk index 90d8784d..986048fc 100644 --- a/hikey960.mk +++ b/hikey960.mk @@ -1,3 +1,5 @@ +HIKEY_USE_LEGACY_TI_BLUETOOTH := true + # # Inherit the full_base and device configurations $(call inherit-product, device/linaro/hikey/hikey960/device-hikey960.mk) |