diff options
| author | Arve Hjønnevåg <arve@android.com> | 2014-02-03 22:11:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-03 22:11:16 +0000 |
| commit | 88f6ad18de946307b9b1db68faad84b991528e88 (patch) | |
| tree | 02557797a0049fd50686a2dad6b335fa4d27c5ff /libs/binder/Android.mk | |
| parent | 245602990821e48d6ca6ab05f288ca4747fb3680 (diff) | |
| parent | c93865de80a16d3638936890fb42eb175284044b (diff) | |
| download | frameworks_native-88f6ad18de946307b9b1db68faad84b991528e88.zip frameworks_native-88f6ad18de946307b9b1db68faad84b991528e88.tar.gz frameworks_native-88f6ad18de946307b9b1db68faad84b991528e88.tar.bz2 | |
am c93865de: am 58242fc2: Merge changes Ib0e5a037,I1bd7c38e,Icfc67c2a,I96c64312,I59528054, ...
* commit 'c93865de80a16d3638936890fb42eb175284044b':
ServiceManager: Implement PING_TRANSACTION
ServiceManager: Use 32/64 bit types from new binder header
Binder: Use 64 bit pointers in 32 processes if selected by the target
Add BINDER_IPC_32BIT to CFLAGS unless TARGET_USES_64_BIT_BINDER is true
Binder: Make binder portable
ServiceManager: Fix the binder interface
ServiceManager: Store handles in uint32_t instead of void *
ServiceManager: Generic Fixes
ServiceManager: Add extra error handling
ServiceManager: Fix Android.mk
ServiceManager: Make use of kernel exported structures
Diffstat (limited to 'libs/binder/Android.mk')
| -rw-r--r-- | libs/binder/Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libs/binder/Android.mk b/libs/binder/Android.mk index c8147ed..4ce5f97 100644 --- a/libs/binder/Android.mk +++ b/libs/binder/Android.mk @@ -43,6 +43,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) @@ -50,4 +53,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) |