commit 6e514e822387f14fd07dd4873f56763f14fe715f
author Dmitry Shmidt <dimitrysh@google.com> Fri May 05 17:54:55 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 05 17:54:55 2017 +0000
tree b64010d560fc4707403dcbf5ded87a145fc11ca3
parent 671d1b45a96ea2dee768b48c5c124ffc428ed714
parent 631dc28d2597b5dbb423ef8da6d1b0eeb4fa5a6a

hikey: Compile gralloc only for hikey am: 9e18cca0b5 am: 97314f5587 am: 31102c2d82
am: 631dc28d25

Change-Id: I5f668f90f2c3c2696702daf5055196d978bb9b3c

BoardConfigCommon.mk

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 3b744b3..ce84409 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -46,6 +46,8 @@
 
 BOARD_SEPOLICY_DIRS += device/linaro/hikey/sepolicy
 
+DEVICE_MANIFEST_FILE := device/linaro/hikey/manifest.xml
+
 ifeq ($(HOST_OS), linux)
 ifeq ($(TARGET_SYSTEMIMAGES_USE_SQUASHFS), true)
 BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := squashfs

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 757059d..6f9bd9b 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -85,7 +85,6 @@
         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/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf \
         device/linaro/hikey/audio/audio_policy.conf:system/etc/audio_policy.conf