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

Commit d8d276c5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Rename VINTF XML module names"

parents 4b7ab33f 43ec6ead

target/board/Android.mk

+6 −4
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ endif 
ifdef DEVICE_MANIFEST_FILE

# $(DEVICE_MANIFEST_FILE) can be a list of files

include $(CLEAR_VARS)

LOCAL_MODULE        := manifest.xml

LOCAL_MODULE        := device_manifest.xml

LOCAL_MODULE_STEM   := manifest.xml

LOCAL_MODULE_CLASS  := ETC

LOCAL_MODULE_PATH   := $(TARGET_OUT_VENDOR)
@@ -53,7 +54,8 @@ endif 
# Device Compatibility Matrix

ifdef DEVICE_MATRIX_FILE

include $(CLEAR_VARS)

LOCAL_MODULE        := compatibility_matrix.xml

LOCAL_MODULE        := device_compatibility_matrix.xml

LOCAL_MODULE_STEM   := compatibility_matrix.xml

LOCAL_MODULE_CLASS  := ETC

LOCAL_MODULE_PATH   := $(TARGET_OUT_VENDOR)
@@ -69,7 +71,7 @@ endif 


# Framework Manifest

include $(CLEAR_VARS)

LOCAL_MODULE        := system_manifest.xml

LOCAL_MODULE        := framework_manifest.xml

LOCAL_MODULE_STEM   := manifest.xml

LOCAL_MODULE_CLASS  := ETC

LOCAL_MODULE_PATH   := $(TARGET_OUT)
@@ -94,7 +96,7 @@ BUILT_SYSTEM_MANIFEST := $(LOCAL_BUILT_MODULE) 


# Framework Compatibility Matrix

include $(CLEAR_VARS)

LOCAL_MODULE        := system_compatibility_matrix.xml

LOCAL_MODULE        := framework_compatibility_matrix.xml

LOCAL_MODULE_STEM   := compatibility_matrix.xml

LOCAL_MODULE_CLASS  := ETC

LOCAL_MODULE_PATH   := $(TARGET_OUT)

target/product/embedded.mk

+7 −4
Original line number Diff line number Diff line
@@ -81,10 +81,13 @@ PRODUCT_PACKAGES += \ 
    tzdatacheck \

    vndservice \

    vndservicemanager \

    compatibility_matrix.xml \

    manifest.xml \

    system_manifest.xml \

    system_compatibility_matrix.xml \



# VINTF data

PRODUCT_PACKAGES += \

    device_compatibility_matrix.xml \

    device_manifest.xml \

    framework_manifest.xml \

    framework_compatibility_matrix.xml \



# SELinux packages are added as dependencies of the selinux_policy

# phony package.