Merge "Build libstaticsharednativelibprovider against the SDK."
diff --git a/hostsidetests/os/test-apps/StaticSharedNativeLibProvider/Android.mk b/hostsidetests/os/test-apps/StaticSharedNativeLibProvider/Android.mk
index b469eac..db6d702 100644
--- a/hostsidetests/os/test-apps/StaticSharedNativeLibProvider/Android.mk
+++ b/hostsidetests/os/test-apps/StaticSharedNativeLibProvider/Android.mk
@@ -55,8 +55,10 @@
 
 LOCAL_MODULE := libstaticsharednativelibprovider
 
+LOCAL_SDK_VERSION := current
+
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/native/version.h
 
-LOCAL_CXX_STL := none
+LOCAL_NDK_STL_VARIANT := none
 
 include $(BUILD_SHARED_LIBRARY)