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

Commit 1a793844 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"

parents 5fbc2279 b162f3f8

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -63,3 +63,4 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/android.hardware.au 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/android.hardware.tests*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk/android.hardware.tests*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk-sp/android.hardware.graphics.allocator*)

$(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.current.xml

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,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

+6 −7
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 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
@@ -19,17 +19,16 @@ LOCAL_SHARED_LIBRARIES := \ 
    libhwminijail \

    liblog \

    libutils \

    android.hardware.configstore@1.0 \

    android.hardware.configstore@1.1

    android.hardware.configstore@1.0



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

configstore/1.1/default/SurfaceFlingerConfigs.cpp→configstore/1.0/default/SurfaceFlingerConfigs.cpp

+2 −5
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
namespace android {

namespace hardware {

namespace configstore {

namespace V1_1 {

namespace V1_0 {

namespace implementation {



// Methods from ::android::hardware::configstore::V1_0::ISurfaceFlingerConfigs
@@ -139,13 +139,10 @@ Return<void> SurfaceFlingerConfigs::startGraphicsAllocatorService( 
    return Void();

}



// Methods from ::android::hardware::configstore::V1_1::ISurfaceFlingerConfigs

// follow.



// Methods from ::android::hidl::base::V1_0::IBase follow.



}  // namespace implementation

}  // namespace V1_1

}  // namespace V1_0

}  // namespace configstore

}  // namespace hardware

}  // namespace android

configstore/1.1/default/SurfaceFlingerConfigs.h→configstore/1.0/default/SurfaceFlingerConfigs.h

+7 −10
Original line number Diff line number Diff line 
#ifndef ANDROID_HARDWARE_CONFIGSTORE_V1_1_SURFACEFLINGERCONFIGS_H

#define ANDROID_HARDWARE_CONFIGSTORE_V1_1_SURFACEFLINGERCONFIGS_H

#ifndef ANDROID_HARDWARE_CONFIGSTORE_V1_0_SURFACEFLINGERCONFIGS_H

#define ANDROID_HARDWARE_CONFIGSTORE_V1_0_SURFACEFLINGERCONFIGS_H



#include <android/hardware/configstore/1.1/ISurfaceFlingerConfigs.h>

#include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h>

#include <hidl/MQDescriptor.h>

#include <hidl/Status.h>



namespace android {

namespace hardware {

namespace configstore {

namespace V1_1 {

namespace V1_0 {

namespace implementation {



using ::android::hardware::configstore::V1_1::ISurfaceFlingerConfigs;

using ::android::hardware::configstore::V1_0::ISurfaceFlingerConfigs;

using ::android::hardware::Return;

using ::android::hardware::Void;

using ::android::sp;
@@ -32,16 +32,13 @@ struct SurfaceFlingerConfigs : public ISurfaceFlingerConfigs { 
    Return<void> maxFrameBufferAcquiredBuffers(maxFrameBufferAcquiredBuffers_cb _hidl_cb) override;

    Return<void> startGraphicsAllocatorService(startGraphicsAllocatorService_cb _hidl_cb) override;



    // Methods from

    // ::android::hardware::configstore::V1_1::ISurfaceFlingerConfigs follow.



    // Methods from ::android::hidl::base::V1_0::IBase follow.

};



}  // namespace implementation

}  // namespace V1_1

}  // namespace V1_0

}  // namespace configstore

}  // namespace hardware

}  // namespace android



#endif  // ANDROID_HARDWARE_CONFIGSTORE_V1_1_SURFACEFLINGERCONFIGS_H
 
#endif  // ANDROID_HARDWARE_CONFIGSTORE_V1_0_SURFACEFLINGERCONFIGS_H