commit bddf3893836a014e7c2e664a50acd2e640f6f561
author Elliott Hughes <enh@google.com> Mon Jun 13 22:06:30 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jun 13 22:06:30 2016 +0000
tree 86b0ca466ccf9e130a0a4ab94f91b58c3abdf888
parent 9d44d9dd53bd3da3b01445a52b5d2420dc40f9b2
parent 1fe2b737ad19056bc2bc298b7c30ac93d36a4f6b

Fix the build flags. am: f2233f4546 am: 425c5485df am: cd960ab4e9
am: 1fe2b737ad

Change-Id: I14c4bb4494b6d7eb991bed9a1b79b5f5aaa0c01e

Android.mk

diff --git a/Android.mk b/Android.mk
index 6878e8a..0f53ed9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,17 +14,17 @@
 
 LOCAL_PATH := $(call my-dir)
 
-rootdev_CPPFLAGS := -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-  -D_LARGEFILE64_SOURCE
-
-rootdev_CFLAGS := -Wall -Werror -Wno-sign-compare
+rootdev_CFLAGS := \
+  -D_BSD_SOURCE \
+  -D_FILE_OFFSET_BITS=64 \
+  -D_LARGEFILE_SOURCE \
+  -Wall -Werror -Wno-sign-compare \
 
 # Build the shared library.
 include $(CLEAR_VARS)
 LOCAL_MODULE := librootdev
 LOCAL_CFLAGS += $(rootdev_CFLAGS)
 LOCAL_CLANG := true
-LOCAL_CPPFLAGS += $(rootdev_CPPFLAGS)
 LOCAL_SRC_FILES := rootdev.c
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 include $(BUILD_SHARED_LIBRARY)
@@ -34,7 +34,6 @@
 LOCAL_MODULE := rootdev
 LOCAL_CFLAGS += $(rootdev_CFLAGS)
 LOCAL_CLANG := true
-LOCAL_CPPFLAGS += $(rootdev_CPPFLAGS)
 LOCAL_SHARED_LIBRARIES := librootdev
 LOCAL_SRC_FILES := main.c
 include $(BUILD_EXECUTABLE)