commit bde72e302536d6623fe5f7b14794229c6a26605a
author Elliott Hughes <enh@google.com> Fri Mar 07 01:33:19 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 07 01:33:19 2014 +0000
tree 92e4f1c2d86044750c907e41f510959112803a04
parent 25e389080c5ce6fe53917b9adbb8f54e281d2e33
parent 469f15339dd2ea7458d12bcdff802d26dcffbcd7

am 469f1533: Merge "Fix build by defining LOCAL_PATH early enough."

* commit '469f15339dd2ea7458d12bcdff802d26dcffbcd7':
  Fix build by defining LOCAL_PATH early enough.

libcorkscrew/Android.mk

diff --git a/libcorkscrew/Android.mk b/libcorkscrew/Android.mk
index 440dfe5..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 \
@@ -70,8 +70,7 @@
 
 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_TAGS := optional
 include $(BUILD_HOST_EXECUTABLE)
 
-endif # HOST_ARCH == x86
+endif # $(HOST_OS)-$(HOST_ARCH) == linux-x86