diff options
| -rw-r--r-- | BoardConfigCommon.mk | 3 | ||||
| -rw-r--r-- | device-common.mk | 19 | ||||
| -rw-r--r-- | manifest.xml | 38 | ||||
| -rw-r--r-- | sepolicy/surfaceflinger.te | 1 | ||||
| -rw-r--r-- | vintf.xml | 8 |
5 files changed, 58 insertions, 11 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index ff7e9cf1..1f002352 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -15,7 +15,6 @@ TARGET_SUPPORTS_64_BIT_APPS := true WITH_DEXPREOPT ?= true USE_OPENGL_RENDERER := true -ANDROID_ENABLE_RENDERSCRIPT := true # BT configs BOARD_HAVE_BLUETOOTH := true @@ -35,6 +34,8 @@ TARGET_USERIMAGES_USE_EXT4 := true BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 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 diff --git a/device-common.mk b/device-common.mk index a8266369..345f88d3 100644 --- a/device-common.mk +++ b/device-common.mk @@ -25,7 +25,6 @@ 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 -PRODUCT_PACKAGES += android.hardware.wifi@1.0-service PRODUCT_PROPERTY_OVERRIDES += wifi.interface=wlan0 \ wifi.supplicant_scan_interval=15 @@ -44,12 +43,20 @@ PRODUCT_PACKAGES += \ android.hardware.broadcastradio@1.0-impl \ android.hardware.soundtrigger@2.0-impl +PRODUCT_PACKAGES += \ + android.hardware.drm@1.0-impl \ + # Set zygote config PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32 PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc PRODUCT_PACKAGES += libGLES_android +# Graphics HAL +PRODUCT_PACKAGES += \ + android.hardware.graphics.allocator@2.0-impl \ + android.hardware.graphics.mapper@2.0-impl + PRODUCT_PACKAGES += TIInit_11.8.32.bts \ wl18xx-fw-4.bin \ wl18xx-conf.bin @@ -64,6 +71,14 @@ endif # PowerHAL PRODUCT_PACKAGES += android.hardware.power@1.0-impl +#GNSS HAL +PRODUCT_PACKAGES += \ + android.hardware.gnss@1.0-impl + +# Keymaster HAL +PRODUCT_PACKAGES += \ + android.hardware.keymaster@3.0-impl + # Copy hardware config file(s) PRODUCT_COPY_FILES += \ device/linaro/hikey/etc/permissions/android.hardware.screen.xml:system/etc/permissions/android.hardware.screen.xml \ @@ -80,7 +95,7 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \ frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \ frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \ - device/linaro/hikey/vintf.xml:vendor/manifest.xml \ + device/linaro/hikey/manifest.xml:system/vendor/manifest.xml \ device/linaro/hikey/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf \ device/linaro/hikey/audio/audio_policy.conf:system/etc/audio_policy.conf diff --git a/manifest.xml b/manifest.xml new file mode 100644 index 00000000..95a1fe72 --- /dev/null +++ b/manifest.xml @@ -0,0 +1,38 @@ +<manifest version="1.0" type="device"> + <hal format="hidl"> + <name>android.hardware.bluetooth</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>IBluetoothHci</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.graphics.allocator</name> + <transport>hwbinder</transport> + <version>2.0</version> + <interface> + <name>IAllocator</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.graphics.mapper</name> + <transport arch="32+64">passthrough</transport> + <version>2.0</version> + <interface> + <name>IMapper</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.wifi.supplicant</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>ISupplicant</name> + <instance>default</instance> + </interface> + </hal> +</manifest> diff --git a/sepolicy/surfaceflinger.te b/sepolicy/surfaceflinger.te new file mode 100644 index 00000000..f53f2b46 --- /dev/null +++ b/sepolicy/surfaceflinger.te @@ -0,0 +1 @@ +hal_server_domain(surfaceflinger, hal_graphics_allocator) diff --git a/vintf.xml b/vintf.xml deleted file mode 100644 index bdd4753b..00000000 --- a/vintf.xml +++ /dev/null @@ -1,8 +0,0 @@ -<manifest version="1.0"> - <hal format="hidl"> - <name>android.hardware.bluetooth</name> - <transport>hwbinder</transport> - <impl level="generic"></impl> - <version>1.0</version> - </hal> -</manifest> |