diff options
| author | Ying Wang <wangying@google.com> | 2012-08-14 10:28:02 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-08-14 12:02:51 -0700 |
| commit | b74eb3fc65db645cf1c52552e77127e073c93685 (patch) | |
| tree | 858a62c6a68770ba96e0a0acc18bb585f98ea7de /Android.mk | |
| parent | 4747b03ac113a32a12f526f5b26f096887a32e8b (diff) | |
| download | protobuf-b74eb3fc65db645cf1c52552e77127e073c93685.tar.gz protobuf-b74eb3fc65db645cf1c52552e77127e073c93685.tar.bz2 protobuf-b74eb3fc65db645cf1c52552e77127e073c93685.zip | |
Retire LOCAL_NDK_VERSION.
Bug: 6932421
Change-Id: Ieaad80daf4e6a4a7f058dd242f37a144e8ee9e76
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -198,13 +198,12 @@ 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 +LOCAL_NDK_STL_VARIANT := stlport_static +else +include external/stlport/libstlport.mk endif -LOCAL_SHARED_LIBRARIES += libstlport - -include external/stlport/libstlport.mk include $(BUILD_STATIC_LIBRARY) # C++ full library @@ -247,9 +246,6 @@ LOCAL_C_INCLUDES := \ external/zlib \ $(LOCAL_PATH)/src -LOCAL_SHARED_LIBRARIES := \ - libz libstlport - # Define the header files to be copied #LOCAL_COPY_HEADERS := \ # src/google/protobuf/stubs/once.h \ @@ -266,11 +262,12 @@ 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 +LOCAL_NDK_STL_VARIANT := stlport_static +else +include external/stlport/libstlport.mk endif -include external/stlport/libstlport.mk include $(BUILD_STATIC_LIBRARY) # Android Protocol buffer compiler, aprotoc (host executable) |