From 3485976e84ff97cf54f640d8434affb6bec1a484 Mon Sep 17 00:00:00 2001 From: Shih-wei Liao Date: Tue, 20 Jul 2010 00:28:46 -0700 Subject: [PATCH] Port ModelViewer to use the new build system. Fix the simulator build on Fountain. Change-Id: I89b05c31595f0a8c3001171957eeeb2fec253c74 --- libs/rs/java/Fountain/Android.mk | 4 + libs/rs/java/ModelViewer/Android.mk | 6 +- .../ModelViewer/res/raw/modelviewer_bc.bc | Bin 6216 -> 0 bytes .../android/modelviewer/ModelViewerRS.java | 2 +- .../modelviewer/ScriptC_Modelviewer.java | 118 ------------------ .../com/android/modelviewer}/modelviewer.rs | 0 6 files changed, 10 insertions(+), 120 deletions(-) delete mode 100644 libs/rs/java/ModelViewer/res/raw/modelviewer_bc.bc delete mode 100644 libs/rs/java/ModelViewer/src/com/android/modelviewer/ScriptC_Modelviewer.java rename libs/rs/java/ModelViewer/{res/raw => src/com/android/modelviewer}/modelviewer.rs (100%) diff --git a/libs/rs/java/Fountain/Android.mk b/libs/rs/java/Fountain/Android.mk index 814d2ae27d489..71944b2184dc1 100644 --- a/libs/rs/java/Fountain/Android.mk +++ b/libs/rs/java/Fountain/Android.mk @@ -14,6 +14,8 @@ # limitations under the License. # +ifneq ($(TARGET_SIMULATOR),true) + LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -25,3 +27,5 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-fil LOCAL_PACKAGE_NAME := Fountain include $(BUILD_PACKAGE) + +endif diff --git a/libs/rs/java/ModelViewer/Android.mk b/libs/rs/java/ModelViewer/Android.mk index 8bec6d62b01ca..efe77d7ac73b6 100644 --- a/libs/rs/java/ModelViewer/Android.mk +++ b/libs/rs/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 diff --git a/libs/rs/java/ModelViewer/res/raw/modelviewer_bc.bc b/libs/rs/java/ModelViewer/res/raw/modelviewer_bc.bc deleted file mode 100644 index fb8502860f7204ac699d20de03b30831a3283a31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6216 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 y`ZLDrW|iC{Y