commit 5673ed61727ce1912305e9f4f19f245b43d60256
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 24 18:24:51 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 24 18:24:53 2017 +0000
tree 451ec782955194ec03851ca6eeaf7c1bc556e4dc
parent cacd04a3a2784c055f3d2847d28922e26768d72f
parent 075e7773dc3b7c6c799a0fdf14d2717128c77495

Merge "Enable binderized graphics allocator" into oc-dev

BoardConfigCommon.mk

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 3b744b3..f9a1192 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -37,6 +37,8 @@
 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

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 45501d1..0dc2ec2 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -53,6 +53,11 @@
 
 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 @@
         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
 

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index 6d489e9..95a1fe7 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>

sepolicy/surfaceflinger.te

diff --git a/sepolicy/surfaceflinger.te b/sepolicy/surfaceflinger.te
new file mode 100644
index 0000000..f53f2b4
--- /dev/null
+++ b/sepolicy/surfaceflinger.te
@@ -0,0 +1 @@
+hal_server_domain(surfaceflinger, hal_graphics_allocator)