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

Commit ed48e595 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "Allow devices to extend the system manifest." am: 15820578 am: 152a886d 

am: aac4256f

Change-Id: I8c42fd4b758466032cec45a762b079979d0f4fa6
parents 4b309585 aac4256f

core/config.mk

+6 −1
Original line number Diff line number Diff line
@@ -818,7 +818,12 @@ else 
  DEFAULT_SYSTEM_DEV_CERTIFICATE := build/target/product/security/testkey

endif



FRAMEWORK_MANIFEST_FILE := system/libhidl/manifest.xml

FRAMEWORK_MANIFEST_INPUT_FILES := system/libhidl/manifest.xml

ifdef DEVICE_FRAMEWORK_MANIFEST_FILE

  FRAMEWORK_MANIFEST_INPUT_FILES += $(DEVICE_FRAMEWORK_MANIFEST_FILE)

endif

$(.KATI_obsolete_var DEVICE_FRAMEWORK_MANIFEST_FILE,No one should ever need to use this.)



FRAMEWORK_COMPATIBILITY_MATRIX_FILES := $(wildcard hardware/interfaces/compatibility_matrix.*.xml)



BUILD_NUMBER_FROM_FILE := $$(cat $(OUT_DIR)/build_number.txt)

target/board/Android.mk

+5 −2
Original line number Diff line number Diff line
@@ -89,8 +89,11 @@ $(GEN): PRIVATE_FLAGS += -c "$(BUILT_VENDOR_MATRIX)" 
endif

endif



$(GEN): $(FRAMEWORK_MANIFEST_FILE) $(HOST_OUT_EXECUTABLES)/assemble_vintf

	BOARD_SEPOLICY_VERS=$(BOARD_SEPOLICY_VERS) $(HOST_OUT_EXECUTABLES)/assemble_vintf -i $< -o $@ $(PRIVATE_FLAGS)

$(GEN): PRIVATE_FRAMEWORK_MANIFEST_INPUT_FILES := $(FRAMEWORK_MANIFEST_INPUT_FILES)

$(GEN): $(FRAMEWORK_MANIFEST_INPUT_FILES) $(HOST_OUT_EXECUTABLES)/assemble_vintf

	BOARD_SEPOLICY_VERS=$(BOARD_SEPOLICY_VERS) $(HOST_OUT_EXECUTABLES)/assemble_vintf \

		-i $(call normalize-path-list,$(PRIVATE_FRAMEWORK_MANIFEST_INPUT_FILES)) \

		-o $@ $(PRIVATE_FLAGS)



LOCAL_PREBUILT_MODULE_FILE := $(GEN)

include $(BUILD_PREBUILT)