commit e91fff0a2dfe7d312286b140c8069c820627da8c
author Arve Hjønnevåg <arve@android.com> Tue Jan 28 19:57:02 2014 -0800
committer Arve Hjønnevåg <arve@android.com> Fri Jan 31 15:50:59 2014 -0800
tree f2ca8f870fc6bd53b63cd5a801d15c3a0bf94b8e
parent f683e0163a84d93448b9388126902242367cd961

Add BINDER_IPC_32BIT to CFLAGS unless TARGET_USES_64_BIT_BINDER is true

Change-Id: I96c643123b0314c361b7f48a18d5c22c660d4ff5

cmds/servicemanager/Android.mk

diff --git a/cmds/servicemanager/Android.mk b/cmds/servicemanager/Android.mk
index 138be52..12149f6 100644
--- a/cmds/servicemanager/Android.mk
+++ b/cmds/servicemanager/Android.mk
@@ -3,6 +3,10 @@
 svc_c_flags =	\
 	-Wall -Wextra \
 
+ifneq ($(TARGET_USES_64_BIT_BINDER),true)
+svc_c_flags += -DBINDER_IPC_32BIT=1
+endif
+
 include $(CLEAR_VARS)
 LOCAL_SHARED_LIBRARIES := liblog
 LOCAL_SRC_FILES := bctest.c binder.c

libs/binder/Android.mk

diff --git a/libs/binder/Android.mk b/libs/binder/Android.mk
index f3f8daf..3c6b8ad 100644
--- a/libs/binder/Android.mk
+++ b/libs/binder/Android.mk
@@ -42,6 +42,9 @@
 LOCAL_MODULE := libbinder
 LOCAL_SHARED_LIBRARIES := liblog libcutils libutils
 LOCAL_SRC_FILES := $(sources)
+ifneq ($(TARGET_USES_64_BIT_BINDER),true)
+LOCAL_CFLAGS += -DBINDER_IPC_32BIT=1
+endif
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -49,4 +52,7 @@
 LOCAL_MODULE := libbinder
 LOCAL_STATIC_LIBRARIES += libutils
 LOCAL_SRC_FILES := $(sources)
+ifneq ($(TARGET_USES_64_BIT_BINDER),true)
+LOCAL_CFLAGS += -DBINDER_IPC_32BIT=1
+endif
 include $(BUILD_STATIC_LIBRARY)