From b74eb3fc65db645cf1c52552e77127e073c93685 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Tue, 14 Aug 2012 10:28:02 -0700 Subject: [PATCH] Retire LOCAL_NDK_VERSION. Bug: 6932421 Change-Id: Ieaad80daf4e6a4a7f058dd242f37a144e8ee9e76 --- Android.mk | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Android.mk b/Android.mk index cc9ef7d6a7..5ec5a70562 100644 --- a/Android.mk +++ b/Android.mk @@ -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)