From 283beaf677d0c3235fbb22bfd5cd8338459bed1b Mon Sep 17 00:00:00 2001
From: Ruben Brunk <rubenbrunk@google.com>
Date: Mon, 23 Sep 2013 10:59:38 -0700
Subject: Fix build: Don't build GCam for non-arm targets

Bug: 10430748

Change-Id: I26e1208b38f40808ff59e3976f5c4a76efa15b4c
---
 Android.mk                                         |  1 +
 src_pd/com/android/camera/util/GcamHelper.java     | 32 ----------------------
 .../com/android/camera/util/GcamHelper.java        | 32 ++++++++++++++++++++++
 3 files changed, 33 insertions(+), 32 deletions(-)
 delete mode 100644 src_pd/com/android/camera/util/GcamHelper.java
 create mode 100644 src_pd_gcam/com/android/camera/util/GcamHelper.java

diff --git a/Android.mk b/Android.mk
index 285e595..0aeee74 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/com/android/camera/util/GcamHelper.java
deleted file mode 100644
index 0611955..0000000
--- a/src_pd/com/android/camera/util/GcamHelper.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.camera.util;
-
-import android.content.Context;
-
-import com.android.camera.CameraModule;
-
-public class GcamHelper {
-
-    public static CameraModule createGcamModule() {
-        return null;
-    }
-
-    public static boolean hasGcamCapture(Context context) {
-        return false;
-    }
-
-}
diff --git a/src_pd_gcam/com/android/camera/util/GcamHelper.java b/src_pd_gcam/com/android/camera/util/GcamHelper.java
new file mode 100644
index 0000000..0611955
--- /dev/null
+++ b/src_pd_gcam/com/android/camera/util/GcamHelper.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.camera.util;
+
+import android.content.Context;
+
+import com.android.camera.CameraModule;
+
+public class GcamHelper {
+
+    public static CameraModule createGcamModule() {
+        return null;
+    }
+
+    public static boolean hasGcamCapture(Context context) {
+        return false;
+    }
+
+}
-- 
cgit v0.11.2