tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

disabled passthrough mode for Configstore

Browse source 
This change removes target "android.hardware.configstore@1.0-impl" to
disable passthrough mode.

Bug: 35325577
Test: android.hardware.configstore@1.0-impl.so not exist in outputs and
    configstore works in binderized mode

Change-Id: Ieedb6fea179d50ac35fc32b0e21752b2334558ae
This commit is contained in:
Jaesoo Lee 2017-03-20 13:57:10 +09:00
parent 04ff4a07eb
commit 2d66f6183a
2 changed files with 14 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
configstore/1.0/default/Android.mk
View file

@ -1,24 +1,5 @@
LOCAL_PATH := $(call my-dir) 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) include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.configstore@1.0-service LOCAL_MODULE := android.hardware.configstore@1.0-service
@ -28,13 +9,14 @@ LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_INIT_RC := android.hardware.configstore@1.0-service.rc LOCAL_INIT_RC := android.hardware.configstore@1.0-service.rc
LOCAL_SRC_FILES:= service.cpp LOCAL_SRC_FILES:= service.cpp
include $(LOCAL_PATH)/surfaceflinger.mk
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
liblog \ android.hardware.configstore@1.0 \
libdl \
libutils \
libhidlbase \ libhidlbase \
libhidltransport \ libhidltransport \
android.hardware.configstore@1.0 \ libbase \
liblog \
libutils \
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

15
configstore/1.0/default/service.cpp
View file

@ -17,13 +17,15 @@
#define LOG_TAG "android.hardware.configstore@1.0-service" #define LOG_TAG "android.hardware.configstore@1.0-service"
#include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h> #include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h>
#include <hidl/LegacySupport.h> #include <hidl/HidlTransportSupport.h>
#include "SurfaceFlingerConfigs.h"
using android::hardware::configstore::V1_0::ISurfaceFlingerConfigs;
using android::hardware::configureRpcThreadpool; using android::hardware::configureRpcThreadpool;
using android::hardware::registerPassthroughServiceImplementation;
using android::hardware::joinRpcThreadpool; using android::hardware::joinRpcThreadpool;
using android::hardware::configstore::V1_0::ISurfaceFlingerConfigs;
using android::hardware::configstore::V1_0::implementation::SurfaceFlingerConfigs;
using android::sp;
using android::status_t; using android::status_t;
using android::OK; using android::OK;
@ -31,9 +33,8 @@ int main() {
// TODO(b/34857894): tune the max thread count. // TODO(b/34857894): tune the max thread count.
configureRpcThreadpool(10, true); configureRpcThreadpool(10, true);
status_t status; sp<ISurfaceFlingerConfigs> surfaceFlingerConfigs = new SurfaceFlingerConfigs;
status_t status = surfaceFlingerConfigs->registerAsService();
status = registerPassthroughServiceImplementation<ISurfaceFlingerConfigs>();
LOG_ALWAYS_FATAL_IF(status != OK, "Could not register ISurfaceFlingerConfigs"); LOG_ALWAYS_FATAL_IF(status != OK, "Could not register ISurfaceFlingerConfigs");
// other interface registration comes here // other interface registration comes here