diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2012-09-25 18:26:02 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2012-09-25 18:26:02 -0700 |
| commit | f5acb16b4e8b57f5be4083960023982443bddbca (patch) | |
| tree | 35684d8f5258c3182572f29c11b52024fd69c915 | |
| parent | 5cf421ebe11c8e9b6f05eb4af05cbecd81394bfc (diff) | |
| parent | 533ab1b935a8f52c7fcd2a6982ce83f977aad3f6 (diff) | |
| download | android_external_protobuf-c-cm-14.0.tar.gz android_external_protobuf-c-cm-14.0.tar.bz2 android_external_protobuf-c-cm-14.0.zip | |
Merge "Compiling protobuf-c in Android Build"HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001cm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eacm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56staging/cm-12.1staging/cm-12.0-cafstable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Estable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Cstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Istable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0cm-14.1cm-14.0cm-13.0cm-12.1cm-12.0cm-11.0
| -rwxr-xr-x | Android.mk | 32 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/google/protobuf-c/protobuf-c-data-buffer.c | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/google/protobuf-c/protobuf-c-dispatch.c | 2 |
3 files changed, 34 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk new file mode 100755 index 0000000..88cebe7 --- /dev/null +++ b/Android.mk @@ -0,0 +1,32 @@ + +LOCAL_PATH := $(call my-dir) + +C_SRC_FILES := \ + src/google/protobuf-c/protobuf-c-rpc.c \ + src/google/protobuf-c/protobuf-c-dispatch.c \ + src/google/protobuf-c/protobuf-c-data-buffer.c \ + src/google/protobuf-c/protobuf-c.c + +# C library +# ======================================================= +include $(CLEAR_VARS) + +LOCAL_MODULE := libprotobuf-c +LOCAL_MODULE_TAGS := debug + +LOCAL_SRC_FILES := $(C_SRC_FILES) + +LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/src + +LOCAL_COPY_HEADERS_TO := protobuf-c/include/google/protobuf-c/ +LOCAL_COPY_HEADERS := ./src/google/protobuf-c/protobuf-c.h +LOCAL_COPY_HEADERS += ./src/google/protobuf-c/protobuf-c-private.h + +LOCAL_SHARED_LIBRARIES := \ + libcutils libutils + +LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI -DHAVE_SYS_POLL_H -DHAVE_ALLOCA_H -DHAVE_UNISTD_H + +include $(BUILD_STATIC_LIBRARY) + diff --git a/src/google/protobuf-c/protobuf-c-data-buffer.c b/src/google/protobuf-c/protobuf-c-data-buffer.c index c7ead5d..4549c3b 100644..100755 --- a/src/google/protobuf-c/protobuf-c-data-buffer.c +++ b/src/google/protobuf-c/protobuf-c-data-buffer.c @@ -35,7 +35,7 @@ #include <errno.h> #if HAVE_ALLOCA_H # include <alloca.h> -#elif HAVE_MALLOC_H +#elif defined HAVE_MALLOC_H # include <malloc.h> #endif #include <stdlib.h> diff --git a/src/google/protobuf-c/protobuf-c-dispatch.c b/src/google/protobuf-c/protobuf-c-dispatch.c index ff1e0e0..e280d77 100644..100755 --- a/src/google/protobuf-c/protobuf-c-dispatch.c +++ b/src/google/protobuf-c/protobuf-c-dispatch.c @@ -51,7 +51,7 @@ #include <assert.h> #if HAVE_ALLOCA_H # include <alloca.h> -#elif HAVE_MALLOC_H +#elif defined HAVE_MALLOC_H # include <malloc.h> #endif #include <sys/time.h> |