commit 5434bf6640af7145986d63968846ba7168dab406
author Elliott Hughes <enh@google.com> Fri Jan 31 01:48:15 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 31 01:48:16 2014 +0000
tree eb6a76e9113964e1f6ea336a8e250813d17ae4b4
parent 469f15339dd2ea7458d12bcdff802d26dcffbcd7
parent c6c194ced095df5e777b8fa24527ebd29c8fef54

Merge "LP64: Enable debuggerd/libbacktrace/libunwind."

libcorkscrew/Android.mk

diff --git a/libcorkscrew/Android.mk b/libcorkscrew/Android.mk
index f96fc4e..76d6919 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 \
@@ -68,9 +68,9 @@
 LOCAL_MODULE_TAGS := optional
 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.
@@ -97,6 +97,4 @@
 LOCAL_MODULE_TAGS := optional
 include $(BUILD_HOST_EXECUTABLE)
 
-endif # HOST_ARCH == x86
-
-endif # TARGET_IS_64_BIT == false
+endif # $(HOST_OS)-$(HOST_ARCH) == linux-x86