diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-07-13 07:28:14 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-07-13 07:28:14 +0000 |
commit | 3eda20d3eacd65a28ccd2b8d93f60dfeac9ab9fd (patch) | |
tree | 36d771357ca19206f38218539b8450b5aecc4146 | |
parent | bd39c52b3860cebe60612d4e8c518b8a03a63ea1 (diff) | |
parent | 11f90ca33bc4d627d7ccc8b5f63adc9ef8ca451c (diff) | |
download | hikey-3eda20d3eacd65a28ccd2b8d93f60dfeac9ab9fd.tar.gz |
release-request-d3de000d-8c5a-4c3c-b63e-e989421d7762-for-git_oc-mr1-release-4176727 snap-temp-L91200000081901352
Change-Id: Ia4c8f9aede17767bbadffed9d4d6771aaba81c50
-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 | ||||
-rw-r--r-- | installer/hikey960/fastboot.img | bin | 3426304 -> 3426304 bytes | |||
-rw-r--r-- | installer/hikey960/sec_xloader.img | bin | 154752 -> 154752 bytes |
6 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) diff --git a/installer/hikey960/fastboot.img b/installer/hikey960/fastboot.img Binary files differindex 3dcbc2a4..72cbf90f 100644 --- a/installer/hikey960/fastboot.img +++ b/installer/hikey960/fastboot.img diff --git a/installer/hikey960/sec_xloader.img b/installer/hikey960/sec_xloader.img Binary files differindex 84fa6246..451f8f68 100644 --- a/installer/hikey960/sec_xloader.img +++ b/installer/hikey960/sec_xloader.img |