diff options
| author | Ying Wang <wangying@google.com> | 2012-06-14 18:32:34 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-06-15 14:37:32 -0700 |
| commit | 77f19bf165314eb40918e43154f5047e7be8fb27 (patch) | |
| tree | b6394605d81ef4bbea82cb382b134b836c909636 /Android.mk | |
| parent | 6b42a64f2e36e5a34b99a5c3054658ccf9735b39 (diff) | |
| download | external_protobuf-77f19bf165314eb40918e43154f5047e7be8fb27.zip external_protobuf-77f19bf165314eb40918e43154f5047e7be8fb27.tar.gz external_protobuf-77f19bf165314eb40918e43154f5047e7be8fb27.tar.bz2 | |
Build the target protobuf libraries against the NDK
This change unbundled the protobuf target libraries, so they can be used
in unbundled branches.
Change-Id: Ic4948f27395b2c2b81ea120d9e2353ba9aad02a8
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 29 |
1 files changed, 17 insertions, 12 deletions
@@ -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) |