diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-05-24 18:24:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-24 18:24:53 +0000 |
| commit | 5673ed61727ce1912305e9f4f19f245b43d60256 (patch) | |
| tree | 451ec782955194ec03851ca6eeaf7c1bc556e4dc | |
| parent | cacd04a3a2784c055f3d2847d28922e26768d72f (diff) | |
| parent | 075e7773dc3b7c6c799a0fdf14d2717128c77495 (diff) | |
| download | hikey-5673ed61727ce1912305e9f4f19f245b43d60256.tar.gz | |
Merge "Enable binderized graphics allocator" into oc-dev
| -rw-r--r-- | BoardConfigCommon.mk | 2 | ||||
| -rw-r--r-- | device-common.mk | 7 | ||||
| -rw-r--r-- | manifest.xml | 18 | ||||
| -rw-r--r-- | sepolicy/surfaceflinger.te | 1 |
4 files changed, 27 insertions, 1 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 3b744b32..f9a11922 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -37,6 +37,8 @@ TARGET_USERIMAGES_USE_EXT4 := true BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_USE_PAN_DISPLAY := true +SF_START_GRAPHICS_ALLOCATOR_SERVICE := true + # enable to use the CPUSETS feature ENABLE_CPUSETS := true ENABLE_SCHEDBOOST := true diff --git a/device-common.mk b/device-common.mk index 45501d1d..0dc2ec2a 100644 --- a/device-common.mk +++ b/device-common.mk @@ -53,6 +53,11 @@ PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:root/init.zygote64 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 @@ -84,7 +89,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/manifest.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 index 6d489e94..95a1fe72 100644 --- a/manifest.xml +++ b/manifest.xml @@ -9,6 +9,24 @@ </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> 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) |