ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set."

Browse Source
This commit is contained in:
Arve Hjønnevåg 2014-02-04 00:48:12 +00:00 committed by Gerrit Code Review
commit 4e7fd95061
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/servicemanager/Android.mk
View File

@ -4,8 +4,10 @@ svc_c_flags = \
-Wall -Wextra \ -Wall -Wextra \
ifneq ($(TARGET_USES_64_BIT_BINDER),true) ifneq ($(TARGET_USES_64_BIT_BINDER),true)
ifneq ($(TARGET_IS_64_BIT),true)
svc_c_flags += -DBINDER_IPC_32BIT=1 svc_c_flags += -DBINDER_IPC_32BIT=1
endif endif
endif
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SHARED_LIBRARIES := liblog LOCAL_SHARED_LIBRARIES := liblog

4
libs/binder/Android.mk
View File

@ -43,8 +43,10 @@ LOCAL_MODULE := libbinder
LOCAL_SHARED_LIBRARIES := liblog libcutils libutils LOCAL_SHARED_LIBRARIES := liblog libcutils libutils
LOCAL_SRC_FILES := $(sources) LOCAL_SRC_FILES := $(sources)
ifneq ($(TARGET_USES_64_BIT_BINDER),true) ifneq ($(TARGET_USES_64_BIT_BINDER),true)
ifneq ($(TARGET_IS_64_BIT),true)
LOCAL_CFLAGS += -DBINDER_IPC_32BIT=1 LOCAL_CFLAGS += -DBINDER_IPC_32BIT=1
endif endif
endif
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@ -53,6 +55,8 @@ LOCAL_MODULE := libbinder
LOCAL_STATIC_LIBRARIES += libutils LOCAL_STATIC_LIBRARIES += libutils
LOCAL_SRC_FILES := $(sources) LOCAL_SRC_FILES := $(sources)
ifneq ($(TARGET_USES_64_BIT_BINDER),true) ifneq ($(TARGET_USES_64_BIT_BINDER),true)
ifneq ($(TARGET_IS_64_BIT),true)
LOCAL_CFLAGS += -DBINDER_IPC_32BIT=1 LOCAL_CFLAGS += -DBINDER_IPC_32BIT=1
endif endif
endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)