From f3ad11cf3ce60436bcdeec577d1e35c67ccae460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= Date: Mon, 3 Feb 2014 14:46:30 -0800 Subject: [PATCH] Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set. Change-Id: I46a29939fa29ec9421ab6dff3285502f69a31745 --- cmds/servicemanager/Android.mk | 2 ++ libs/binder/Android.mk | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/cmds/servicemanager/Android.mk b/cmds/servicemanager/Android.mk index 12149f621..4ab8df68f 100644 --- a/cmds/servicemanager/Android.mk +++ b/cmds/servicemanager/Android.mk @@ -4,8 +4,10 @@ svc_c_flags = \ -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 3c6b8ad90..673fc8238 100644 --- a/libs/binder/Android.mk +++ b/libs/binder/Android.mk @@ -43,8 +43,10 @@ LOCAL_MODULE := libbinder 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_MODULE := libbinder 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)