commit 283af596eb42b682d4e161ef5465cca1920d2ca9
author Yifan Hong <elsk@google.com> Thu Apr 13 23:30:38 2017 -0700
committer Colin Cross <ccross@android.com> Fri Apr 14 16:29:04 2017 -0700
tree 8eeb353de06cf7ae761bc4e70dc222da990d8dd9
parent d75be23640fe78c83f3229d7090f3b91b7080b3c

Use assemble_vintf to verify device manifests.

Test: builds, and verify that vendor/manifest.xml has
sepolicy version.

Bug: 36681384 Runtime-Collectible information must be statically
collectible
Bug: 36983271 VINTF checked at build time

Change-Id: I10e4cff6ed1b78a7cb9239e822ab054e1b90e7d3

target/board/Android.mk

diff --git a/target/board/Android.mk b/target/board/Android.mk
index 6376156..efc3bf3 100644
--- a/target/board/Android.mk
+++ b/target/board/Android.mk
@@ -35,7 +35,12 @@
 LOCAL_MODULE        := manifest.xml
 LOCAL_MODULE_CLASS  := ETC
 LOCAL_MODULE_PATH   := $(TARGET_OUT_VENDOR)
-LOCAL_PREBUILT_MODULE_FILE := $(DEVICE_MANIFEST_FILE)
+
+GEN := $(local-generated-sources-dir)/manifest.xml
+$(GEN): $(DEVICE_MANIFEST_FILE) $(HOST_OUT_EXECUTABLES)/assemble_vintf
+	BOARD_SEPOLICY_VERS=$(BOARD_SEPOLICY_VERS) $(HOST_OUT_EXECUTABLES)/assemble_vintf -i $< -o $@
+
+LOCAL_PREBUILT_MODULE_FILE := $(GEN)
 INSTALLED_VENDOR_MANIFEST := $(LOCAL_MODULE_PATH)/$(LOCAL_MODULE)
 include $(BUILD_PREBUILT)
 endif