Port ModelViewer to use the new build system.
Fix the simulator build on Fountain.
Change-Id: I89b05c31595f0a8c3001171957eeeb2fec253c74
diff --git a/java/ModelViewer/Android.mk b/java/ModelViewer/Android.mk
index 8bec6d6..efe77d7 100644
--- a/java/ModelViewer/Android.mk
+++ b/java/ModelViewer/Android.mk
@@ -14,14 +14,18 @@
# limitations under the License.
#
+ifneq ($(TARGET_SIMULATOR),true)
+
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
#LOCAL_STATIC_JAVA_LIBRARIES := android.renderscript
LOCAL_PACKAGE_NAME := ModelViewer
include $(BUILD_PACKAGE)
+
+endif