diff options
| author | Ben Murdoch <benm@google.com> | 2017-03-14 14:27:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-14 14:27:22 +0000 |
| commit | 98db1e01f636aa3fc949343ff81e3c4f099ecc53 (patch) | |
| tree | 48ff7cd0cd0ad01bea3d7c0fd3d867abe5049e1c | |
| parent | 03b0261c2b83e94108e7b5c2cfc11497666e95d0 (diff) | |
| parent | 009d5d267c5b6448c55d37b8cb72627ec6ebf9ee (diff) | |
| download | v8-98db1e01f636aa3fc949343ff81e3c4f099ecc53.tar.gz | |
Merge "Fix build break on Mac." am: a254efc1e2 am: 16c7928a6c
am: 009d5d267c
Change-Id: Ibdf51941b576300b04d4553723d12c20b2d0ff0d
| -rw-r--r-- | Android.base.mk | 5 | ||||
| -rw-r--r-- | genmakefiles.py | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Android.base.mk b/Android.base.mk index 9f73691b..9d00e063 100644 --- a/Android.base.mk +++ b/Android.base.mk @@ -51,11 +51,12 @@ LOCAL_SRC_FILES := \ 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 44b08ee9..10fa7524 100644 --- a/genmakefiles.py +++ b/genmakefiles.py @@ -262,11 +262,12 @@ def _writeLibBaseMakefile(target): # 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') |