Always install system_ext manifest.
Add a default system_ext manifest so that it is always installed
even when SYSTEM_EXT_MANIFEST_FILES are not defined.
Bug: 137712494
Test: m check-vintf-all -j
Change-Id: I0d2c967ff3f3d0b64c71f7b3dec7aef5a422ea8c
diff --git a/vintfdata/Android.mk b/vintfdata/Android.mk
index e6df418..c8dd7d4 100644
--- a/vintfdata/Android.mk
+++ b/vintfdata/Android.mk
@@ -22,9 +22,14 @@
# the module. It is recommended that such device-specific modules to be
# installed on product partition.
-FRAMEWORK_MANIFEST_INPUT_FILES := $(LOCAL_PATH)/manifest.xml
+SYSTEM_MANIFEST_INPUT_FILES := $(LOCAL_PATH)/manifest.xml
ifdef DEVICE_FRAMEWORK_MANIFEST_FILE
- FRAMEWORK_MANIFEST_INPUT_FILES += $(DEVICE_FRAMEWORK_MANIFEST_FILE)
+ SYSTEM_MANIFEST_INPUT_FILES += $(DEVICE_FRAMEWORK_MANIFEST_FILE)
+endif
+
+SYSTEM_EXT_MANIFEST_INPUT_FILES := $(LOCAL_PATH)/system_ext_manifest.default.xml
+ifdef SYSTEM_EXT_MANIFEST_FILES
+ SYSTEM_EXT_MANIFEST_INPUT_FILES += $(SYSTEM_EXT_MANIFEST_FILES)
endif
# VNDK Version in device compatibility matrix and framework manifest
@@ -71,12 +76,12 @@
GEN := $(local-generated-sources-dir)/manifest.xml
$(GEN): PRIVATE_VINTF_VNDK_VERSION := $(VINTF_VNDK_VERSION)
-$(GEN): PRIVATE_FRAMEWORK_MANIFEST_INPUT_FILES := $(FRAMEWORK_MANIFEST_INPUT_FILES)
-$(GEN): $(FRAMEWORK_MANIFEST_INPUT_FILES) $(HOST_OUT_EXECUTABLES)/assemble_vintf
+$(GEN): PRIVATE_SYSTEM_MANIFEST_INPUT_FILES := $(SYSTEM_MANIFEST_INPUT_FILES)
+$(GEN): $(SYSTEM_MANIFEST_INPUT_FILES) $(HOST_OUT_EXECUTABLES)/assemble_vintf
PROVIDED_VNDK_VERSIONS="$(PRIVATE_VINTF_VNDK_VERSION) $(PRODUCT_EXTRA_VNDK_VERSIONS)" \
PLATFORM_SYSTEMSDK_VERSIONS="$(PLATFORM_SYSTEMSDK_VERSIONS)" \
$(HOST_OUT_EXECUTABLES)/assemble_vintf \
- -i $(call normalize-path-list,$(PRIVATE_FRAMEWORK_MANIFEST_INPUT_FILES)) \
+ -i $(call normalize-path-list,$(PRIVATE_SYSTEM_MANIFEST_INPUT_FILES)) \
-o $@
LOCAL_PREBUILT_MODULE_FILE := $(GEN)
@@ -102,7 +107,6 @@
endif
# System_ext Manifest
-ifneq ($(SYSTEM_EXT_MANIFEST_FILES),)
include $(CLEAR_VARS)
LOCAL_MODULE := system_ext_manifest.xml
LOCAL_MODULE_STEM := manifest.xml
@@ -110,17 +114,17 @@
LOCAL_SYSTEM_EXT_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := vintf
GEN := $(local-generated-sources-dir)/manifest.xml
-$(GEN): PRIVATE_SYSTEM_EXT_MANIFEST_FILES := $(SYSTEM_EXT_MANIFEST_FILES)
-$(GEN): $(SYSTEM_EXT_MANIFEST_FILES) $(HOST_OUT_EXECUTABLES)/assemble_vintf
+$(GEN): PRIVATE_SYSTEM_EXT_MANIFEST_FILES := $(SYSTEM_EXT_MANIFEST_INPUT_FILES)
+$(GEN): $(SYSTEM_EXT_MANIFEST_INPUT_FILES) $(HOST_OUT_EXECUTABLES)/assemble_vintf
$(HOST_OUT_EXECUTABLES)/assemble_vintf \
-i $(call normalize-path-list,$(PRIVATE_SYSTEM_EXT_MANIFEST_FILES)) \
-o $@
LOCAL_PREBUILT_MODULE_FILE := $(GEN)
include $(BUILD_PREBUILT)
-endif
VINTF_VNDK_VERSION :=
-FRAMEWORK_MANIFEST_INPUT_FILES :=
+SYSTEM_MANIFEST_INPUT_FILES :=
+SYSTEM_EXT_MANIFEST_INPUT_FILES :=
DEVICE_MATRIX_INPUT_FILE :=
PRODUCT_MANIFEST_INPUT_FILES :=