summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorYifan Hong2018-06-20 17:49:48 -0500
committerYifan Hong2018-06-20 17:49:48 -0500
commit3c4aa11cabde564fc5a515cdff2ba77a26d5dfd9 (patch)
tree3518071e0a39ec87e74ea0ac8b1e5f97f566b566 /init
parentf567367584aaa8eb5f3b701e0548876de1cad2d0 (diff)
downloadplatform-system-core-3c4aa11cabde564fc5a515cdff2ba77a26d5dfd9.tar.gz
platform-system-core-3c4aa11cabde564fc5a515cdff2ba77a26d5dfd9.tar.xz
platform-system-core-3c4aa11cabde564fc5a515cdff2ba77a26d5dfd9.zip
Revert "init: dummy host_init_verifier for mac"
This reverts commit f567367584aaa8eb5f3b701e0548876de1cad2d0. Reason for revert: mac build Change-Id: Icd5d08206c50854d6645e07c4fb29705222bd226
Diffstat (limited to 'init')
-rw-r--r--init/Android.bp52
-rw-r--r--init/mac_init_verifier.cpp19
2 files changed, 25 insertions, 46 deletions
diff --git a/init/Android.bp b/init/Android.bp
index 41def212b..7d863c884 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -227,41 +227,39 @@ cc_binary {
227 "liblog", 227 "liblog",
228 "libcutils", 228 "libcutils",
229 ], 229 ],
230 srcs: [
231 "action.cpp",
232 "action_manager.cpp",
233 "action_parser.cpp",
234 "capabilities.cpp",
235 "descriptors.cpp",
236 "epoll.cpp",
237 "keychords.cpp",
238 "import_parser.cpp",
239 "host_import_parser.cpp",
240 "host_init_verifier.cpp",
241 "host_init_stubs.cpp",
242 "parser.cpp",
243 "rlimit_parser.cpp",
244 "tokenizer.cpp",
245 "service.cpp",
246 "subcontext.cpp",
247 "subcontext.proto",
248 "util.cpp",
249 ],
230 proto: { 250 proto: {
231 type: "lite", 251 type: "lite",
232 }, 252 },
253 generated_headers: [
254 "generated_stub_builtin_function_map",
255 "generated_android_ids"
256 ],
233 target: { 257 target: {
234 linux: {
235 srcs: [
236 "action.cpp",
237 "action_manager.cpp",
238 "action_parser.cpp",
239 "capabilities.cpp",
240 "descriptors.cpp",
241 "epoll.cpp",
242 "keychords.cpp",
243 "import_parser.cpp",
244 "host_import_parser.cpp",
245 "host_init_verifier.cpp",
246 "host_init_stubs.cpp",
247 "parser.cpp",
248 "rlimit_parser.cpp",
249 "tokenizer.cpp",
250 "service.cpp",
251 "subcontext.cpp",
252 "subcontext.proto",
253 "util.cpp",
254 ],
255 generated_headers: [
256 "generated_stub_builtin_function_map",
257 "generated_android_ids",
258 ],
259 },
260 android: { 258 android: {
261 enabled: false, 259 enabled: false,
262 }, 260 },
263 darwin: { 261 darwin: {
264 srcs: ["mac_init_verifier.cpp"], 262 enabled: false,
265 }, 263 },
266 }, 264 },
267} 265}
diff --git a/init/mac_init_verifier.cpp b/init/mac_init_verifier.cpp
deleted file mode 100644
index 646509e1e..000000000
--- a/init/mac_init_verifier.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
1//
2// Copyright (C) 2018 The Android Open Source Project
3//
4// Licensed under the Apache License, Version 2.0 (the "License");
5// you may not use this file except in compliance with the License.
6// You may obtain a copy of the License at
7//
8// http://www.apache.org/licenses/LICENSE-2.0
9//
10// Unless required by applicable law or agreed to in writing, software
11// distributed under the License is distributed on an "AS IS" BASIS,
12// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13// See the License for the specific language governing permissions and
14// limitations under the License.
15//
16
17int main() {
18 return 0;
19}