Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Configstore HAL is down-revisioned to 1.0

Browse Source 
Configstore was up-revisioned from 1.0 to 1.1. However no new
APIs were added to 1.1. Therefore configstore in master will be down
revisioned to 1.0.

Bug: 71555815
Test: lshal | grep configsotre
Test: "cat proc/<configstore pid>/status | grep Seccomp " return:
    Seccomp: 2

Change-Id: I65d2dc06fbe12d0c0ccc020bbd287e0b14320f2f
This commit is contained in:
Sundong Ahn
2017-07-10 13:56:10 +09:00
parent 7f2292dbab
commit b162f3f8dd
14 changed files with 26 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CleanSpec.mk
View File

@@ -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)

2
compatibility_matrix.current.xml
View File

@@ -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>

13
configstore/1.1/default/Android.mk → configstore/1.0/default/Android.mk
View File

@@ -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

7
configstore/1.1/default/SurfaceFlingerConfigs.cpp → configstore/1.0/default/SurfaceFlingerConfigs.cpp
View File

@@ -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

17
configstore/1.1/default/SurfaceFlingerConfigs.h → configstore/1.0/default/SurfaceFlingerConfigs.h
View File

@@ -1,17 +1,17 @@
#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

4
configstore/1.0/default/android.hardware.configstore@1.0-service.rc Normal file
View File

@@ -0,0 +1,4 @@
service vendor.configstore-hal-1-0 /vendor/bin/hw/android.hardware.configstore@1.0-service
class hal animation
user system
group system

0
configstore/1.1/default/seccomp_policy/configstore@1.1-arm64.policy → configstore/1.0/default/seccomp_policy/configstore@1.0-arm64.policy
View File

10
configstore/1.1/default/service.cpp → configstore/1.0/default/service.cpp
View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
#define LOG_TAG "android.hardware.configstore@1.1-service"
#define LOG_TAG "android.hardware.configstore@1.0-service"
#include <android/hardware/configstore/1.1/ISurfaceFlingerConfigs.h>
#include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h>
#include <hidl/HidlTransportSupport.h>
#include <hwminijail/HardwareMinijail.h>
@@ -24,8 +24,8 @@
using android::hardware::configureRpcThreadpool;
using android::hardware::joinRpcThreadpool;
using android::hardware::configstore::V1_1::ISurfaceFlingerConfigs;
using android::hardware::configstore::V1_1::implementation::SurfaceFlingerConfigs;
using android::hardware::configstore::V1_0::ISurfaceFlingerConfigs;
using android::hardware::configstore::V1_0::implementation::SurfaceFlingerConfigs;
using android::hardware::SetupMinijail;
using android::sp;
using android::status_t;
@@ -34,7 +34,7 @@ using android::OK;
int main() {
configureRpcThreadpool(10, true);
SetupMinijail("/vendor/etc/seccomp_policy/configstore@1.1.policy");
SetupMinijail("/vendor/etc/seccomp_policy/configstore@1.0.policy");
sp<ISurfaceFlingerConfigs> surfaceFlingerConfigs = new SurfaceFlingerConfigs;
status_t status = surfaceFlingerConfigs->registerAsService();

0
configstore/1.1/default/surfaceflinger.mk → configstore/1.0/default/surfaceflinger.mk
View File

18
configstore/1.1/Android.bp
View File

@@ -1,18 +0,0 @@
// This file is autogenerated by hidl-gen -Landroidbp.
hidl_interface {
name: "android.hardware.configstore@1.1",
root: "android.hardware",
vndk: {
enabled: true,
},
srcs: [
"ISurfaceFlingerConfigs.hal",
],
interfaces: [
"android.hardware.configstore@1.0",
"android.hidl.base@1.0",
],
gen_java: true,
}

25
configstore/1.1/ISurfaceFlingerConfigs.hal
View File

@@ -1,25 +0,0 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.1 (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.1
*
* 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.1;
import @1.0::ISurfaceFlingerConfigs;
/**
* New revision of ISurfaceFlingerConfigs
*/
interface ISurfaceFlingerConfigs extends @1.0::ISurfaceFlingerConfigs {
};

4
configstore/1.1/default/android.hardware.configstore@1.1-service.rc
View File

@@ -1,4 +0,0 @@
service vendor.configstore-hal /vendor/bin/hw/android.hardware.configstore@1.1-service
class hal animation
user system
group system

26
configstore/1.1/vts/functional/Android.bp
View File

@@ -1,26 +0,0 @@
//
// 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.
//
cc_test {
name: "VtsHalConfigstoreV1_1TargetTest",
defaults: ["VtsHalTargetTestDefaults"],
srcs: ["VtsHalConfigstoreV1_1TargetTest.cpp"],
static_libs: [
"android.hardware.configstore@1.0",
"android.hardware.configstore@1.1",
],
}

55
configstore/1.1/vts/functional/VtsHalConfigstoreV1_1TargetTest.cpp
View File

@@ -1,55 +0,0 @@
/*
* 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.
*/
#define LOG_TAG "ConfigstoreHidlHalTest"
#include <VtsHalHidlTargetTestBase.h>
#include <android-base/logging.h>
#include <android/hardware/configstore/1.0/types.h>
#include <android/hardware/configstore/1.1/ISurfaceFlingerConfigs.h>
#include <unistd.h>
using ::android::hardware::configstore::V1_1::ISurfaceFlingerConfigs;
using ::android::sp;
#define ASSERT_OK(ret) ASSERT_TRUE(ret.isOk())
#define EXPECT_OK(ret) EXPECT_TRUE(ret.isOk())
class ConfigstoreHidlTest : public ::testing::VtsHalHidlTargetTestBase {
public:
sp<ISurfaceFlingerConfigs> sfConfigs;
virtual void SetUp() override {
sfConfigs = ::testing::VtsHalHidlTargetTestBase::getService<ISurfaceFlingerConfigs>();
ASSERT_NE(sfConfigs, nullptr);
}
virtual void TearDown() override {}
};
/**
* Placeholder testcase.
*/
TEST_F(ConfigstoreHidlTest, Test) {
ASSERT_TRUE(true);
}
int main(int argc, char** argv) {
::testing::InitGoogleTest(&argc, argv);
int status = RUN_ALL_TESTS();
LOG(INFO) << "Test result = " << status;
return status;
}