commit a4014da87353c830a9dcb218f750297194580011
author Wei Wang <wvw@google.com> Thu Apr 27 19:40:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 27 19:40:23 2017 +0000
tree 441a2738075a7372f1dae94d24e37622b610b18f
parent 44474ac9cf23098dd5beaa102cf6da584b1572a6
parent 00cbf9e21fa6e09b6c1e64679fdbb2866fd00733

Merge "init.common.rc: set cpuset with sys.boot_completed=1" am: 66f0c4b779 am: 4a04d73284 am: 08d0b3b947
am: 00cbf9e21f

Change-Id: Iae2d5b63b6107f2921735c35cdc10c45e36c19f5

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