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

Commit 58599633 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-dr1-dev

parents a7dc6fb5 a54e67a2

CleanSpec.mk

+2 −1
Original line number Diff line number Diff line
@@ -56,3 +56,4 @@ $(call add-clean-step, rm -rf $(OUT)/soong/.intermediates/) 
$(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/hardware/interfaces/)

$(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/hardware/interfaces/)

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

$(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

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


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

include $(CLEAR_VARS)

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

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

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 \