commit ca86b3e15fe22923c79f5b8986ff86e9ba211b1d
author Michael Schwartz <schwartzmi@google.com> Wed Apr 05 13:54:20 2017 -0700
committer Yifan Hong <elsk@google.com> Wed Apr 19 20:59:31 2017 +0000
tree 09e36633a15d75c9ba523b18bc7804d4b609a067
parent 123c996dc540ea0291c896be2a1beb4c5c6131cd

Declare the location of device manifest

Bug: 36810913
Bug: 36983271
Test: build and boot device.
Change-Id: I4b29c9ff14a06bbf7d053dca92c7a2e4dca473df

BoardConfig.mk

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 0ae04ec..7265a24 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -164,6 +164,8 @@
 # Testing related defines
 BOARD_PERFSETUP_SCRIPT := platform_testing/scripts/perf-setup/bullhead-setup.sh
 
+DEVICE_MANIFEST_FILE := device/lge/bullhead/manifest.xml
+
 ifeq ($(TARGET_PRODUCT),aosp_bullhead_svelte)
 BOARD_KERNEL_CMDLINE += mem=1024M maxcpus=2
 MALLOC_SVELTE := true

device.mk

diff --git a/device.mk b/device.mk
index a276296..4380acb 100644
--- a/device.mk
+++ b/device.mk
@@ -50,10 +50,6 @@
     device/lge/bullhead/init.bullhead.nanohub.rc:root/init.bullhead.sensorhub.rc
 endif
 
-# Vendor Interface Manifest
-PRODUCT_COPY_FILES += \
-    device/lge/bullhead/manifest.xml:vendor/manifest.xml
-
 PRODUCT_COPY_FILES += \
     frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
     frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \