diff options
| author | Elliott Hughes <enh@google.com> | 2014-01-31 01:39:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-31 01:39:50 +0000 |
| commit | 469f15339dd2ea7458d12bcdff802d26dcffbcd7 (patch) | |
| tree | 617d5a13c433840998dfe766fecd94397d24bd9a | |
| parent | 525155ac49bae98e9f50ce667609c32eeccc80be (diff) | |
| parent | bf857aeae39304bde323db06c1f59ff4579c37f6 (diff) | |
Merge "Fix build by defining LOCAL_PATH early enough."
| -rw-r--r-- | libcorkscrew/Android.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libcorkscrew/Android.mk b/libcorkscrew/Android.mk index 440dfe5691..76d6919088 100644 --- a/libcorkscrew/Android.mk +++ b/libcorkscrew/Android.mk @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -ifeq ($(TARGET_IS_64_BIT), false) - LOCAL_PATH:= $(call my-dir) +ifeq ($(TARGET_IS_64_BIT), false) + generic_src_files := \ backtrace.c \ backtrace-helper.c \ @@ -70,8 +70,7 @@ include $(BUILD_EXECUTABLE) endif # TARGET_IS_64_BIT == false -# TODO: reenable darwin-x86 -# ifeq ($(HOST_ARCH),x86) + ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86) # Build libcorkscrew. @@ -98,4 +97,4 @@ LOCAL_MODULE := libcorkscrew_test LOCAL_MODULE_TAGS := optional include $(BUILD_HOST_EXECUTABLE) -endif # HOST_ARCH == x86 +endif # $(HOST_OS)-$(HOST_ARCH) == linux-x86 |