diff options
| author | Arve Hjønnevåg <arve@android.com> | 2014-01-28 19:57:02 -0800 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2014-01-31 15:50:59 -0800 |
| commit | e91fff0a2dfe7d312286b140c8069c820627da8c (patch) | |
| tree | f2ca8f870fc6bd53b63cd5a801d15c3a0bf94b8e | |
| parent | f683e0163a84d93448b9388126902242367cd961 (diff) | |
| download | frameworks_native-e91fff0a2dfe7d312286b140c8069c820627da8c.zip frameworks_native-e91fff0a2dfe7d312286b140c8069c820627da8c.tar.gz frameworks_native-e91fff0a2dfe7d312286b140c8069c820627da8c.tar.bz2 | |
Add BINDER_IPC_32BIT to CFLAGS unless TARGET_USES_64_BIT_BINDER is true
Change-Id: I96c643123b0314c361b7f48a18d5c22c660d4ff5
| -rw-r--r-- | cmds/servicemanager/Android.mk | 4 | ||||
| -rw-r--r-- | libs/binder/Android.mk | 6 |
2 files changed, 10 insertions, 0 deletions
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 @@ 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 f3f8daf..3c6b8ad 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) |