StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use assemble_vintf to verify framework manifests.

Browse Source 
Test: builds, and verify that system/manifest.xml is there.

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

Change-Id: Ic3bb50211311fa423a2ad56bd2891cb57d7dc1a5
This commit is contained in:
Yifan Hong
2017-04-14 00:00:46 -07:00
committed by Colin Cross
parent 283af596eb
commit aa21221f80
4 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/Makefile
View File

@@ -2288,12 +2288,12 @@ ifdef INSTALLED_SYSTEMOTHERIMAGE_TARGET
$(hide) $(call fs_config,$(zip_root)/SYSTEM_OTHER,system/) > $(zip_root)/META/system_other_filesystem_config.txt $(hide) $(call fs_config,$(zip_root)/SYSTEM_OTHER,system/) > $(zip_root)/META/system_other_filesystem_config.txt
endif endif
@# Metadata for compatibility verification. @# Metadata for compatibility verification.
$(hide) cp $(INSTALLED_SYSTEM_MANIFEST) $(zip_root)/META/system_manifest.xml $(hide) cp $(BUILT_SYSTEM_MANIFEST) $(zip_root)/META/system_manifest.xml
ifdef INSTALLED_VENDOR_MANIFEST ifdef BUILT_VENDOR_MANIFEST
$(hide) cp $(INSTALLED_VENDOR_MANIFEST) $(zip_root)/META/vendor_manifest.xml $(hide) cp $(BUILT_VENDOR_MANIFEST) $(zip_root)/META/vendor_manifest.xml
endif endif
ifdef INSTALLED_VENDOR_MATRIX ifdef BUILT_VENDOR_MATRIX
$(hide) cp $(INSTALLED_VENDOR_MATRIX) $(zip_root)/META/vendor_matrix.xml $(hide) cp $(BUILT_VENDOR_MATRIX) $(zip_root)/META/vendor_matrix.xml
endif endif
$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \ $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \

2
core/config.mk
View File

@@ -686,7 +686,7 @@ else
DEFAULT_SYSTEM_DEV_CERTIFICATE := build/target/product/security/testkey DEFAULT_SYSTEM_DEV_CERTIFICATE := build/target/product/security/testkey
endif endif
INSTALLED_SYSTEM_MANIFEST := $(PRODUCT_OUT)/system/manifest.xml FRAMEWORK_MANIFEST_FILE := system/libhidl/manifest.xml
# ############################################################### # ###############################################################
# Set up final options. # Set up final options.

18
target/board/Android.mk
View File

@@ -41,8 +41,8 @@ $(GEN): $(DEVICE_MANIFEST_FILE) $(HOST_OUT_EXECUTABLES)/assemble_vintf
BOARD_SEPOLICY_VERS=$(BOARD_SEPOLICY_VERS) $(HOST_OUT_EXECUTABLES)/assemble_vintf -i $< -o $@ BOARD_SEPOLICY_VERS=$(BOARD_SEPOLICY_VERS) $(HOST_OUT_EXECUTABLES)/assemble_vintf -i $< -o $@
LOCAL_PREBUILT_MODULE_FILE := $(GEN) LOCAL_PREBUILT_MODULE_FILE := $(GEN)
INSTALLED_VENDOR_MANIFEST := $(LOCAL_MODULE_PATH)/$(LOCAL_MODULE)
include $(BUILD_PREBUILT) include $(BUILD_PREBUILT)
BUILT_VENDOR_MANIFEST := $(LOCAL_BUILT_MODULE)
endif endif
ifdef DEVICE_MATRIX_FILE ifdef DEVICE_MATRIX_FILE
@@ -51,6 +51,20 @@ LOCAL_MODULE := matrix.xml
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR) LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)
LOCAL_PREBUILT_MODULE_FILE := $(DEVICE_MATRIX_FILE) LOCAL_PREBUILT_MODULE_FILE := $(DEVICE_MATRIX_FILE)
INSTALLED_VENDOR_MATRIX := $(LOCAL_MODULE_PATH)/$(LOCAL_MODULE)
include $(BUILD_PREBUILT) include $(BUILD_PREBUILT)
BUILT_VENDOR_MATRIX := $(LOCAL_BUILT_MODULE)
endif endif
include $(CLEAR_VARS)
LOCAL_MODULE := system_manifest.xml
LOCAL_MODULE_STEM := manifest.xml
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT)
GEN := $(local-generated-sources-dir)/manifest.xml
$(GEN): $(FRAMEWORK_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)
include $(BUILD_PREBUILT)
BUILT_SYSTEM_MANIFEST := $(LOCAL_BUILT_MODULE)

4
target/product/embedded.mk
View File

@@ -88,6 +88,7 @@ PRODUCT_PACKAGES += \
vndservicemanager \ vndservicemanager \
matrix.xml \ matrix.xml \
manifest.xml \ manifest.xml \
system_manifest.xml \
# SELinux packages # SELinux packages
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@@ -122,6 +123,3 @@ PRODUCT_COPY_FILES += \
system/core/rootdir/init.usb.configfs.rc:root/init.usb.configfs.rc \ system/core/rootdir/init.usb.configfs.rc:root/init.usb.configfs.rc \
system/core/rootdir/ueventd.rc:root/ueventd.rc \ system/core/rootdir/ueventd.rc:root/ueventd.rc \
system/core/rootdir/etc/hosts:system/etc/hosts system/core/rootdir/etc/hosts:system/etc/hosts
# Framework Manifest
PRODUCT_COPY_FILES += system/libhidl/manifest.xml:system/manifest.xml