toybox: fix build in 6.0 tree
When building with TW_USE_TOOLBOX, build currently fails.
This patch fixes those build errors.
Change-Id: I041523d93a3fa9624fee80679e521750b4f9edfa
diff --git a/toybox/Android.mk b/toybox/Android.mk
index c88f360..687982c 100644
--- a/toybox/Android.mk
+++ b/toybox/Android.mk
@@ -189,6 +189,15 @@
toys/posix/wc.c \
toys/posix/xargs.c
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -eq 26; echo $$?),0)
+# Android 8.0 had some tools in different paths
+LOCAL_SRC_FILES += \
+ toys/pending/dmesg.c
+else
+LOCAL_SRC_FILES += \
+ toys/lsb/dmesg.c
+endif
+
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 23; echo $$?),0)
# there are some conflicts here with AOSP-7.[01] and CM-14.[01]
# the following items have been removed for compatibility
@@ -222,14 +231,6 @@
LOCAL_SRC_FILES += \
toys/pending/xzcat.c
endif
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -eq 26; echo $$?),0)
-# Android 8.0 had some tools in different paths
-LOCAL_SRC_FILES += \
- toys/pending/dmesg.c
-else
-LOCAL_SRC_FILES += \
- toys/lsb/dmesg.c
-endif
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 25; echo $$?),0)
# Android 8.0/8.1 had some tools in different paths
@@ -319,6 +320,7 @@
endif
LOCAL_CFLAGS += \
+ -std=c99 \
-std=gnu11 \
-Os \
-Wno-char-subscripts \
@@ -330,8 +332,13 @@
-ffunction-sections -fdata-sections \
-fno-asynchronous-unwind-tables \
-toybox_version := $(shell sed 's/#define.*TOYBOX_VERSION.*"\(.*\)"/\1/p;d' $(LOCAL_PATH)/main.c)
-LOCAL_CFLAGS += -DTOYBOX_VERSION=\"$(toybox_version)\"
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 24; echo $$?),0)
+ toybox_version := $(shell git -C $(LOCAL_PATH) rev-parse --short=12 HEAD 2>/dev/null)-android
+ LOCAL_CFLAGS += -DTOYBOX_VERSION='"$(toybox_version)"'
+else
+ toybox_version := $(shell sed 's/#define.*TOYBOX_VERSION.*"\(.*\)"/\1/p;d' $(LOCAL_PATH)/main.c)
+ LOCAL_CFLAGS += -DTOYBOX_VERSION=\"$(toybox_version)\"
+endif
LOCAL_CLANG := true