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

Commit e46ab1fd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Configstore HAL is down-revisioned to 1.0" into oc-mr1-dev

parents 2f4f5bde 169eeecb

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -60,3 +60,4 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/hw/android.hardware.auto 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/hw/android.hardware.automotive*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/hw/android.hardware.automotive*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/android.hardware.automotive*)

$(call add-clean-step, find $(PRODUCT_OUT)/system $(PRODUCT_OUT)/vendor -type f -name "android\.hardware\.configstore\@1\.1*" -print0 | xargs -0 rm -f)

compatibility_matrix.26.xml

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
    </hal>

    <hal format="hidl" optional="false">

        <name>android.hardware.configstore</name>

        <version>1.0-1</version>

        <version>1.0</version>

        <interface>

            <name>ISurfaceFlingerConfigs</name>

            <instance>default</instance>

compatibility_matrix.current.xml

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
    </hal>

    <hal format="hidl" optional="false">

        <name>android.hardware.configstore</name>

        <version>1.0-1</version>

        <version>1.0</version>

        <interface>

            <name>ISurfaceFlingerConfigs</name>

            <instance>default</instance>

compatibility_matrix.legacy.xml

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
    </hal>

    <hal format="hidl" optional="false">

        <name>android.hardware.configstore</name>

        <version>1.0-1</version>

        <version>1.0</version>

        <interface>

            <name>ISurfaceFlingerConfigs</name>

            <instance>default</instance>

configstore/1.1/default/Android.mk→configstore/1.0/default/Android.mk

+5 −6
Original line number Diff line number Diff line
@@ -2,19 +2,18 @@ LOCAL_PATH := $(call my-dir) 


################################################################################

include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.configstore@1.1-service

LOCAL_REQUIRED_MODULES_arm64 := configstore@1.1.policy

LOCAL_MODULE := android.hardware.configstore@1.0-service

LOCAL_REQUIRED_MODULES_arm64 := configstore@1.0.policy

LOCAL_PROPRIETARY_MODULE := true

LOCAL_MODULE_CLASS := EXECUTABLES

LOCAL_MODULE_RELATIVE_PATH := hw

LOCAL_INIT_RC := android.hardware.configstore@1.1-service.rc

LOCAL_INIT_RC := android.hardware.configstore@1.0-service.rc

LOCAL_SRC_FILES:= service.cpp



include $(LOCAL_PATH)/surfaceflinger.mk



LOCAL_SHARED_LIBRARIES := \

    android.hardware.configstore@1.0 \

    android.hardware.configstore@1.1 \

    libhidlbase \

    libhidltransport \

    libbase \
@@ -27,9 +26,9 @@ include $(BUILD_EXECUTABLE) 
# seccomp filter for configstore

ifeq ($(TARGET_ARCH), $(filter $(TARGET_ARCH), arm64))

include $(CLEAR_VARS)

LOCAL_MODULE := configstore@1.1.policy

LOCAL_MODULE := configstore@1.0.policy

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/seccomp_policy

LOCAL_SRC_FILES := seccomp_policy/configstore@1.1-$(TARGET_ARCH).policy

LOCAL_SRC_FILES := seccomp_policy/configstore@1.0-$(TARGET_ARCH).policy

include $(BUILD_PREBUILT)

endif