diff options
Diffstat (limited to 'init/Android.mk')
-rw-r--r-- | init/Android.mk | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/init/Android.mk b/init/Android.mk index 42e42ecba..0db65cb94 100644 --- a/init/Android.mk +++ b/init/Android.mk | |||
@@ -9,12 +9,14 @@ init_options += \ | |||
9 | -DALLOW_LOCAL_PROP_OVERRIDE=1 \ | 9 | -DALLOW_LOCAL_PROP_OVERRIDE=1 \ |
10 | -DALLOW_PERMISSIVE_SELINUX=1 \ | 10 | -DALLOW_PERMISSIVE_SELINUX=1 \ |
11 | -DREBOOT_BOOTLOADER_ON_PANIC=1 \ | 11 | -DREBOOT_BOOTLOADER_ON_PANIC=1 \ |
12 | -DWORLD_WRITABLE_KMSG=1 \ | ||
12 | -DDUMP_ON_UMOUNT_FAILURE=1 | 13 | -DDUMP_ON_UMOUNT_FAILURE=1 |
13 | else | 14 | else |
14 | init_options += \ | 15 | init_options += \ |
15 | -DALLOW_LOCAL_PROP_OVERRIDE=0 \ | 16 | -DALLOW_LOCAL_PROP_OVERRIDE=0 \ |
16 | -DALLOW_PERMISSIVE_SELINUX=0 \ | 17 | -DALLOW_PERMISSIVE_SELINUX=0 \ |
17 | -DREBOOT_BOOTLOADER_ON_PANIC=0 \ | 18 | -DREBOOT_BOOTLOADER_ON_PANIC=0 \ |
19 | -DWORLD_WRITABLE_KMSG=0 \ | ||
18 | -DDUMP_ON_UMOUNT_FAILURE=0 | 20 | -DDUMP_ON_UMOUNT_FAILURE=0 |
19 | endif | 21 | endif |
20 | 22 | ||
@@ -59,11 +61,14 @@ include $(BUILD_HOST_NATIVE_TEST) | |||
59 | endif | 61 | endif |
60 | 62 | ||
61 | include $(CLEAR_VARS) | 63 | include $(CLEAR_VARS) |
64 | # b/38002385, work around clang-tidy segmentation fault. | ||
65 | LOCAL_TIDY_CHECKS := -misc-forwarding-reference-overload | ||
62 | LOCAL_CPPFLAGS := $(init_cflags) | 66 | LOCAL_CPPFLAGS := $(init_cflags) |
63 | LOCAL_SRC_FILES:= \ | 67 | LOCAL_SRC_FILES:= \ |
64 | action.cpp \ | 68 | action.cpp \ |
65 | capabilities.cpp \ | 69 | capabilities.cpp \ |
66 | descriptors.cpp \ | 70 | descriptors.cpp \ |
71 | devices.cpp \ | ||
67 | import_parser.cpp \ | 72 | import_parser.cpp \ |
68 | init_parser.cpp \ | 73 | init_parser.cpp \ |
69 | log.cpp \ | 74 | log.cpp \ |
@@ -79,11 +84,12 @@ LOCAL_CLANG := true | |||
79 | include $(BUILD_STATIC_LIBRARY) | 84 | include $(BUILD_STATIC_LIBRARY) |
80 | 85 | ||
81 | include $(CLEAR_VARS) | 86 | include $(CLEAR_VARS) |
87 | # b/38002385, work around clang-tidy segmentation fault. | ||
88 | LOCAL_TIDY_CHECKS := -misc-forwarding-reference-overload | ||
82 | LOCAL_CPPFLAGS := $(init_cflags) | 89 | LOCAL_CPPFLAGS := $(init_cflags) |
83 | LOCAL_SRC_FILES:= \ | 90 | LOCAL_SRC_FILES:= \ |
84 | bootchart.cpp \ | 91 | bootchart.cpp \ |
85 | builtins.cpp \ | 92 | builtins.cpp \ |
86 | devices.cpp \ | ||
87 | init.cpp \ | 93 | init.cpp \ |
88 | init_first_stage.cpp \ | 94 | init_first_stage.cpp \ |
89 | keychords.cpp \ | 95 | keychords.cpp \ |
@@ -91,7 +97,6 @@ LOCAL_SRC_FILES:= \ | |||
91 | reboot.cpp \ | 97 | reboot.cpp \ |
92 | signal_handler.cpp \ | 98 | signal_handler.cpp \ |
93 | ueventd.cpp \ | 99 | ueventd.cpp \ |
94 | ueventd_parser.cpp \ | ||
95 | watchdogd.cpp \ | 100 | watchdogd.cpp \ |
96 | 101 | ||
97 | LOCAL_MODULE:= init | 102 | LOCAL_MODULE:= init |
@@ -123,7 +128,8 @@ LOCAL_STATIC_LIBRARIES := \ | |||
123 | libsparse \ | 128 | libsparse \ |
124 | libz \ | 129 | libz \ |
125 | libprocessgroup \ | 130 | libprocessgroup \ |
126 | libavb | 131 | libavb \ |
132 | libkeyutils \ | ||
127 | 133 | ||
128 | # Create symlinks. | 134 | # Create symlinks. |
129 | LOCAL_POST_INSTALL_CMD := $(hide) mkdir -p $(TARGET_ROOT_OUT)/sbin; \ | 135 | LOCAL_POST_INSTALL_CMD := $(hide) mkdir -p $(TARGET_ROOT_OUT)/sbin; \ |
@@ -138,21 +144,26 @@ include $(BUILD_EXECUTABLE) | |||
138 | # Unit tests. | 144 | # Unit tests. |
139 | # ========================================================= | 145 | # ========================================================= |
140 | include $(CLEAR_VARS) | 146 | include $(CLEAR_VARS) |
147 | # b/38002385, work around clang-tidy segmentation fault. | ||
148 | LOCAL_TIDY_CHECKS := -misc-forwarding-reference-overload | ||
141 | LOCAL_MODULE := init_tests | 149 | LOCAL_MODULE := init_tests |
142 | LOCAL_SRC_FILES := \ | 150 | LOCAL_SRC_FILES := \ |
151 | devices_test.cpp \ | ||
143 | init_parser_test.cpp \ | 152 | init_parser_test.cpp \ |
153 | init_test.cpp \ | ||
144 | property_service_test.cpp \ | 154 | property_service_test.cpp \ |
145 | service_test.cpp \ | 155 | service_test.cpp \ |
146 | util_test.cpp \ | 156 | util_test.cpp \ |
147 | 157 | ||
148 | LOCAL_SHARED_LIBRARIES += \ | 158 | LOCAL_SHARED_LIBRARIES += \ |
149 | libcutils \ | ||
150 | libbase \ | 159 | libbase \ |
160 | libcutils \ | ||
161 | libselinux \ | ||
151 | 162 | ||
152 | LOCAL_STATIC_LIBRARIES := libinit | 163 | LOCAL_STATIC_LIBRARIES := libinit |
153 | LOCAL_SANITIZE := integer | 164 | LOCAL_SANITIZE := integer |
154 | LOCAL_CLANG := true | 165 | LOCAL_CLANG := true |
155 | LOCAL_CPPFLAGS := -Wall -Wextra -Werror | 166 | LOCAL_CPPFLAGS := -Wall -Wextra -Werror -std=gnu++1z |
156 | include $(BUILD_NATIVE_TEST) | 167 | include $(BUILD_NATIVE_TEST) |
157 | 168 | ||
158 | 169 | ||