diff options
| author | Elliott Hughes <enh@google.com> | 2015-02-04 14:46:36 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-02-04 17:16:11 -0800 |
| commit | c0e919c92062360a69b771722677d041c9998403 (patch) | |
| tree | 8d082ff796a482fd305a00640a5c83dd0a258d12 /init/Android.mk | |
| parent | 27d28d3baff860d1fd936a5fcf2d920577c52575 (diff) | |
| download | system_core-c0e919c92062360a69b771722677d041c9998403.zip system_core-c0e919c92062360a69b771722677d041c9998403.tar.gz system_core-c0e919c92062360a69b771722677d041c9998403.tar.bz2 | |
Stop using #if for conditional compilation.
Use regular 'if' to prevent bitrot.
Also remove remaining typedefs.
Change-Id: I2e6ca928e2db29b88b643cf990ff05cfb0be94a6
Diffstat (limited to 'init/Android.mk')
| -rw-r--r-- | init/Android.mk | 29 |
1 files changed, 18 insertions, 11 deletions
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 @@ LOCAL_CPPFLAGS += \ -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 |