commit a6d94785fc7c80c33de99b5a65e6a5e3a2e93fb3
author Ying Wang <wangying@google.com> Tue Aug 14 10:28:02 2012 -0700
committer Ying Wang <wangying@google.com> Tue Aug 14 12:02:51 2012 -0700
tree c0703946abfd692e7174425545f4786a067ab418
parent 25b5a76155860b450c1176684f8e6007aab8aa7b

Retire LOCAL_NDK_VERSION.

Bug: 6932421
Change-Id: Ieaad80daf4e6a4a7f058dd242f37a144e8ee9e76

Android.mk

diff --git a/Android.mk b/Android.mk
index cc9ef7d..5ec5a70 100644
--- a/Android.mk
+++ b/Android.mk
@@ -198,13 +198,12 @@
 
 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 @@
     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 @@
 
 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)