Remove wait_for_keymaster and all references
No longer needed now init listens for property changes on a separate thread. Bug: 186580823 Test: Cuttlefish boots successfully Change-Id: I7dd1f85a73df6c2160ef8778703709e90309b9b4
This commit is contained in:
parent
ec78a94586
commit
604abdd0cb
3 changed files with 0 additions and 63 deletions
25
Android.bp
25
Android.bp
|
@ -188,13 +188,11 @@ cc_binary {
|
|||
static_libs: ["libvold"],
|
||||
init_rc: [
|
||||
"vold.rc",
|
||||
"wait_for_keymaster.rc",
|
||||
],
|
||||
|
||||
required: [
|
||||
"mke2fs",
|
||||
"vold_prepare_subdirs",
|
||||
"wait_for_keymaster",
|
||||
],
|
||||
|
||||
shared_libs: [
|
||||
|
@ -235,29 +233,6 @@ cc_binary {
|
|||
init_rc: ["vdc.rc"],
|
||||
}
|
||||
|
||||
cc_binary {
|
||||
name: "wait_for_keymaster",
|
||||
defaults: ["vold_default_flags"],
|
||||
|
||||
srcs: [
|
||||
"wait_for_keymaster.cpp",
|
||||
"Keystore.cpp",
|
||||
],
|
||||
shared_libs: [
|
||||
"libbase",
|
||||
"libbinder",
|
||||
"libbinder_ndk",
|
||||
|
||||
"android.system.keystore2-V1-ndk_platform",
|
||||
"android.security.maintenance-ndk_platform",
|
||||
"libhardware",
|
||||
"libhardware_legacy",
|
||||
"libhidlbase",
|
||||
"libkeymint_support",
|
||||
"libutils",
|
||||
],
|
||||
}
|
||||
|
||||
cc_binary {
|
||||
name: "secdiscard",
|
||||
defaults: ["vold_default_flags"],
|
||||
|
|
|
@ -1,33 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2018 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.
|
||||
*/
|
||||
|
||||
#include <android-base/logging.h>
|
||||
|
||||
#include "Keystore.h"
|
||||
|
||||
int main(int argc, char** argv) {
|
||||
setenv("ANDROID_LOG_TAGS", "*:v", 1);
|
||||
if (getppid() == 1) {
|
||||
// If init is calling us then it's during boot and we should log to kmsg
|
||||
android::base::InitLogging(argv, &android::base::KernelLogger);
|
||||
} else {
|
||||
android::base::InitLogging(argv, &android::base::StderrLogger);
|
||||
}
|
||||
LOG(INFO) << "Waiting for Keystore to be ready";
|
||||
android::vold::Keystore keystore;
|
||||
LOG(INFO) << "Keystore ready";
|
||||
return 0;
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
service wait_for_keymaster /system/bin/wait_for_keymaster
|
||||
user root
|
||||
group root system
|
||||
priority -20
|
||||
ioprio rt 0
|
Loading…
Reference in a new issue