Merge "Revert "init: dummy host_init_verifier for mac""

2 files changed, 25 insertions, 46 deletions

diff --git a/init/Android.bp b/init/Android.bp
index da0895f94..cf7637f96 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -227,41 +227,39 @@ cc_binary {
         "liblog",
         "libcutils",
     ],
+    srcs: [
+        "action.cpp",
+        "action_manager.cpp",
+        "action_parser.cpp",
+        "capabilities.cpp",
+        "descriptors.cpp",
+        "epoll.cpp",
+        "keychords.cpp",
+        "import_parser.cpp",
+        "host_import_parser.cpp",
+        "host_init_verifier.cpp",
+        "host_init_stubs.cpp",
+        "parser.cpp",
+        "rlimit_parser.cpp",
+        "tokenizer.cpp",
+        "service.cpp",
+        "subcontext.cpp",
+        "subcontext.proto",
+        "util.cpp",
+    ],
     proto: {
         type: "lite",
     },
+    generated_headers: [
+        "generated_stub_builtin_function_map",
+        "generated_android_ids"
+    ],
     target: {
-        linux: {
-            srcs: [
-                "action.cpp",
-                "action_manager.cpp",
-                "action_parser.cpp",
-                "capabilities.cpp",
-                "descriptors.cpp",
-                "epoll.cpp",
-                "keychords.cpp",
-                "import_parser.cpp",
-                "host_import_parser.cpp",
-                "host_init_verifier.cpp",
-                "host_init_stubs.cpp",
-                "parser.cpp",
-                "rlimit_parser.cpp",
-                "tokenizer.cpp",
-                "service.cpp",
-                "subcontext.cpp",
-                "subcontext.proto",
-                "util.cpp",
-            ],
-            generated_headers: [
-                "generated_stub_builtin_function_map",
-                "generated_android_ids",
-            ],
-        },
         android: {
             enabled: false,
         },
         darwin: {
-            srcs: ["mac_init_verifier.cpp"],
+            enabled: false,
         },
     },
 }
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 @@
-//
-// 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.
-//
-
-int main() {
-    return 0;
-}