AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Build the target protobuf libraries against the NDK

Browse Source 
This change unbundled the protobuf target libraries, so they can be used
in unbundled branches.

Change-Id: Ic4948f27395b2c2b81ea120d9e2353ba9aad02a8
This commit is contained in:
Ying Wang 2012-06-14 18:32:34 -07:00
parent 17892bccbb
commit 4747b03ac1
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Android.mk
View File

@ -180,15 +180,8 @@ LOCAL_SRC_FILES := $(CC_LITE_SRC_FILES)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/android \
bionic \
$(LOCAL_PATH)/src
LOCAL_SHARED_LIBRARIES := \
libcutils libutils
LOCAL_C_INCLUDES += external/stlport/stlport
LOCAL_SHARED_LIBRARIES += libstlport
# Define the header files to be copied
#LOCAL_COPY_HEADERS := \
# src/google/protobuf/stubs/once.h \
@ -203,6 +196,15 @@ LOCAL_SHARED_LIBRARIES += libstlport
LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI
ifeq ($(TARGET_ARCH),arm)
# These are the minimum versions and don't need to be update.
LOCAL_NDK_VERSION := 4
LOCAL_SDK_VERSION := 8
endif
LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
include $(BUILD_STATIC_LIBRARY)
# C++ full library
@ -242,15 +244,11 @@ LOCAL_SRC_FILES := \
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/android \
bionic \
external/zlib \
$(LOCAL_PATH)/src
LOCAL_SHARED_LIBRARIES := \
libz libcutils libutils
LOCAL_C_INCLUDES += external/stlport/stlport
LOCAL_SHARED_LIBRARIES += libstlport
libz libstlport
# Define the header files to be copied
#LOCAL_COPY_HEADERS := \
@ -266,6 +264,13 @@ LOCAL_SHARED_LIBRARIES += libstlport
LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI
ifeq ($(TARGET_ARCH),arm)
# These are the minimum versions and don't need to be update.
LOCAL_NDK_VERSION := 4
LOCAL_SDK_VERSION := 8
endif
include external/stlport/libstlport.mk
include $(BUILD_STATIC_LIBRARY)
# Android Protocol buffer compiler, aprotoc (host executable)