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)
diff --git a/tests/cppbasic/compute.cpp b/tests/cppbasic/compute.cpp
index 0f7bd18..bc80c7e 100644
--- a/tests/cppbasic/compute.cpp
+++ b/tests/cppbasic/compute.cpp
@@ -32,7 +32,7 @@
sp<Allocation> aout = Allocation::createTyped(rs, t);
printf("Allocation %p %p\n", ain.get(), aout.get());
- sp<ScriptC_mono> sc = new ScriptC_mono(rs);
+ ScriptC_mono* sc = new ScriptC_mono(rs);
printf("new script\n");
// We read back the status from the script-side via a "failed" allocation.
@@ -84,21 +84,10 @@
rs->finish();
failed_alloc->copy1DTo(&failed);
-
- e.clear();
- t.clear();
- kern1_in.clear();
- kern1_out.clear();
}
printf("Deleting stuff\n");
- sc.clear();
- t.clear();
- a1.clear();
- e.clear();
- ain.clear();
- aout.clear();
- // delete rs;
+ delete sc;
printf("Delete OK\n");
if (failed) {