summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorShih-wei Liao <sliao@google.com>2010-07-20 01:26:34 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-07-20 01:26:34 -0700
commit68561501364a5329d8218e39dadf9c902d973967 (patch)
treea2fe0dd9b8f1f0c57a88b744afa63375f11c4c48 /java
parent68a0353570de856e86480ff0171b64f75d563332 (diff)
parent0d5ef34d81e0bfe5a63005e772048011ed6460f9 (diff)
downloadandroid_frameworks_rs-68561501364a5329d8218e39dadf9c902d973967.tar.gz
android_frameworks_rs-68561501364a5329d8218e39dadf9c902d973967.tar.bz2
android_frameworks_rs-68561501364a5329d8218e39dadf9c902d973967.zip
Merge "Fix Android build"
Diffstat (limited to 'java')
-rw-r--r--java/ImageProcessing/Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/java/ImageProcessing/Android.mk b/java/ImageProcessing/Android.mk
index 833427b2..f7ff3782 100644
--- a/java/ImageProcessing/Android.mk
+++ b/java/ImageProcessing/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)
LOCAL_PACKAGE_NAME := ImageProcessing
include $(BUILD_PACKAGE)
+
+endif