summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2013-09-23 10:59:38 -0700
committerRuben Brunk <rubenbrunk@google.com>2013-09-23 11:23:34 -0700
commit283beaf677d0c3235fbb22bfd5cd8338459bed1b (patch)
treef1273d7d9c4e79a728574c1809388ea6732f681d
parentb21215a1a59812592380f31891becedbdec7468b (diff)
downloadandroid_packages_apps_Snap-283beaf677d0c3235fbb22bfd5cd8338459bed1b.tar.gz
android_packages_apps_Snap-283beaf677d0c3235fbb22bfd5cd8338459bed1b.tar.bz2
android_packages_apps_Snap-283beaf677d0c3235fbb22bfd5cd8338459bed1b.zip
Fix build: Don't build GCam for non-arm targets
Bug: 10430748 Change-Id: I26e1208b38f40808ff59e3976f5c4a76efa15b4c
-rw-r--r--Android.mk1
-rw-r--r--src_pd_gcam/com/android/camera/util/GcamHelper.java (renamed from src_pd/com/android/camera/util/GcamHelper.java)0
2 files changed, 1 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 285e59543..0aeee7467 100644
--- a/Android.mk
+++ b/Android.mk
@@ -10,6 +10,7 @@ LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
+LOCAL_SRC_FILES += $(call all-java-files-under, src_pd_gcam)
LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
diff --git a/src_pd/com/android/camera/util/GcamHelper.java b/src_pd_gcam/com/android/camera/util/GcamHelper.java
index 0611955f7..0611955f7 100644
--- a/src_pd/com/android/camera/util/GcamHelper.java
+++ b/src_pd_gcam/com/android/camera/util/GcamHelper.java