Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dae462bd authored by Yifan Hong's avatar Yifan Hong
Browse files

Accept multiple input files for device manifest. 

Test: test with DEVICE_MANIFEST_FILE variable split
      into multiple files

Bug: 38217107
Change-Id: I1146898e4ccf0e8bac7d8541032f160476dbc148
Merged-In: I1146898e4ccf0e8bac7d8541032f160476dbc148
parent 714f406a

target/board/Android.mk

+5 −1
Original line number Diff line number Diff line
@@ -32,14 +32,18 @@ endif 


# Device Manifest

ifdef DEVICE_MANIFEST_FILE

# $(DEVICE_MANIFEST_FILE) can be a list of files

include $(CLEAR_VARS)

LOCAL_MODULE        := manifest.xml

LOCAL_MODULE_CLASS  := ETC

LOCAL_MODULE_PATH   := $(TARGET_OUT_VENDOR)



GEN := $(local-generated-sources-dir)/manifest.xml

$(GEN): PRIVATE_DEVICE_MANIFEST_FILE := $(DEVICE_MANIFEST_FILE)

$(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 -o $@ \

		-i $(call normalize-path-list,$(PRIVATE_DEVICE_MANIFEST_FILE))



LOCAL_PREBUILT_MODULE_FILE := $(GEN)

include $(BUILD_PREBUILT)