commit 7df6b5fc79a0f4521d171280cd431640ac567d27
author Josh Gao <jmgao@google.com> Thu Nov 12 11:54:47 2015 -0800
committer Josh Gao <jmgao@google.com> Thu Nov 12 11:54:47 2015 -0800
tree 75b1bb9e180a2d0001065a56962014f07720d768
parent b7b1edf974a93cc4bb9a2de7a5e9c9bce9ad178b

libbase: remove exit-time destructors.

Removed for the same reason as the adb exit-time destructors.

Bug: http://b/23384853
Change-Id: Ic124ecb9df132b850a3855e207baffec926dde29

base/Android.mk

diff --git a/base/Android.mk b/base/Android.mk
index 613636b..5a0ad05 100644
--- a/base/Android.mk
+++ b/base/Android.mk
@@ -36,6 +36,12 @@
     -Wextra \
     -Werror \
 
+libbase_linux_cppflags := \
+    -Wexit-time-destructors \
+
+libbase_darwin_cppflags := \
+    -Wexit-time-destructors \
+
 # Device
 # ------------------------------------------------------------------------------
 include $(CLEAR_VARS)
@@ -43,7 +49,7 @@
 LOCAL_CLANG := true
 LOCAL_SRC_FILES := $(libbase_src_files)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_CPPFLAGS := $(libbase_cppflags)
+LOCAL_CPPFLAGS := $(libbase_cppflags) $(libbase_linux_cppflags)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 LOCAL_STATIC_LIBRARIES := libcutils
 LOCAL_MULTILIB := both
@@ -66,6 +72,8 @@
 LOCAL_SRC_FILES := $(libbase_src_files)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
 LOCAL_CPPFLAGS := $(libbase_cppflags)
+LOCAL_CPPFLAGS_darwin := $(libbase_darwin_cppflags)
+LOCAL_CPPFLAGS_linux := $(libbase_linux_cppflags)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 LOCAL_STATIC_LIBRARIES := libcutils
 LOCAL_MULTILIB := both