commit 5eb5e9633fec5c44fe4cb72fe9cdb7c3077eaaa4
author Michael Schwartz <schwartzmi@google.com> Thu Apr 06 13:37:15 2017 -0700
committer Michael Schwartz <schwartzmi@google.com> Wed Apr 19 20:09:57 2017 -0700
tree 071e7320daf43b235be132c3e266f49360f14c28
parent dc8a64fb684bdd9c50449ac6db62942c158e6007

Declare location of device manifest

Bug: 36810913
Test: Build and inspect $OUT/system/vendor/manifest
Change-Id: Id97b4d98e2e22949bef6d3ea455662cf082df585

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