From e91fff0a2dfe7d312286b140c8069c820627da8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= Date: Tue, 28 Jan 2014 19:57:02 -0800 Subject: [PATCH] Add BINDER_IPC_32BIT to CFLAGS unless TARGET_USES_64_BIT_BINDER is true Change-Id: I96c643123b0314c361b7f48a18d5c22c660d4ff5 --- cmds/servicemanager/Android.mk | 4 ++++ libs/binder/Android.mk | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/cmds/servicemanager/Android.mk b/cmds/servicemanager/Android.mk index 138be5232..12149f621 100644 --- a/cmds/servicemanager/Android.mk +++ b/cmds/servicemanager/Android.mk @@ -3,6 +3,10 @@ LOCAL_PATH:= $(call my-dir) 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 diff --git a/libs/binder/Android.mk b/libs/binder/Android.mk index f3f8dafc2..3c6b8ad90 100644 --- a/libs/binder/Android.mk +++ b/libs/binder/Android.mk @@ -42,6 +42,9 @@ LOCAL_LDLIBS += -lpthread 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_LDLIBS += -lpthread 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)