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

Commit 8f863693 authored by Yifan Hong's avatar Yifan Hong
Browse files

move VINTF metadata to /etc/vintf/ . 

In particular,
/vendor/manifest.xml => /vendor/etc/vintf/manifest.xml
/system/manifest.xml => /system/etc/vintf/manifest.xml
/vendor/compatibility_matrix.xml =>
    /vendor/etc/vintf/compatibility_matrix.xml

Test: verify that fileis exist in destination
Test: hwservicemanager can read these files
Bug: 36790901
Change-Id: Ic361a48e170fb9a77faec76ad0e829625427820d
parent 6704727b

CleanSpec.mk

+7 −0
Original line number Diff line number Diff line
@@ -456,6 +456,13 @@ $(call add-clean-step, rm -rf $(TARGET_OUT_COMMON_INTERMEDIATES)/*/*_intermediat 
$(call add-clean-step, rm -rf $(HOST_OUT_COMMON_INTERMEDIATES)/*/*_intermediates/with-local/)

$(call add-clean-step, rm -rf $(HOST_OUT_COMMON_INTERMEDIATES)/*/*_intermediates/no-local/)



# Remove legacy VINTF metadata files

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/manifest.xml)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/vendor/manifest.xml)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/manifest.xml)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/vendor/compatibility_matrix.xml)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/compatibility_matrix.xml)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

target/board/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE        := device_manifest.xml

LOCAL_MODULE_STEM   := manifest.xml

LOCAL_MODULE_CLASS  := ETC

LOCAL_MODULE_PATH   := $(TARGET_OUT_VENDOR)

LOCAL_MODULE_PATH   := $(TARGET_OUT_VENDOR)/etc/vintf



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

$(GEN): PRIVATE_DEVICE_MANIFEST_FILE := $(DEVICE_MANIFEST_FILE)
@@ -59,7 +59,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE        := device_compatibility_matrix.xml

LOCAL_MODULE_STEM   := compatibility_matrix.xml

LOCAL_MODULE_CLASS  := ETC

LOCAL_MODULE_PATH   := $(TARGET_OUT_VENDOR)

LOCAL_MODULE_PATH   := $(TARGET_OUT_VENDOR)/etc/vintf



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

$(GEN): $(DEVICE_MATRIX_FILE) $(HOST_OUT_EXECUTABLES)/assemble_vintf
@@ -76,7 +76,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE        := framework_manifest.xml

LOCAL_MODULE_STEM   := manifest.xml

LOCAL_MODULE_CLASS  := ETC

LOCAL_MODULE_PATH   := $(TARGET_OUT)

LOCAL_MODULE_PATH   := $(TARGET_OUT)/etc/vintf



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