Merge "Fix build break on Mac."
diff --git a/Android.base.mk b/Android.base.mk
index 9f73691..9d00e06 100644
--- a/Android.base.mk
+++ b/Android.base.mk
@@ -51,11 +51,12 @@
src/base/utils/random-number-generator.cc
ifeq ($(HOST_OS),linux)
LOCAL_SRC_FILES += \
- src/base/platform/platform-linux.cc \
- src/base/debug/stack_trace_posix.cc
+ src/base/debug/stack_trace_posix.cc \
+ src/base/platform/platform-linux.cc
endif
ifeq ($(HOST_OS),darwin)
LOCAL_SRC_FILES += \
+ src/base/debug/stack_trace_posix.cc \
src/base/platform/platform-macos.cc
endif
LOCAL_C_INCLUDES := $(LOCAL_PATH)/src
diff --git a/genmakefiles.py b/genmakefiles.py
index 44b08ee..10fa752 100644
--- a/genmakefiles.py
+++ b/genmakefiles.py
@@ -262,11 +262,12 @@
# Host may be linux or darwin.
out.write('ifeq ($(HOST_OS),linux)\n')
out.write('LOCAL_SRC_FILES += \\\n')
- out.write('\tsrc/base/platform/platform-linux.cc \\\n')
- out.write('\tsrc/base/debug/stack_trace_posix.cc\n')
+ out.write('\tsrc/base/debug/stack_trace_posix.cc \\\n')
+ out.write('\tsrc/base/platform/platform-linux.cc\n')
out.write('endif\n')
out.write('ifeq ($(HOST_OS),darwin)\n')
out.write('LOCAL_SRC_FILES += \\\n')
+ out.write('\tsrc/base/debug/stack_trace_posix.cc \\\n')
out.write('\tsrc/base/platform/platform-macos.cc\n')
out.write('endif\n')
