diff options
| author | Elliott Hughes <enh@google.com> | 2015-02-03 17:12:07 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-02-04 08:59:10 -0800 |
| commit | f3cf438714aa1284d8a58e2f3b108ba93f6d3abb (patch) | |
| tree | 3a1b726c6805315c280d745e8b742ec9542d58e9 /init/Android.mk | |
| parent | 5204b1580e0d0f38272c7da166eee9b88c14dc50 (diff) | |
| download | system_core-f3cf438714aa1284d8a58e2f3b108ba93f6d3abb.zip system_core-f3cf438714aa1284d8a58e2f3b108ba93f6d3abb.tar.gz system_core-f3cf438714aa1284d8a58e2f3b108ba93f6d3abb.tar.bz2 | |
Build init as C++.
This is just the minimal change to keep it building.
Change-Id: I245c5b8413a1db114576c81462eb5737f5ffcef2
Diffstat (limited to 'init/Android.mk')
| -rw-r--r-- | init/Android.mk | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/init/Android.mk b/init/Android.mk index 606c199..01ce4da 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -4,36 +4,35 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ - builtins.c \ - init.c \ - devices.c \ - property_service.c \ - util.c \ - parser.c \ - keychords.c \ - signal_handler.c \ - init_parser.c \ - ueventd.c \ - ueventd_parser.c \ - watchdogd.c - -LOCAL_CFLAGS += \ - -std=gnu11 \ + builtins.cpp \ + devices.cpp \ + init.cpp \ + init_parser.cpp \ + keychords.cpp \ + parser.cpp \ + property_service.cpp \ + signal_handler.cpp \ + ueventd.cpp \ + ueventd_parser.cpp \ + util.cpp \ + watchdogd.cpp \ + +LOCAL_CPPFLAGS += \ -Wall \ -Werror -Wno-error=deprecated-declarations \ -Wno-unused-parameter \ ifeq ($(strip $(INIT_BOOTCHART)),true) -LOCAL_SRC_FILES += bootchart.c -LOCAL_CFLAGS += -DBOOTCHART=1 +LOCAL_SRC_FILES += bootchart.cpp +LOCAL_CPPFLAGS += -DBOOTCHART=1 endif ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) -LOCAL_CFLAGS += -DALLOW_LOCAL_PROP_OVERRIDE=1 -DALLOW_DISABLE_SELINUX=1 +LOCAL_CPPFLAGS += -DALLOW_LOCAL_PROP_OVERRIDE=1 -DALLOW_DISABLE_SELINUX=1 endif # Enable ueventd logging -#LOCAL_CFLAGS += -DLOG_UEVENTS=1 +#LOCAL_CPPFLAGS += -DLOG_UEVENTS=1 LOCAL_MODULE:= init |