Stop using #if for conditional compilation.
Use regular 'if' to prevent bitrot.
Also remove remaining typedefs.
Change-Id: I2e6ca928e2db29b88b643cf990ff05cfb0be94a6
diff --git a/init/Android.mk b/init/Android.mk
index ae472bd..bf8dea5 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -3,6 +3,24 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
+# --
+
+ifeq ($(strip $(INIT_BOOTCHART)),true)
+LOCAL_CPPFLAGS += -DBOOTCHART=1
+else
+LOCAL_CPPFLAGS += -DBOOTCHART=0
+endif
+
+ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
+LOCAL_CPPFLAGS += -DALLOW_LOCAL_PROP_OVERRIDE=1 -DALLOW_DISABLE_SELINUX=1
+else
+LOCAL_CPPFLAGS += -DALLOW_LOCAL_PROP_OVERRIDE=0 -DALLOW_DISABLE_SELINUX=0
+endif
+
+LOCAL_CPPFLAGS += -DLOG_UEVENTS=0
+
+# --
+
LOCAL_SRC_FILES:= \
bootchart.cpp \
builtins.cpp \
@@ -25,17 +43,6 @@
-Werror -Wno-error=deprecated-declarations \
-Wno-unused-parameter \
-ifeq ($(strip $(INIT_BOOTCHART)),true)
-LOCAL_CPPFLAGS += -DBOOTCHART=1
-endif
-
-ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
-LOCAL_CPPFLAGS += -DALLOW_LOCAL_PROP_OVERRIDE=1 -DALLOW_DISABLE_SELINUX=1
-endif
-
-# Enable ueventd logging
-#LOCAL_CPPFLAGS += -DLOG_UEVENTS=1
-
LOCAL_MODULE:= init
LOCAL_FORCE_STATIC_EXECUTABLE := true