commit 27cdb5e25921fce3ee445c97de93465ed1b75041
author Chia-I Wu <olv@google.com> Thu Apr 13 20:00:46 2017 +0000
committer gitbuildkicker <android-build@google.com> Thu Apr 13 13:40:17 2017 -0700
tree 326410a9242960e64098f494e8ea89172c0024ed
parent 8ca43f478d2831e95282379fb2e224fab70fcaa4

Revert "Enable binderized graphics allocator"

This reverts commit 3e4410bfa7ecaeca75ceb5b044583b0be8d617fa.

Bug: 37310828
Change-Id: Ibf81107145b04046f3e515d00255eb2d43ec600c
(cherry picked from commit da0bb58945e983cad8e25f950404be3341c98137)

BoardConfig.mk

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 4c61ccb..67c6392 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -84,7 +84,6 @@
 # Use SurfaceFlinger HWC 2On1 Adaptor
 TARGET_USES_HWC2 := true
 TARGET_USES_HWC2ON1ADAPTER := true
-SF_START_GRAPHICS_ALLOCATOR_SERVICE := true
 VSYNC_EVENT_PHASE_OFFSET_NS := 2000000
 SF_VSYNC_EVENT_PHASE_OFFSET_NS := 6000000
 

device.mk

diff --git a/device.mk b/device.mk
index a40e4d0..9442da0 100644
--- a/device.mk
+++ b/device.mk
@@ -137,10 +137,6 @@
     IMG_graphics \
     hwcomposer.moorefield
 
-PRODUCT_PACKAGES += \
-    android.hardware.graphics.allocator@2.0-impl \
-    android.hardware.graphics.mapper@2.0-impl
-
 # Video
 PRODUCT_COPY_FILES += \
     device/asus/fugu/media_profiles.xml:system/etc/media_profiles.xml \
@@ -342,10 +338,6 @@
 PRODUCT_COPY_FILES += \
     device/asus/fugu/init.fugu.countrycode.sh:system/bin/init.fugu.countrycode.sh
 
-# Vendor Interface Manifest
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/manifest.xml:system/vendor/manifest.xml
-
 # Some CTS tests will be skipped based on what the initial API level that
 # shipped on device was.
 PRODUCT_PROPERTY_OVERRIDES += \

manifest.xml

diff --git a/manifest.xml b/manifest.xml
deleted file mode 100644
index 9fab3aa..0000000
--- a/manifest.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<manifest version="1.0" type="device">
-    <hal format="hidl">
-        <name>android.hardware.graphics.allocator</name>
-        <transport>hwbinder</transport>
-        <impl level="generic"></impl>
-        <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>
-        <impl level="generic"></impl>
-        <version>2.0</version>
-        <interface>
-            <name>IMapper</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</manifest>