From 11a113a67e87a8da9a9bf0a73883f2325de90934 Mon Sep 17 00:00:00 2001 From: Sundong Ahn Date: Fri, 13 Mar 2020 17:51:26 +0900 Subject: [PATCH] Add disable_configstore The disable_configstore is added to disable configstore when API level is less than or equal to 29. Bug: 150761042 Test: Add disable_configstore to PRODUCT_PACKAGES && build && check configstore service Change-Id: Iac01bb375a5c4080c0e110213c64041ea823ed68 Merged-In: Iac01bb375a5c4080c0e110213c64041ea823ed68 (cherry picked from commit d864334675e83a75c0343510cff3fc90ffb14c51) --- configstore/1.1/default/Android.mk | 11 +++++++++++ .../1.1/default/disable_configstore.cpp | 19 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 configstore/1.1/default/disable_configstore.cpp diff --git a/configstore/1.1/default/Android.mk b/configstore/1.1/default/Android.mk index e7edc34150..6b7bb004e3 100644 --- a/configstore/1.1/default/Android.mk +++ b/configstore/1.1/default/Android.mk @@ -35,3 +35,14 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/seccomp_policy LOCAL_SRC_FILES := seccomp_policy/configstore@1.1-$(TARGET_ARCH).policy include $(BUILD_PREBUILT) endif + +# disable configstore +include $(CLEAR_VARS) +LOCAL_MODULE := disable_configstore +LOCAL_MODULE_CLASS := EXECUTABLES +LOCAL_SRC_FILES:= disable_configstore.cpp +LOCAL_OVERRIDES_MODULES := android.hardware.configstore@1.1-service +LOCAL_VENDOR_MODULE := true +LOCAL_UNINSTALLABLE_MODULE := true + +include $(BUILD_EXECUTABLE) diff --git a/configstore/1.1/default/disable_configstore.cpp b/configstore/1.1/default/disable_configstore.cpp new file mode 100644 index 0000000000..b727ddb293 --- /dev/null +++ b/configstore/1.1/default/disable_configstore.cpp @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2020 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. + */ + +int main() { + return 1; +}