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

Commit e3a0c607 authored by Jaesoo Lee's avatar Jaesoo Lee Committed by Gerrit Code Review
Browse files

Merge changes from topic 'configstore' 

* changes:
  configstore: build configstore-utils as header library
  configstore: add new configuration item
  configstore: add utility library functions for configstore
  configstore: add configstore@1.0 HAL
parents 2e429d6b c06c6873

configstore/1.0/Android.bp

0 → 100644
+62 −0
Original line number Diff line number Diff line 
// This file is autogenerated by hidl-gen. Do not edit manually.



filegroup {

    name: "android.hardware.configstore@1.0_hal",

    srcs: [

        "types.hal",

        "ISurfaceFlingerConfigs.hal",

    ],

}



genrule {

    name: "android.hardware.configstore@1.0_genc++",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.0",

    srcs: [

        ":android.hardware.configstore@1.0_hal",

    ],

    out: [

        "android/hardware/configstore/1.0/types.cpp",

        "android/hardware/configstore/1.0/SurfaceFlingerConfigsAll.cpp",

    ],

}



genrule {

    name: "android.hardware.configstore@1.0_genc++_headers",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.0",

    srcs: [

        ":android.hardware.configstore@1.0_hal",

    ],

    out: [

        "android/hardware/configstore/1.0/types.h",

        "android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h",

        "android/hardware/configstore/1.0/IHwSurfaceFlingerConfigs.h",

        "android/hardware/configstore/1.0/BnHwSurfaceFlingerConfigs.h",

        "android/hardware/configstore/1.0/BpHwSurfaceFlingerConfigs.h",

        "android/hardware/configstore/1.0/BsSurfaceFlingerConfigs.h",

    ],

}



cc_library_shared {

    name: "android.hardware.configstore@1.0",

    generated_sources: ["android.hardware.configstore@1.0_genc++"],

    generated_headers: ["android.hardware.configstore@1.0_genc++_headers"],

    export_generated_headers: ["android.hardware.configstore@1.0_genc++_headers"],

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "liblog",

        "libutils",

        "libcutils",

        "android.hidl.base@1.0",

    ],

    export_shared_lib_headers: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "libutils",

        "android.hidl.base@1.0",

    ],

}

configstore/1.0/Android.mk

0 → 100644
+308 −0
Original line number Diff line number Diff line 
# This file is autogenerated by hidl-gen. Do not edit manually.



LOCAL_PATH := $(call my-dir)



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



include $(CLEAR_VARS)

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

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(call local-generated-sources-dir, COMMON)



HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)



LOCAL_JAVA_LIBRARIES := \

    android.hidl.base@1.0-java \





#

# Build types.hal (OptionalBool)

#

GEN := $(intermediates)/android/hardware/configstore/V1_0/OptionalBool.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.configstore@1.0::types.OptionalBool



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (OptionalInt32)

#

GEN := $(intermediates)/android/hardware/configstore/V1_0/OptionalInt32.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.configstore@1.0::types.OptionalInt32



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (OptionalInt64)

#

GEN := $(intermediates)/android/hardware/configstore/V1_0/OptionalInt64.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.configstore@1.0::types.OptionalInt64



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (OptionalString)

#

GEN := $(intermediates)/android/hardware/configstore/V1_0/OptionalString.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.configstore@1.0::types.OptionalString



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (OptionalUInt32)

#

GEN := $(intermediates)/android/hardware/configstore/V1_0/OptionalUInt32.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.configstore@1.0::types.OptionalUInt32



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (OptionalUInt64)

#

GEN := $(intermediates)/android/hardware/configstore/V1_0/OptionalUInt64.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.configstore@1.0::types.OptionalUInt64



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISurfaceFlingerConfigs.hal

#

GEN := $(intermediates)/android/hardware/configstore/V1_0/ISurfaceFlingerConfigs.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISurfaceFlingerConfigs.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.configstore@1.0::ISurfaceFlingerConfigs



$(GEN): $(LOCAL_PATH)/ISurfaceFlingerConfigs.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

include $(BUILD_JAVA_LIBRARY)





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



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.configstore@1.0-java-static

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(call local-generated-sources-dir, COMMON)



HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)



LOCAL_STATIC_JAVA_LIBRARIES := \

    android.hidl.base@1.0-java-static \





#

# Build types.hal (OptionalBool)

#

GEN := $(intermediates)/android/hardware/configstore/V1_0/OptionalBool.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.configstore@1.0::types.OptionalBool



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (OptionalInt32)

#

GEN := $(intermediates)/android/hardware/configstore/V1_0/OptionalInt32.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.configstore@1.0::types.OptionalInt32



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (OptionalInt64)

#

GEN := $(intermediates)/android/hardware/configstore/V1_0/OptionalInt64.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.configstore@1.0::types.OptionalInt64



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (OptionalString)

#

GEN := $(intermediates)/android/hardware/configstore/V1_0/OptionalString.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.configstore@1.0::types.OptionalString



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (OptionalUInt32)

#

GEN := $(intermediates)/android/hardware/configstore/V1_0/OptionalUInt32.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.configstore@1.0::types.OptionalUInt32



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (OptionalUInt64)

#

GEN := $(intermediates)/android/hardware/configstore/V1_0/OptionalUInt64.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.configstore@1.0::types.OptionalUInt64



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISurfaceFlingerConfigs.hal

#

GEN := $(intermediates)/android/hardware/configstore/V1_0/ISurfaceFlingerConfigs.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISurfaceFlingerConfigs.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.configstore@1.0::ISurfaceFlingerConfigs



$(GEN): $(LOCAL_PATH)/ISurfaceFlingerConfigs.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

include $(BUILD_STATIC_JAVA_LIBRARY)







include $(call all-makefiles-under,$(LOCAL_PATH))

configstore/1.0/ISurfaceFlingerConfigs.hal

0 → 100644
+21 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package android.hardware.configstore@1.0;



interface ISurfaceFlingerConfigs {

    vsyncEventPhaseOffsetNs() generates (OptionalInt64 value);

    useTripleFramebuffer() generates (OptionalBool value);

};

configstore/1.0/default/Android.mk

0 → 100644
+40 −0
Original line number Diff line number Diff line 
LOCAL_PATH := $(call my-dir)



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

include $(CLEAR_VARS)

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

LOCAL_PROPRIETARY_MODULE := true

LOCAL_MODULE_CLASS := SHARED_LIBRARIES

LOCAL_MODULE_RELATIVE_PATH := hw



include $(LOCAL_PATH)/surfaceflinger.mk



LOCAL_SHARED_LIBRARIES := \

    libbase \

    libhidlbase \

    libhidltransport \

    libutils \

    android.hardware.configstore@1.0 \

    android.hidl.base@1.0



include $(BUILD_SHARED_LIBRARY)



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

include $(CLEAR_VARS)

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.0-service.rc

LOCAL_SRC_FILES:= service.cpp



LOCAL_SHARED_LIBRARIES := \

    liblog \

    libdl \

    libutils \

    libhidlbase \

    libhidltransport \

    android.hardware.configstore@1.0 \



include $(BUILD_EXECUTABLE)

configstore/1.0/default/SurfaceFlingerConfigs.cpp

0 → 100644
+42 −0
Original line number Diff line number Diff line 
#include "SurfaceFlingerConfigs.h"



#include <android-base/logging.h>



namespace android {

namespace hardware {

namespace configstore {

namespace V1_0 {

namespace implementation {



// Methods from ::android::hardware::configstore::V1_0::ISurfaceFlingerConfigs follow.

Return<void> SurfaceFlingerConfigs::vsyncEventPhaseOffsetNs(vsyncEventPhaseOffsetNs_cb _hidl_cb) {

#ifdef VSYNC_EVENT_PHASE_OFFSET_NS

    _hidl_cb({true, VSYNC_EVENT_PHASE_OFFSET_NS});

    LOG(INFO) << "vsync event phase offset ns =  " << VSYNC_EVENT_PHASE_OFFSET_NS;

#else

    _hidl_cb({false, 0});

#endif

    return Void();

}



Return<void> SurfaceFlingerConfigs::useTripleFramebuffer(useTripleFramebuffer_cb _hidl_cb) {

    bool value = false;

#ifdef USE_TRIPLE_FRAMEBUFFER

    value = true;

#endif

    _hidl_cb({true, value});

    LOG(INFO) << "SurfaceFlinger FrameBuffer: " << (value ? "triple" : "double");

    return Void();

}



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



ISurfaceFlingerConfigs* HIDL_FETCH_ISurfaceFlingerConfigs(const char* /* name */) {

    return new SurfaceFlingerConfigs();

}



}  // namespace implementation

}  // namespace V1_0

}  // namespace configstore

}  // namespace hardware

}  // namespace android