commit 44474ac9cf23098dd5beaa102cf6da584b1572a6
author Dmitry Shmidt <dimitrysh@google.com> Tue Apr 25 22:07:59 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 25 22:07:59 2017 +0000
tree 223f32c6a23b5a3f6ed364ee54bbee5d1a40c0f3
parent 5eb5e9633fec5c44fe4cb72fe9cdb7c3077eaaa4
parent 09b63e3cd8eadb205da4fccb52115b959a8dcc0f

hikey960: Initial release am: 5d080802a7 am: 7fcb933005 am: 11468069fc
am: 09b63e3cd8

Change-Id: I3b649668384dbb2864756163c8301af854a58f5b

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