Add basic support for intrinsics. Move sp<> into RScpp.

Change-Id: I74cdee7069a624ded5091d53db3a4b8ce9894033
diff --git a/tests/cppbasic/Android.mk b/tests/cppbasic/Android.mk
index 5c2c53a..bf7725a 100644
--- a/tests/cppbasic/Android.mk
+++ b/tests/cppbasic/Android.mk
@@ -6,18 +6,18 @@
 	compute.cpp
 
 LOCAL_SHARED_LIBRARIES := \
-	libRS \
-	libRScpp \
 	libz \
-	libcutils \
-	libutils \
 	libEGL \
 	libGLESv1_CM \
 	libGLESv2 \
 	libui \
 	libbcc \
 	libbcinfo \
-	libgui
+	libgui \
+	libdl \
+	libRScpp \
+	libstlport
+
 
 LOCAL_MODULE:= rstest-compute
 
@@ -25,6 +25,7 @@
 
 intermediates := $(call intermediates-dir-for,STATIC_LIBRARIES,libRS,TARGET,)
 
+LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include
 LOCAL_C_INCLUDES += frameworks/rs/cpp
 LOCAL_C_INCLUDES += frameworks/rs
 LOCAL_C_INCLUDES += $(intermediates)