diff options
| author | Arve Hjønnevåg <arve@android.com> | 2014-03-07 01:35:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 01:35:23 +0000 |
| commit | 72e7ac9ba4ded6a11c8bc37fbc8112b98ec3991d (patch) | |
| tree | c38f43a8af346b71c0aac74c75ad94f10b0ae310 /libs/binder | |
| parent | eea5b2984204a9da2a59a8092a4191a33c8e7640 (diff) | |
| parent | 4e7fd9506103dcc9750788caf1f94b8d1348f37b (diff) | |
| download | frameworks_native-72e7ac9ba4ded6a11c8bc37fbc8112b98ec3991d.zip frameworks_native-72e7ac9ba4ded6a11c8bc37fbc8112b98ec3991d.tar.gz frameworks_native-72e7ac9ba4ded6a11c8bc37fbc8112b98ec3991d.tar.bz2 | |
am 4e7fd950: Merge "Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set."
* commit '4e7fd9506103dcc9750788caf1f94b8d1348f37b':
Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set.
Diffstat (limited to 'libs/binder')
| -rw-r--r-- | libs/binder/Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/binder/Android.mk b/libs/binder/Android.mk index 3c6b8ad..673fc82 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) |