Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set.
Change-Id: I46a29939fa29ec9421ab6dff3285502f69a31745
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
diff --git a/libs/binder/Android.mk b/libs/binder/Android.mk
index 3c6b8ad..673fc82 100644
--- a/libs/binder/Android.mk
+++ b/libs/binder/Android.mk
@@ -43,8 +43,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)
@@ -53,6 +55,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)