commit ba91e5af4510536f1c66a7d2183c976d430788f6
author Arve Hjønnevåg <arve@android.com> Tue Feb 04 02:10:18 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Feb 04 02:10:18 2014 +0000
tree 241f64144ed05b43af9790ccdb19f567dfae7438
parent 88f6ad18de946307b9b1db68faad84b991528e88
parent 8641112a1c3d4ff3ed68131d07eed01b715ac906

am 8641112a: am 4e7fd950: Merge "Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set."

* commit '8641112a1c3d4ff3ed68131d07eed01b715ac906':
  Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set.

cmds/servicemanager/Android.mk

diff --git a/cmds/servicemanager/Android.mk b/cmds/servicemanager/Android.mk
index 12149f6..4ab8df6 100644
--- a/cmds/servicemanager/Android.mk
+++ b/cmds/servicemanager/Android.mk
@@ -4,8 +4,10 @@
 	-Wall -Wextra \
 
 ifneq ($(TARGET_USES_64_BIT_BINDER),true)
+ifneq ($(TARGET_IS_64_BIT),true)
 svc_c_flags += -DBINDER_IPC_32BIT=1
 endif
+endif
 
 include $(CLEAR_VARS)
 LOCAL_SHARED_LIBRARIES := liblog

libs/binder/Android.mk

diff --git a/libs/binder/Android.mk b/libs/binder/Android.mk
index 4ce5f97..d8ae0aa 100644
--- a/libs/binder/Android.mk
+++ b/libs/binder/Android.mk
@@ -44,8 +44,10 @@
 LOCAL_SHARED_LIBRARIES := liblog libcutils libutils
 LOCAL_SRC_FILES := $(sources)
 ifneq ($(TARGET_USES_64_BIT_BINDER),true)
+ifneq ($(TARGET_IS_64_BIT),true)
 LOCAL_CFLAGS += -DBINDER_IPC_32BIT=1
 endif
+endif
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -54,6 +56,8 @@
 LOCAL_STATIC_LIBRARIES += libutils
 LOCAL_SRC_FILES := $(sources)
 ifneq ($(TARGET_USES_64_BIT_BINDER),true)
+ifneq ($(TARGET_IS_64_BIT),true)
 LOCAL_CFLAGS += -DBINDER_IPC_32BIT=1
 endif
+endif
 include $(BUILD_STATIC_LIBRARY)