Fix fountain and put the demos back in the optional build.
diff --git a/Android.mk b/Android.mk
index 88521f6..98464a0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -110,5 +110,9 @@
include $(BUILD_SHARED_LIBRARY)
+# include the java examples
+include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk,\
+ java \
+ ))
endif #simulator
diff --git a/rsVertexArray.cpp b/rsVertexArray.cpp
index d0c0414..6c2002d 100644
--- a/rsVertexArray.cpp
+++ b/rsVertexArray.cpp
@@ -191,6 +191,9 @@
if (sc->isUserVertexProgram()) {
slot = sc->vtxAttribSlot(ct);
} else {
+ if (mAttribs[ct].kind == RS_KIND_USER) {
+ continue;
+ }
slot = sc->vtxAttribSlot(mAttribs[ct].kind);
}