Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8641112a authored by Arve Hjønnevåg's avatar Arve Hjønnevåg Committed by Android Git Automerger
Browse files

am 4e7fd950: Merge "Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER... 

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

* commit '4e7fd950':
  Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set.
parents c93865de 4e7fd950

cmds/servicemanager/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -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

libs/binder/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -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)