From 4aee2ab0eeb7cb65c7128600b1284f8389d9b5b0 Mon Sep 17 00:00:00 2001
From: Owen Lin <owenlin@google.com>
Date: Wed, 17 Aug 2011 22:07:43 +0800
Subject: Initial code for Gallery2.

fix: 5176434

Change-Id: I041e282b9c7b34ceb1db8b033be2b853bb3a992c
---
 Android.mk               | 24 ++++++++++++++++++++++++
 gallerycommon/Android.mk | 27 +++++++++++++++++++++++++++
 tests/Android.mk         | 17 +++++++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 Android.mk
 create mode 100644 gallerycommon/Android.mk
 create mode 100644 tests/Android.mk

diff --git a/Android.mk b/Android.mk
new file mode 100644
index 000000000..0f5170f64
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,24 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
+LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2 
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
+
+LOCAL_PACKAGE_NAME := Gallery2
+
+LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D
+
+# We mark this out until Mtp and MediaMetadataRetriever is unhidden.
+LOCAL_SDK_VERSION := current
+
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+
+include $(BUILD_PACKAGE)
+
+# Use the following include to make our test apk.
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/gallerycommon/Android.mk b/gallerycommon/Android.mk
new file mode 100644
index 000000000..a942de289
--- /dev/null
+++ b/gallerycommon/Android.mk
@@ -0,0 +1,27 @@
+# Copyright 2011, 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.
+
+LOCAL_PATH := $(call my-dir)
+
+# Build the com.android.emailcommon static library. At the moment, this includes
+# the emailcommon files themselves plus everything under src/org (apache code).  All of our
+# AIDL files are also compiled into the static library
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := com.android.gallery3d.common2
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SDK_VERSION := 8
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/tests/Android.mk b/tests/Android.mk
new file mode 100644
index 000000000..602f693e9
--- /dev/null
+++ b/tests/Android.mk
@@ -0,0 +1,17 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+# We only want this apk build for tests.
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_JAVA_LIBRARIES := android.test.runner
+
+# Include all test java files.
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := Gallery2Tests
+LOCAL_CERTIFICATE := media
+
+LOCAL_INSTRUMENTATION_FOR := Gallery2
+
+include $(BUILD_PACKAGE)
-- 
cgit v1.2.3


From 99d437c1e7521225844385be99dd81c0a43b3489 Mon Sep 17 00:00:00 2001
From: Chih-Chung Chang <chihchung@google.com>
Date: Fri, 3 Feb 2012 21:17:17 +0800
Subject: Add profiling tools.

Change-Id: Ieab118ededaab5ef46408fac6fdb66b9fff4900e
---
 tests/Android.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/Android.mk b/tests/Android.mk
index 602f693e9..cfd07911a 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -10,7 +10,6 @@ LOCAL_JAVA_LIBRARIES := android.test.runner
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := Gallery2Tests
-LOCAL_CERTIFICATE := media
 
 LOCAL_INSTRUMENTATION_FOR := Gallery2
 
-- 
cgit v1.2.3


From 5a4d66d474ec876a2a28fd5927890c18f18907e5 Mon Sep 17 00:00:00 2001
From: Chih-Chung Chang <chihchung@google.com>
Date: Thu, 8 Mar 2012 20:10:53 +0800
Subject: Merge Camera into Gallery package.

Change-Id: If66d4b841eec3d3f5384a561b07c0eeade92597a
---
 Android.mk | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/Android.mk b/Android.mk
index 0f5170f64..6584c4a3f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,17 +8,29 @@ LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
 
 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, ../Camera/src)
+
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res packages/apps/Camera/res
+LOCAL_AAPT_FLAGS := --auto-add-overlay --extra-packages com.android.camera
 
 LOCAL_PACKAGE_NAME := Gallery2
 
 LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D
 
-# We mark this out until Mtp and MediaMetadataRetriever is unhidden.
-LOCAL_SDK_VERSION := current
+#LOCAL_SDK_VERSION := current
+
+LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic
+
+LOCAL_REQUIRED_MODULES := libjni_mosaic
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 include $(BUILD_PACKAGE)
 
-# Use the following include to make our test apk.
+ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
+# Use the following include to make gallery test apk.
 include $(call all-makefiles-under,$(LOCAL_PATH))
+
+# Use the following include to make camera test apk.
+include $(call all-makefiles-under, ../Camera)
+endif
-- 
cgit v1.2.3


From 9a5cd762a6faf547c436ee3cda3624748d6095c5 Mon Sep 17 00:00:00 2001
From: Ruei-sung Lin <rslin@google.com>
Date: Thu, 31 May 2012 11:59:31 -0700
Subject: Fix b/6590795 dejank photo effect slider

Change-Id: I14737bd01361b58c6bd4af19957d514368cc19ea
---
 Android.mk     | 10 +++++++---
 jni/Android.mk | 16 ++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 jni/Android.mk

diff --git a/Android.mk b/Android.mk
index 6584c4a3f..ea71b3958 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,4 +1,5 @@
 LOCAL_PATH:= $(call my-dir)
+
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
@@ -19,18 +20,21 @@ LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D
 
 #LOCAL_SDK_VERSION := current
 
-LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic
+LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_eglfence
 
-LOCAL_REQUIRED_MODULES := libjni_mosaic
+LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_eglfence
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 include $(BUILD_PACKAGE)
 
+include $(call all-makefiles-under, jni)
+
 ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
 # Use the following include to make gallery test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
+include $(call all-makefiles-under, $(LOCAL_PATH))
 
 # Use the following include to make camera test apk.
 include $(call all-makefiles-under, ../Camera)
+
 endif
diff --git a/jni/Android.mk b/jni/Android.mk
new file mode 100644
index 000000000..eedfa0bff
--- /dev/null
+++ b/jni/Android.mk
@@ -0,0 +1,16 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES
+
+LOCAL_SRC_FILES := jni_egl_fence.cpp
+
+LOCAL_SHARED_LIBRARIES := libcutils libEGL
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE := libjni_eglfence
+
+include $(BUILD_SHARED_LIBRARY)
+
-- 
cgit v1.2.3


From 00b187956db9e3b0f33354d3dfcc2c3a0693eee2 Mon Sep 17 00:00:00 2001
From: Owen Lin <owenlin@google.com>
Date: Wed, 27 Jun 2012 19:01:21 +0800
Subject: Don't reuse bitmaps in BitmapRegionDecoder before JB.

Change-Id: I8a2f520f98116af6861fa2cd1460e6f848bbb4e4
---
 gallerycommon/Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gallerycommon/Android.mk b/gallerycommon/Android.mk
index a942de289..fb81dd950 100644
--- a/gallerycommon/Android.mk
+++ b/gallerycommon/Android.mk
@@ -22,6 +22,6 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := com.android.gallery3d.common2
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_SDK_VERSION := 8
+LOCAL_SDK_VERSION := current
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
-- 
cgit v1.2.3


From cd44238580181e2f5100794be59a2b15e9d68b1d Mon Sep 17 00:00:00 2001
From: Wu-cheng Li <wuchengli@google.com>
Date: Fri, 29 Jun 2012 18:21:15 +0800
Subject: Make gallery/camera build in JB API level.

Bug:4965992
Change-Id: I91e56aacb5447c811aafce756292ab5ee0636cee
---
 Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index ea71b3958..b0ebf899a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,7 +18,7 @@ LOCAL_PACKAGE_NAME := Gallery2
 
 LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D
 
-#LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := current
 
 LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_eglfence
 
-- 
cgit v1.2.3


From 6afb3b8d234ed1a0ba27f4f2e4921f69cabbf2e0 Mon Sep 17 00:00:00 2001
From: Wu-cheng Li <wuchengli@google.com>
Date: Wed, 4 Jul 2012 16:32:57 +0800
Subject: Make jni build against NDK.

bug:6698708

Change-Id: I913e2f29657abc0af79223ba49148a6080d39ba7
---
 jni/Android.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index eedfa0bff..a4fb844bd 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -6,11 +6,15 @@ LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES
 
 LOCAL_SRC_FILES := jni_egl_fence.cpp
 
-LOCAL_SHARED_LIBRARIES := libcutils libEGL
+ifeq ($(TARGET_ARCH), arm)
+        LOCAL_NDK_VERSION := 5
+        LOCAL_SDK_VERSION := 9
+endif
+
+LOCAL_LDFLAGS :=  -llog -lEGL
 
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_MODULE := libjni_eglfence
 
 include $(BUILD_SHARED_LIBRARY)
-
-- 
cgit v1.2.3


From 184b3f93beff0e85afb7d4415519332adbcf4784 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Fri, 13 Jul 2012 10:19:43 -0700
Subject: Change "current" sdk version to 16 as it becomes official

Change-Id: I09c13b99ff1bc368e1fa335f2efc4cba5410d2f5
---
 Android.mk               | 2 +-
 gallerycommon/Android.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Android.mk b/Android.mk
index b0ebf899a..4854a5c5e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,7 +18,7 @@ LOCAL_PACKAGE_NAME := Gallery2
 
 LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D
 
-LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := 16
 
 LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_eglfence
 
diff --git a/gallerycommon/Android.mk b/gallerycommon/Android.mk
index fb81dd950..1d341472c 100644
--- a/gallerycommon/Android.mk
+++ b/gallerycommon/Android.mk
@@ -22,6 +22,6 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := com.android.gallery3d.common2
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := 16
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
-- 
cgit v1.2.3


From 1be429dec24f5fabb34083b8d0c264661e33924e Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Queru <jbq@google.com>
Date: Thu, 19 Jul 2012 10:56:47 -0700
Subject: Fix non-ARM builds - use the proper way to reference libraries

Change-Id: Ibd84af84861d1cbaa8203e4b287cb20f5e9027a0
---
 jni/Android.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index a4fb844bd..e86ec8db0 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -9,10 +9,11 @@ LOCAL_SRC_FILES := jni_egl_fence.cpp
 ifeq ($(TARGET_ARCH), arm)
         LOCAL_NDK_VERSION := 5
         LOCAL_SDK_VERSION := 9
+        LOCAL_LDFLAGS :=  -llog -lEGL
+else
+        LOCAL_SHARED_LIBRARIES :=  liblog libEGL
 endif
 
-LOCAL_LDFLAGS :=  -llog -lEGL
-
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_MODULE := libjni_eglfence
-- 
cgit v1.2.3


From 7c3884646bd55993c2488007b6a9e9d6f13f0297 Mon Sep 17 00:00:00 2001
From: Andrew Hsieh <andrewhsieh@google.com>
Date: Wed, 18 Jul 2012 16:40:14 -0700
Subject: Fixed x86 build

NDK supports x86 from r6.  Without setting correct LOCAL_NDK_VERSION
build may fail to add library path for "-llog" and "-lEGL"

Change-Id: I863e20e434d274b5d8924eafcf1f5e1d0b05f90d
---
 jni/Android.mk | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index e86ec8db0..593074f6f 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -9,11 +9,15 @@ LOCAL_SRC_FILES := jni_egl_fence.cpp
 ifeq ($(TARGET_ARCH), arm)
         LOCAL_NDK_VERSION := 5
         LOCAL_SDK_VERSION := 9
-        LOCAL_LDFLAGS :=  -llog -lEGL
-else
-        LOCAL_SHARED_LIBRARIES :=  liblog libEGL
 endif
 
+ifeq ($(TARGET_ARCH), x86)
+        LOCAL_NDK_VERSION := 6
+        LOCAL_SDK_VERSION := 9
+endif
+
+LOCAL_LDFLAGS :=  -llog -lEGL
+
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_MODULE := libjni_eglfence
-- 
cgit v1.2.3


From d0af76e010fd959b1e97ef8e3a9e96dd50343db7 Mon Sep 17 00:00:00 2001
From: Earl Ou <shunhsingou@google.com>
Date: Tue, 31 Jul 2012 08:50:59 +0800
Subject: Fix Gallery2Tests Build

Remove dependancy of android-test-runner in Android.mk
Also LOCAL_SDK_VERSION is needed in Android.mk for unbundle-branches
to avoid hiden api

Change-Id: I38cef8261aab264fe5a109ca5a6857eee3dff11b
---
 tests/Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Android.mk b/tests/Android.mk
index cfd07911a..22bb7ee68 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
 # We only want this apk build for tests.
 LOCAL_MODULE_TAGS := tests
 
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_SDK_VERSION := 16
 
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
-- 
cgit v1.2.3


From 5a2a2d22e4ce4e5a02857436f43d8f624b7c1d46 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Tue, 14 Aug 2012 10:33:44 -0700
Subject: Retire LOCAL_NDK_VERSION.

Bug: 6932421
Change-Id: I9e5e8fba22ac235701c002e27012bb3954896140
---
 jni/Android.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index 593074f6f..cc1174bd2 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -7,12 +7,10 @@ LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES
 LOCAL_SRC_FILES := jni_egl_fence.cpp
 
 ifeq ($(TARGET_ARCH), arm)
-        LOCAL_NDK_VERSION := 5
         LOCAL_SDK_VERSION := 9
 endif
 
 ifeq ($(TARGET_ARCH), x86)
-        LOCAL_NDK_VERSION := 6
         LOCAL_SDK_VERSION := 9
 endif
 
-- 
cgit v1.2.3


From 002effc4639c80692f7846b5497550d7749a79f4 Mon Sep 17 00:00:00 2001
From: Keun young Park <keunyoung@google.com>
Date: Thu, 23 Aug 2012 09:44:46 -0700
Subject: fix mips build

- LOCAL_SDK_VERSION should be defined always

Change-Id: Icd1972279c76bd28e3caf9b44f1cea9b585836a1
---
 jni/Android.mk | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index cc1174bd2..099b9bacd 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -6,13 +6,7 @@ LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES
 
 LOCAL_SRC_FILES := jni_egl_fence.cpp
 
-ifeq ($(TARGET_ARCH), arm)
-        LOCAL_SDK_VERSION := 9
-endif
-
-ifeq ($(TARGET_ARCH), x86)
-        LOCAL_SDK_VERSION := 9
-endif
+LOCAL_SDK_VERSION := 9
 
 LOCAL_LDFLAGS :=  -llog -lEGL
 
-- 
cgit v1.2.3


From 859110b0cddf275c35f7c9c835a5a85784d4e93e Mon Sep 17 00:00:00 2001
From: Owen Lin <owenlin@google.com>
Date: Wed, 22 Aug 2012 17:34:21 +0800
Subject: Uses ActionBarSherlock library in MovieActivity.

bug: 6927267

Change-Id: I4b63e41be5cff22af0f7d830739c719e91cd6fff
---
 Android.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Android.mk b/Android.mk
index 4854a5c5e..570b46f30 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,10 +9,15 @@ LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
 
 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, actionbarsherlock/src)
 LOCAL_SRC_FILES += $(call all-java-files-under, ../Camera/src)
 
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res packages/apps/Camera/res
-LOCAL_AAPT_FLAGS := --auto-add-overlay --extra-packages com.android.camera
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res 
+LOCAL_RESOURCE_DIR += packages/apps/Camera/res
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/actionbarsherlock/res
+
+LOCAL_AAPT_FLAGS := --auto-add-overlay \
+    --extra-packages com.android.camera:com.actionbarsherlock
 
 LOCAL_PACKAGE_NAME := Gallery2
 
-- 
cgit v1.2.3


From 989c84cf319b3cb162af3ae7d5ca73520ae75695 Mon Sep 17 00:00:00 2001
From: Owen Lin <owenlin@google.com>
Date: Fri, 24 Aug 2012 13:02:22 +0800
Subject: Revert "Uses ActionBarSherlock library in MovieActivity."

This reverts commit 89b437722a24d0c7d6e2acffc30c215f22814234.
---
 Android.mk | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Android.mk b/Android.mk
index 570b46f30..4854a5c5e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,15 +9,10 @@ LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
 
 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, actionbarsherlock/src)
 LOCAL_SRC_FILES += $(call all-java-files-under, ../Camera/src)
 
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res 
-LOCAL_RESOURCE_DIR += packages/apps/Camera/res
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/actionbarsherlock/res
-
-LOCAL_AAPT_FLAGS := --auto-add-overlay \
-    --extra-packages com.android.camera:com.actionbarsherlock
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res packages/apps/Camera/res
+LOCAL_AAPT_FLAGS := --auto-add-overlay --extra-packages com.android.camera
 
 LOCAL_PACKAGE_NAME := Gallery2
 
-- 
cgit v1.2.3


From ab1f41e4494426f835319fa2b1e1ee2a74034b34 Mon Sep 17 00:00:00 2001
From: Owen Lin <owenlin@google.com>
Date: Fri, 24 Aug 2012 15:09:42 +0800
Subject: Revert "Revert "Uses ActionBarSherlock library in MovieActivity.""

This reverts commit 13da281769d4558c42d86a54536ff6da6826b0ac.
---
 Android.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Android.mk b/Android.mk
index 4854a5c5e..570b46f30 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,10 +9,15 @@ LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
 
 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, actionbarsherlock/src)
 LOCAL_SRC_FILES += $(call all-java-files-under, ../Camera/src)
 
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res packages/apps/Camera/res
-LOCAL_AAPT_FLAGS := --auto-add-overlay --extra-packages com.android.camera
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res 
+LOCAL_RESOURCE_DIR += packages/apps/Camera/res
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/actionbarsherlock/res
+
+LOCAL_AAPT_FLAGS := --auto-add-overlay \
+    --extra-packages com.android.camera:com.actionbarsherlock
 
 LOCAL_PACKAGE_NAME := Gallery2
 
-- 
cgit v1.2.3


From 2cc6e35b284578b646d9dfad57496257aa2a5945 Mon Sep 17 00:00:00 2001
From: Teng-Hui Zhu <ztenghui@google.com>
Date: Sun, 23 Sep 2012 15:02:56 -0700
Subject: The trimming solution with the mp4parser library.

bug:7093055

Change-Id: I598a81d80c9c5107696f3af7761207e3ec88f3ff
---
 Android.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 570b46f30..5029a9065 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,7 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
-LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2 
+LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
+LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
-- 
cgit v1.2.3


From 01dd3d28c08ba52cd5c1a24c473a9d5be87f5919 Mon Sep 17 00:00:00 2001
From: nicolasroard <nicolasroard@google.com>
Date: Tue, 25 Sep 2012 14:27:56 -0700
Subject: Initial import of the new image editor

bug:7165910
Change-Id: I756d6594f5bddd233772c979410362ca22e232a3
---
 jni/Android.mk | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/jni/Android.mk b/jni/Android.mk
index 099b9bacd..01dd728f0 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -14,4 +14,21 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_MODULE := libjni_eglfence
 
+
+include $(BUILD_SHARED_LIBRARY)
+
+# Filtershow
+
+include $(CLEAR_VARS)
+
+LOCAL_LDLIBS 	:= -llog -ljnigraphics
+LOCAL_MODULE    := filters
+LOCAL_SRC_FILES := filters/bw.c \
+		   filters/gradient.c \
+	           filters/saturated.c \
+		   filters/vignette.c
+
+LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops
+LOCAL_ARM_MODE := arm
+
 include $(BUILD_SHARED_LIBRARY)
-- 
cgit v1.2.3


From 08388e68673628c801c742aef8f5bf6ec41fc61f Mon Sep 17 00:00:00 2001
From: nicolasroard <nicolasroard@google.com>
Date: Wed, 26 Sep 2012 17:50:19 -0700
Subject: Fix the build

Change-Id: I6e645b5f5835ff4871881a7b73685fe074bce924
---
 jni/Android.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index 01dd728f0..846c0f215 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -21,8 +21,9 @@ include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 
-LOCAL_LDLIBS 	:= -llog -ljnigraphics
-LOCAL_MODULE    := filters
+LOCAL_LDFLAGS	:= -llog -ljnigraphics
+LOCAL_SDK_VERSION := 9
+LOCAL_MODULE    := libjni_filtershow_filters
 LOCAL_SRC_FILES := filters/bw.c \
 		   filters/gradient.c \
 	           filters/saturated.c \
-- 
cgit v1.2.3


From cda5ae868e98e1aad5d2924b3524d7caae1834ba Mon Sep 17 00:00:00 2001
From: Bart Sears <bsears@google.com>
Date: Fri, 28 Sep 2012 10:40:05 -0700
Subject: Add FilterShow and clean up native lib handling

Bug: 7165910
Add libjni_filtershow_filters to Gallery2 so users can edit photos

Bug: 7250099
Remove native libs from the apk in /system/apps

Change-Id: I0a8adacdcb4c349861187e4303d08666e204a266
---
 Android.mk | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Android.mk b/Android.mk
index 5029a9065..1d3559737 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,9 +26,14 @@ LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D
 
 LOCAL_SDK_VERSION := 16
 
-LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_eglfence
-
-LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_eglfence
+# If this is an unbundled build (to install seprately) then include
+# the libraries in the APK, otherwise just put them in /system/lib and
+# leave them out of the APK
+ifneq (,$(TARGET_BUILD_APPS))
+  LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_eglfence libjni_filtershow_filters
+else
+  LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_eglfence libjni_filtershow_filters
+endif
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
-- 
cgit v1.2.3


From eb697a9e32bae5dc61078f22c536ac701039ff81 Mon Sep 17 00:00:00 2001
From: John Hoford <hoford@google.com>
Date: Thu, 27 Sep 2012 16:34:21 -0700
Subject: Add contrast & brightness filters Added hue fixed contrast Stablized
 Contrast, Saturation, Tint, Exposure

bug:7234321
Change-Id: Iadd1e3ab215b60f920b718fa56611a07f24effee
---
 jni/Android.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jni/Android.mk b/jni/Android.mk
index 846c0f215..8453f76d1 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -27,6 +27,9 @@ LOCAL_MODULE    := libjni_filtershow_filters
 LOCAL_SRC_FILES := filters/bw.c \
 		   filters/gradient.c \
 	           filters/saturated.c \
+                   filters/brightness.c \
+                   filters/contrast.c \
+                   filters/hue.c \
 		   filters/vignette.c
 
 LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops
-- 
cgit v1.2.3


From 75a18593f2d58a05075f3e6996f0eb1ac62f3cce Mon Sep 17 00:00:00 2001
From: John Hoford <hoford@google.com>
Date: Mon, 1 Oct 2012 17:21:55 -0700
Subject: Fix exposure and fixed warnings

bug:7234321
---
 jni/Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index 8453f76d1..38fa453b9 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -27,7 +27,7 @@ LOCAL_MODULE    := libjni_filtershow_filters
 LOCAL_SRC_FILES := filters/bw.c \
 		   filters/gradient.c \
 	           filters/saturated.c \
-                   filters/brightness.c \
+                   filters/exposure.c \
                    filters/contrast.c \
                    filters/hue.c \
 		   filters/vignette.c
-- 
cgit v1.2.3


From 26d50562cc36385deac10027de449fcbaac5d7ae Mon Sep 17 00:00:00 2001
From: Owen Lin <owenlin@google.com>
Date: Tue, 2 Oct 2012 15:27:00 +0800
Subject: Remove ActionBarSherlock

bug: 7242682

Change-Id: Ibf1fa136cafdca25273ee39ae9c065560b2db5cb
---
 Android.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Android.mk b/Android.mk
index 1d3559737..1e4430bee 100644
--- a/Android.mk
+++ b/Android.mk
@@ -10,15 +10,13 @@ LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
 
 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, actionbarsherlock/src)
 LOCAL_SRC_FILES += $(call all-java-files-under, ../Camera/src)
 
 LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res 
 LOCAL_RESOURCE_DIR += packages/apps/Camera/res
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/actionbarsherlock/res
 
 LOCAL_AAPT_FLAGS := --auto-add-overlay \
-    --extra-packages com.android.camera:com.actionbarsherlock
+    --extra-packages com.android.camera
 
 LOCAL_PACKAGE_NAME := Gallery2
 
-- 
cgit v1.2.3


From fd901f5e0c9472260d3956056b323caa75ed52a4 Mon Sep 17 00:00:00 2001
From: John Hoford <hoford@google.com>
Date: Tue, 2 Oct 2012 18:12:03 -0700
Subject: Add Shadow feature

bug:7234321
Change-Id: Ib0d4db773486e469ed818385b68b7b907070c297
---
 jni/Android.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jni/Android.mk b/jni/Android.mk
index 38fa453b9..f6c3c81d1 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -30,6 +30,8 @@ LOCAL_SRC_FILES := filters/bw.c \
                    filters/exposure.c \
                    filters/contrast.c \
                    filters/hue.c \
+                   filters/shadows.c \
+                   filters/hsv.c \
 		   filters/vignette.c
 
 LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops
-- 
cgit v1.2.3


From dbd3568d399070f0adcdda5fbf0f8995f07cd2bb Mon Sep 17 00:00:00 2001
From: nicolasroard <nicolasroard@google.com>
Date: Tue, 2 Oct 2012 21:57:22 -0700
Subject: Implement sharpen

bug:7279964
bug:7247494
bug:7234321

- add a sharpen filter
- add infrastructure to use RenderScript
- some refactoring (add an ImageSlave class)
- add new zoom UI

Change-Id: Id94dc94d32866c7107b6818adf4db35d0c6c0b01
---
 Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 1e4430bee..e2914bb3a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,7 +8,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
 LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
 
-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_SRC_FILES += $(call all-java-files-under, src_pd)
 LOCAL_SRC_FILES += $(call all-java-files-under, ../Camera/src)
 
-- 
cgit v1.2.3


From a52903cdf02a3963e71529d2bbcfaa7a0a5f84bb Mon Sep 17 00:00:00 2001
From: John Hoford <hoford@google.com>
Date: Thu, 4 Oct 2012 14:12:36 -0700
Subject: add vibrance fix a free in shadows

bug:7234321
Change-Id: I52b1b952fcdc34c23464793621df60aa7e8e00b2
---
 jni/Android.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jni/Android.mk b/jni/Android.mk
index f6c3c81d1..935abebc8 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -32,6 +32,7 @@ LOCAL_SRC_FILES := filters/bw.c \
                    filters/hue.c \
                    filters/shadows.c \
                    filters/hsv.c \
+                   filters/vibrance.c \
 		   filters/vignette.c
 
 LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops
-- 
cgit v1.2.3


From 35aa69da52dd78e20f06cd5120bf196f93cb0ccf Mon Sep 17 00:00:00 2001
From: Wu-cheng Li <wuchengli@google.com>
Date: Sun, 7 Oct 2012 03:29:50 +0800
Subject: Change LOCAL_SDK_VERSION to current.

bug:7208909

Change-Id: Ifa03d6eea219115a03da6f8138c6fcb2922e4c57
---
 Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index e2914bb3a..209c7d5b2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,7 +22,7 @@ LOCAL_PACKAGE_NAME := Gallery2
 
 LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D
 
-LOCAL_SDK_VERSION := 16
+LOCAL_SDK_VERSION := current
 
 # If this is an unbundled build (to install seprately) then include
 # the libraries in the APK, otherwise just put them in /system/lib and
-- 
cgit v1.2.3


From 3ee1d4e1aefc8f12925c850f6a56e4134d2a58ec Mon Sep 17 00:00:00 2001
From: Ruben Brunk <rubenbrunk@google.com>
Date: Mon, 8 Oct 2012 13:48:46 -0700
Subject: Added stub for applying geometry flip.

Bug: 7224232
Bug: 7218935
Change-Id: Iaeea6a94f4fea44a8046f09a0fce72fe32ed7cc0
---
 jni/Android.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index 935abebc8..213663ce1 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -25,15 +25,16 @@ LOCAL_LDFLAGS	:= -llog -ljnigraphics
 LOCAL_SDK_VERSION := 9
 LOCAL_MODULE    := libjni_filtershow_filters
 LOCAL_SRC_FILES := filters/bw.c \
-		   filters/gradient.c \
-	           filters/saturated.c \
+                   filters/gradient.c \
+                   filters/saturated.c \
                    filters/exposure.c \
                    filters/contrast.c \
                    filters/hue.c \
                    filters/shadows.c \
                    filters/hsv.c \
                    filters/vibrance.c \
-		   filters/vignette.c
+                   filters/geometry.c \
+                   filters/vignette.c
 
 LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops
 LOCAL_ARM_MODE := arm
-- 
cgit v1.2.3


From 3e441d86f224923498cf040bcf7b4581e1f10314 Mon Sep 17 00:00:00 2001
From: John Hoford <hoford@google.com>
Date: Mon, 8 Oct 2012 14:21:57 -0700
Subject: add redeye and improve shadow removal

bug:7234321
Change-Id: I12c2eb28555d7594fddf86dfa224219b70137681
---
 jni/Android.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index 213663ce1..92789c157 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -34,7 +34,9 @@ LOCAL_SRC_FILES := filters/bw.c \
                    filters/hsv.c \
                    filters/vibrance.c \
                    filters/geometry.c \
-                   filters/vignette.c
+                   filters/vignette.c \
+                   filters/redEyeMath.c \
+                   filters/redeye.c
 
 LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops
 LOCAL_ARM_MODE := arm
-- 
cgit v1.2.3


From c2d240c4862a05b68f195b7743e1f7a5ba2b5490 Mon Sep 17 00:00:00 2001
From: John Hoford <hoford@google.com>
Date: Tue, 9 Oct 2012 16:17:17 -0700
Subject: add filters

bug:7234321
Change-Id: I4c9695c3ad90fcb7f4d67d40faa0a7da85f99030
---
 jni/Android.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jni/Android.mk b/jni/Android.mk
index 92789c157..f2f714d50 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -36,6 +36,7 @@ LOCAL_SRC_FILES := filters/bw.c \
                    filters/geometry.c \
                    filters/vignette.c \
                    filters/redEyeMath.c \
+                   filters/fx.c \
                    filters/redeye.c
 
 LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops
-- 
cgit v1.2.3


From e2e1b123f189014fd55e9414e2ed03baac38ceb0 Mon Sep 17 00:00:00 2001
From: John Hoford <hoford@google.com>
Date: Wed, 10 Oct 2012 14:17:30 -0700
Subject: add White balance & disable UI elements

bug:7234321
Change-Id: Ic44bfe30b5d25e7d4442c4e6d4fd9e0e8410c7af
---
 jni/Android.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jni/Android.mk b/jni/Android.mk
index f2f714d50..85e867ab4 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -37,6 +37,7 @@ LOCAL_SRC_FILES := filters/bw.c \
                    filters/vignette.c \
                    filters/redEyeMath.c \
                    filters/fx.c \
+                   filters/wbalance.c \
                    filters/redeye.c
 
 LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops
-- 
cgit v1.2.3


From d10e97d4f9ad49c219663bcff77823e5d27f1fe6 Mon Sep 17 00:00:00 2001
From: Sascha Haeberling <haeberling@google.com>
Date: Fri, 19 Oct 2012 15:43:03 -0700
Subject: Adds a tiny planet (stereographic projection) image filter.

 Bug: 7293391

Also fixes an issue where the preview value was statically set to 100.
This adds a preview parameter value that can be set for this purpose.

Change-Id: I68c4ec04e86ab8a29ef7f561e5f21a298003677e
---
 jni/Android.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index 85e867ab4..fb8ba86ec 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -21,6 +21,7 @@ include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 
+LOCAL_CPP_EXTENSION := .cc
 LOCAL_LDFLAGS	:= -llog -ljnigraphics
 LOCAL_SDK_VERSION := 9
 LOCAL_MODULE    := libjni_filtershow_filters
@@ -38,7 +39,8 @@ LOCAL_SRC_FILES := filters/bw.c \
                    filters/redEyeMath.c \
                    filters/fx.c \
                    filters/wbalance.c \
-                   filters/redeye.c
+                   filters/redeye.c \
+                   filters/tinyplanet.cc
 
 LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops
 LOCAL_ARM_MODE := arm
-- 
cgit v1.2.3


From 76ca2776b11c915ad75e0962e713f66289a98ed5 Mon Sep 17 00:00:00 2001
From: John Hoford <hoford@google.com>
Date: Mon, 22 Oct 2012 16:26:26 -0700
Subject: on entry check if Tiny Planet if not remove UI

bug:7391885
Change-Id: Ic2bffa9f9fbaa2d437ce231a1478a1b63a0eed83
---
 Android.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Android.mk b/Android.mk
index 209c7d5b2..fd1d4e498 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
+LOCAL_STATIC_JAVA_LIBRARIES += libXMPCore
 LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
-- 
cgit v1.2.3


From 5c3e14563f3a72ff90e49d901ce8c9ca238db634 Mon Sep 17 00:00:00 2001
From: Sascha Haeberling <haeberling@google.com>
Date: Tue, 23 Oct 2012 13:38:52 -0700
Subject: Make sure we use xmp_toolkit from external instead of the precompiled
 JAR.

 Bug: 7400527

Change-Id: Ib9428af28c2c436485358dc4e07fe659ed961155
---
 Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index fd1d4e498..a5efe5500 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,7 +6,7 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
-LOCAL_STATIC_JAVA_LIBRARIES += libXMPCore
+LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
-- 
cgit v1.2.3


From 4e524038faeda08e9d1ded6500ef543c61c2f4e5 Mon Sep 17 00:00:00 2001
From: John Hoford <hoford@google.com>
Date: Tue, 23 Oct 2012 15:17:12 -0700
Subject: add support for black and white filters, add rotation API to tiny
 planet

bug:7386370
bug:7389189
Change-Id: I1720893000c39edf28a356fb7b56634f004ef120
---
 jni/Android.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jni/Android.mk b/jni/Android.mk
index fb8ba86ec..db31bfdf6 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := filters/bw.c \
                    filters/fx.c \
                    filters/wbalance.c \
                    filters/redeye.c \
+                   filters/bwfilter.c \
                    filters/tinyplanet.cc
 
 LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops
-- 
cgit v1.2.3


From bc7949a0bb4c1d69ca7dd395f4aeecabafc1b610 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Tue, 30 Oct 2012 17:34:20 -0700
Subject: Gingerbread support-ish

This reverts commit 1336062985c9824d7fd796b1cebd5eaa8e4163ca.

Change-Id: I718ec56315dc207a3e612abb4576bddab9afa2ee
---
 Android.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index a5efe5500..4712b446d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -11,13 +11,15 @@ LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
 LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
+LOCAL_SRC_FILES += $(call all-java-files-under, actionbarsherlock/src)
 LOCAL_SRC_FILES += $(call all-java-files-under, ../Camera/src)
 
 LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res 
 LOCAL_RESOURCE_DIR += packages/apps/Camera/res
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/actionbarsherlock/res
 
 LOCAL_AAPT_FLAGS := --auto-add-overlay \
-    --extra-packages com.android.camera
+    --extra-packages com.android.camera:com.actionbarsherlock
 
 LOCAL_PACKAGE_NAME := Gallery2
 
-- 
cgit v1.2.3


From 107df4f47c1c370c6d3f9b90d97eaef231b7359d Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Wed, 12 Dec 2012 13:43:43 -0800
Subject: remove actionbar sherlock

Change-Id: Idb9b63f625fd4f0b78d947421ec5b098d8e5dfd5
---
 Android.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Android.mk b/Android.mk
index 4712b446d..a5efe5500 100644
--- a/Android.mk
+++ b/Android.mk
@@ -11,15 +11,13 @@ LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
 LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
-LOCAL_SRC_FILES += $(call all-java-files-under, actionbarsherlock/src)
 LOCAL_SRC_FILES += $(call all-java-files-under, ../Camera/src)
 
 LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res 
 LOCAL_RESOURCE_DIR += packages/apps/Camera/res
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/actionbarsherlock/res
 
 LOCAL_AAPT_FLAGS := --auto-add-overlay \
-    --extra-packages com.android.camera:com.actionbarsherlock
+    --extra-packages com.android.camera
 
 LOCAL_PACKAGE_NAME := Gallery2
 
-- 
cgit v1.2.3


From 6166ed62594d7ca81114844b439d858e275942d7 Mon Sep 17 00:00:00 2001
From: Ruben Brunk <rubenbrunk@google.com>
Date: Mon, 10 Dec 2012 19:40:27 -0800
Subject: Added photonegative filter.

Change-Id: I73594573b26873cb3fda49aca6d40761dec3707f
---
 jni/Android.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jni/Android.mk b/jni/Android.mk
index db31bfdf6..8a2fc9e18 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -35,6 +35,7 @@ LOCAL_SRC_FILES := filters/bw.c \
                    filters/hsv.c \
                    filters/vibrance.c \
                    filters/geometry.c \
+                   filters/negative.c \
                    filters/vignette.c \
                    filters/redEyeMath.c \
                    filters/fx.c \
-- 
cgit v1.2.3


From 6d76e0d2eb8aa6ae8619d379d5ac3c9f78287f12 Mon Sep 17 00:00:00 2001
From: Ruben Brunk <rubenbrunk@google.com>
Date: Mon, 10 Dec 2012 18:50:10 -0800
Subject: Added sobel filter for edge function.

Change-Id: I4d59a96585f4902cd01d26ff68c777b542041132
---
 jni/Android.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jni/Android.mk b/jni/Android.mk
index 8a2fc9e18..6f12b3ef4 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -29,6 +29,7 @@ LOCAL_SRC_FILES := filters/bw.c \
                    filters/gradient.c \
                    filters/saturated.c \
                    filters/exposure.c \
+                   filters/edge.c \
                    filters/contrast.c \
                    filters/hue.c \
                    filters/shadows.c \
-- 
cgit v1.2.3


From 3805af7e9fe8886f5daa0463aa82e82f9b107609 Mon Sep 17 00:00:00 2001
From: Ruben Brunk <rubenbrunk@google.com>
Date: Wed, 12 Dec 2012 21:35:12 -0800
Subject: Added K-Means clustering filter.

Change-Id: If8961d4a21de953b754cf74aefc222b6bec902a3
---
 jni/Android.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index 6f12b3ef4..adc5bd32f 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -43,7 +43,8 @@ LOCAL_SRC_FILES := filters/bw.c \
                    filters/wbalance.c \
                    filters/redeye.c \
                    filters/bwfilter.c \
-                   filters/tinyplanet.cc
+                   filters/tinyplanet.cc \
+                   filters/kmeans.cc
 
 LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops
 LOCAL_ARM_MODE := arm
-- 
cgit v1.2.3


From 3b8066f77fba0673db8ecfc0916da27f09ee565d Mon Sep 17 00:00:00 2001
From: Ruben Brunk <rubenbrunk@google.com>
Date: Thu, 13 Dec 2012 22:42:33 -0800
Subject: Refactoring: removed unused filters.

Change-Id: If6344fde16607ab9dddb25922d295b1df205df6b
---
 jni/Android.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index adc5bd32f..1843c77ea 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -25,8 +25,7 @@ LOCAL_CPP_EXTENSION := .cc
 LOCAL_LDFLAGS	:= -llog -ljnigraphics
 LOCAL_SDK_VERSION := 9
 LOCAL_MODULE    := libjni_filtershow_filters
-LOCAL_SRC_FILES := filters/bw.c \
-                   filters/gradient.c \
+LOCAL_SRC_FILES := filters/gradient.c \
                    filters/saturated.c \
                    filters/exposure.c \
                    filters/edge.c \
-- 
cgit v1.2.3


From 981d661739acfef1b55558a4b8631a144881b8d5 Mon Sep 17 00:00:00 2001
From: Stephen Hines <srhines@google.com>
Date: Wed, 16 Jan 2013 17:54:08 -0800
Subject: Switch Gallery over to RS compatibility library.

Change-Id: If6eaea15a12a1448b402fb00dfd770b3749471ad
---
 Android.mk | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Android.mk b/Android.mk
index a5efe5500..1ef2fab10 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,12 +8,17 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
+LOCAL_STATIC_JAVA_LIBRARIES += android.support.v8.renderscript
+
+LOCAL_RENDERSCRIPT_TARGET_API := 18
+LOCAL_RENDERSCRIPT_COMPATIBILITY := 18
+LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
 LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
 LOCAL_SRC_FILES += $(call all-java-files-under, ../Camera/src)
 
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res 
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
 LOCAL_RESOURCE_DIR += packages/apps/Camera/res
 
 LOCAL_AAPT_FLAGS := --auto-add-overlay \
@@ -29,9 +34,9 @@ LOCAL_SDK_VERSION := current
 # the libraries in the APK, otherwise just put them in /system/lib and
 # leave them out of the APK
 ifneq (,$(TARGET_BUILD_APPS))
-  LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_eglfence libjni_filtershow_filters
+  LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_eglfence libjni_filtershow_filters librsjni
 else
-  LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_eglfence libjni_filtershow_filters
+  LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_eglfence libjni_filtershow_filters librsjni
 endif
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-- 
cgit v1.2.3


From dbbdb5c63405771a76c168ef569b7a789b3b9d73 Mon Sep 17 00:00:00 2001
From: Stephen Hines <srhines@google.com>
Date: Wed, 23 Jan 2013 18:38:42 +0000
Subject: Revert "Switch Gallery over to RS compatibility library."

This reverts commit 0746ce0977cde616d25ce35fee0d8d554235a21c

Change-Id: Ic0fb6c60e5f40b53ad032afeafe2f9ff70c26b50
---
 Android.mk | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/Android.mk b/Android.mk
index 1ef2fab10..a5efe5500 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,17 +8,12 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
-LOCAL_STATIC_JAVA_LIBRARIES += android.support.v8.renderscript
-
-LOCAL_RENDERSCRIPT_TARGET_API := 18
-LOCAL_RENDERSCRIPT_COMPATIBILITY := 18
-LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
 LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
 LOCAL_SRC_FILES += $(call all-java-files-under, ../Camera/src)
 
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res 
 LOCAL_RESOURCE_DIR += packages/apps/Camera/res
 
 LOCAL_AAPT_FLAGS := --auto-add-overlay \
@@ -34,9 +29,9 @@ LOCAL_SDK_VERSION := current
 # the libraries in the APK, otherwise just put them in /system/lib and
 # leave them out of the APK
 ifneq (,$(TARGET_BUILD_APPS))
-  LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_eglfence libjni_filtershow_filters librsjni
+  LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_eglfence libjni_filtershow_filters
 else
-  LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_eglfence libjni_filtershow_filters librsjni
+  LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_eglfence libjni_filtershow_filters
 endif
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-- 
cgit v1.2.3


From 9f60e4709b4740a8fb616346d99d6ed8d919349d Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Tue, 29 Jan 2013 10:33:22 -0800
Subject: Move Camera Java/Native source into Gallery2

Change-Id: I968efe4d656e88a7760d3c0044f65b4adac2ddd1
---
 Android.mk            |  7 ++----
 jni_mosaic/Android.mk | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100755 jni_mosaic/Android.mk

diff --git a/Android.mk b/Android.mk
index a5efe5500..11c716063 100644
--- a/Android.mk
+++ b/Android.mk
@@ -11,7 +11,6 @@ LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
 LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
-LOCAL_SRC_FILES += $(call all-java-files-under, ../Camera/src)
 
 LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res 
 LOCAL_RESOURCE_DIR += packages/apps/Camera/res
@@ -41,10 +40,8 @@ include $(BUILD_PACKAGE)
 include $(call all-makefiles-under, jni)
 
 ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
-# Use the following include to make gallery test apk.
-include $(call all-makefiles-under, $(LOCAL_PATH))
 
-# Use the following include to make camera test apk.
-include $(call all-makefiles-under, ../Camera)
+# Use the following include to make gallery test apk and the mosaic library
+include $(call all-makefiles-under, $(LOCAL_PATH))
 
 endif
diff --git a/jni_mosaic/Android.mk b/jni_mosaic/Android.mk
new file mode 100755
index 000000000..9f6f73925
--- /dev/null
+++ b/jni_mosaic/Android.mk
@@ -0,0 +1,60 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_C_INCLUDES := \
+        $(LOCAL_PATH)/feature_stab/db_vlvm \
+        $(LOCAL_PATH)/feature_stab/src \
+        $(LOCAL_PATH)/feature_stab/src/dbreg \
+        $(LOCAL_PATH)/feature_mos/src \
+        $(LOCAL_PATH)/feature_mos/src/mosaic
+
+LOCAL_CFLAGS := -O3 -DNDEBUG -fstrict-aliasing
+
+LOCAL_SRC_FILES := \
+        feature_mos_jni.cpp \
+        mosaic_renderer_jni.cpp \
+        feature_mos/src/mosaic/trsMatrix.cpp \
+        feature_mos/src/mosaic/AlignFeatures.cpp \
+        feature_mos/src/mosaic/Blend.cpp \
+        feature_mos/src/mosaic/Delaunay.cpp \
+        feature_mos/src/mosaic/ImageUtils.cpp \
+        feature_mos/src/mosaic/Mosaic.cpp \
+        feature_mos/src/mosaic/Pyramid.cpp \
+        feature_mos/src/mosaic_renderer/Renderer.cpp \
+        feature_mos/src/mosaic_renderer/WarpRenderer.cpp \
+        feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp \
+        feature_mos/src/mosaic_renderer/YVURenderer.cpp \
+        feature_mos/src/mosaic_renderer/FrameBuffer.cpp \
+        feature_stab/db_vlvm/db_feature_detection.cpp \
+        feature_stab/db_vlvm/db_feature_matching.cpp \
+        feature_stab/db_vlvm/db_framestitching.cpp \
+        feature_stab/db_vlvm/db_image_homography.cpp \
+        feature_stab/db_vlvm/db_rob_image_homography.cpp \
+        feature_stab/db_vlvm/db_utilities.cpp \
+        feature_stab/db_vlvm/db_utilities_camera.cpp \
+        feature_stab/db_vlvm/db_utilities_indexing.cpp \
+        feature_stab/db_vlvm/db_utilities_linalg.cpp \
+        feature_stab/db_vlvm/db_utilities_poly.cpp \
+        feature_stab/src/dbreg/dbreg.cpp \
+        feature_stab/src/dbreg/dbstabsmooth.cpp \
+        feature_stab/src/dbreg/vp_motionmodel.c
+
+ifeq ($(TARGET_ARCH), arm)
+        LOCAL_SDK_VERSION := 9
+endif
+
+ifeq ($(TARGET_ARCH), x86)
+        LOCAL_SDK_VERSION := 9
+endif
+
+ifeq ($(TARGET_ARCH), mips)
+        LOCAL_SDK_VERSION := 9
+endif
+
+LOCAL_LDFLAGS := -llog -lGLESv2
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE    := libjni_mosaic
+include $(BUILD_SHARED_LIBRARY)
-- 
cgit v1.2.3


From 2c87db720ca1d6b76260ec86a5bbf29a19eb2c2f Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Tue, 29 Jan 2013 14:03:06 -0800
Subject: Copy camera resources into Gallery2

Change-Id: I3be2758b2ddca31dbc2f21457a62664310c39684
---
 Android.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Android.mk b/Android.mk
index 11c716063..8b131834b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,8 +12,7 @@ LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
 LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
 LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
 
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res 
-LOCAL_RESOURCE_DIR += packages/apps/Camera/res
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
 
 LOCAL_AAPT_FLAGS := --auto-add-overlay \
     --extra-packages com.android.camera
-- 
cgit v1.2.3


From 97611a7010f55149aa18ed250f4961ff27438b55 Mon Sep 17 00:00:00 2001
From: Doris Liu <tianliu@google.com>
Date: Thu, 31 Jan 2013 19:03:48 -0800
Subject: Move tests from camera to gallery2

Change-Id: If9143fff7d22295a5ad3bb01c4b860d07c3ee1c9
---
 perftests/panorama/Android.mk | 26 ++++++++++++++++++++++++++
 tests_camera/Android.mk       | 18 ++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100755 perftests/panorama/Android.mk
 create mode 100644 tests_camera/Android.mk

diff --git a/perftests/panorama/Android.mk b/perftests/panorama/Android.mk
new file mode 100755
index 000000000..17632df5c
--- /dev/null
+++ b/perftests/panorama/Android.mk
@@ -0,0 +1,26 @@
+local_target_dir := $(TARGET_OUT_DATA)/local/tmp
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_C_INCLUDES := \
+    $(LOCAL_PATH)/../../jni_mosaic/feature_mos/src \
+    $(LOCAL_PATH)/../../jni_mosaic/feature_stab/src \
+    $(LOCAL_PATH)/../../jni_mosaic/feature_stab/db_vlvm
+
+LOCAL_CFLAGS := -O3 -DNDEBUG
+
+LOCAL_SRC_FILES := benchmark.cpp
+
+LOCAL_SHARED_LIBRARIES := libjni_mosaic libGLESv2 libEGL
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_LDFLAGS :=  -llog -lGLESv2
+
+LOCAL_MODULE := panorama_bench
+
+LOCAL_MODULE_PATH := $(local_target_dir)
+
+include $(BUILD_EXECUTABLE)
diff --git a/tests_camera/Android.mk b/tests_camera/Android.mk
new file mode 100644
index 000000000..93fce12d6
--- /dev/null
+++ b/tests_camera/Android.mk
@@ -0,0 +1,18 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+# We only want this apk build for tests.
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_JAVA_LIBRARIES := android.test.runner
+
+LOCAL_STATIC_JAVA_LIBRARIES := littlemock dexmaker
+
+# Include all test java files.
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := CameraTests
+
+LOCAL_INSTRUMENTATION_FOR := Gallery2
+
+include $(BUILD_PACKAGE)
-- 
cgit v1.2.3


From c7cd1fc900058a66f03af52f536c98d0c71e3e95 Mon Sep 17 00:00:00 2001
From: Tim Murray <timmurray@google.com>
Date: Mon, 4 Feb 2013 13:09:27 -0800
Subject: Switch Gallery over to RS compatibility library.

Change-Id: If27809236534f3b196949bf455faed45c99f3da5
---
 Android.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Android.mk b/Android.mk
index 8b131834b..7789619f3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,6 +8,11 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
+LOCAL_STATIC_JAVA_LIBRARIES += android.support.v8.renderscript
+
+LOCAL_RENDERSCRIPT_TARGET_API := 18
+LOCAL_RENDERSCRIPT_COMPATIBILITY := 18
+LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
 LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
@@ -27,9 +32,9 @@ LOCAL_SDK_VERSION := current
 # the libraries in the APK, otherwise just put them in /system/lib and
 # leave them out of the APK
 ifneq (,$(TARGET_BUILD_APPS))
-  LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_eglfence libjni_filtershow_filters
+  LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_eglfence libjni_filtershow_filters librsjni
 else
-  LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_eglfence libjni_filtershow_filters
+  LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_eglfence libjni_filtershow_filters librsjni
 endif
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-- 
cgit v1.2.3


From b9cfda108ee0c562fc968bc782ffd04cd31ce320 Mon Sep 17 00:00:00 2001
From: Jason Noguchi <jnoguchi@google.com>
Date: Wed, 6 Feb 2013 18:49:51 -0800
Subject: Remove reference to local libraries. Make CameraTest build against
 the SDK instead.

Change-Id: I5885de7f569f4c0e1e5156d8a1634fc13c1b558d
---
 tests_camera/Android.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests_camera/Android.mk b/tests_camera/Android.mk
index 93fce12d6..f39533a71 100644
--- a/tests_camera/Android.mk
+++ b/tests_camera/Android.mk
@@ -4,9 +4,7 @@ include $(CLEAR_VARS)
 # We only want this apk build for tests.
 LOCAL_MODULE_TAGS := tests
 
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-LOCAL_STATIC_JAVA_LIBRARIES := littlemock dexmaker
+LOCAL_SDK_VERSION := 16
 
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
-- 
cgit v1.2.3


From aa2d2b806cb4cc7a95eb412f2ac69268b893951c Mon Sep 17 00:00:00 2001
From: Stephen Hines <srhines@google.com>
Date: Thu, 7 Feb 2013 18:41:27 -0800
Subject: Switch to GalleryGoogle as default provider for RS files (from
 Gallery2).

Bug: 8138884
Change-Id: Ib2484852f0fa4299f6d0797838420493ce2607a0
---
 Android.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 7789619f3..f4a09e835 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,7 +14,13 @@ LOCAL_RENDERSCRIPT_TARGET_API := 18
 LOCAL_RENDERSCRIPT_COMPATIBILITY := 18
 LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
+# Keep track of previously compiled RS files too (from bundled GalleryGoogle).
+prev_compiled_rs_files := $(call all-renderscript-files-under, src)
+
+# We already have these files from GalleryGoogle, so don't install them.
+LOCAL_RENDERSCRIPT_SKIP_INSTALL := $(prev_compiled_rs_files)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src) $(prev_compiled_rs_files)
 LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
 
 LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
-- 
cgit v1.2.3


From 32a590908dd878dc76132928c73d41f569b16a36 Mon Sep 17 00:00:00 2001
From: Jason Noguchi <jnoguchi@google.com>
Date: Wed, 13 Feb 2013 15:35:23 -0800
Subject: Merging camera test with gallery test.

Change-Id: I8ef94a67dddc67a66c1d42a1b91e0a0c380b2841
---
 tests/Android.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/Android.mk b/tests/Android.mk
index 22bb7ee68..0cc5f877e 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -6,6 +6,8 @@ LOCAL_MODULE_TAGS := tests
 
 LOCAL_SDK_VERSION := 16
 
+LOCAL_STATIC_JAVA_LIBRARIES := littlemock dexmaker
+
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-- 
cgit v1.2.3


From b385b6a0a4a18520f0bc4c47309d313ef5e559a4 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Fri, 15 Feb 2013 15:51:30 -0800
Subject: Remove com.android.camera.R

Change-Id: I0bb03da1423401f872c3bf13caffb9c87d850449
---
 Android.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Android.mk b/Android.mk
index 7789619f3..438866634 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,8 +19,7 @@ LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
 
 LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
 
-LOCAL_AAPT_FLAGS := --auto-add-overlay \
-    --extra-packages com.android.camera
+LOCAL_AAPT_FLAGS := --auto-add-overlay
 
 LOCAL_PACKAGE_NAME := Gallery2
 
-- 
cgit v1.2.3


From 1c4facc140098b4550c2c8a522f16cb05299c9fc Mon Sep 17 00:00:00 2001
From: John Hoford <hoford@google.com>
Date: Wed, 20 Feb 2013 17:50:42 -0800
Subject: add highlight filter

Change-Id: I2e59e09fbc80172b9dfe27b3ce8ff2f1e24c5872
---
 jni/Android.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jni/Android.mk b/jni/Android.mk
index 1843c77ea..e612486e1 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -32,6 +32,7 @@ LOCAL_SRC_FILES := filters/gradient.c \
                    filters/contrast.c \
                    filters/hue.c \
                    filters/shadows.c \
+                   filters/highlight.c \
                    filters/hsv.c \
                    filters/vibrance.c \
                    filters/geometry.c \
-- 
cgit v1.2.3


From 59c25ee436215b989492b65dd0f26268e5b99b01 Mon Sep 17 00:00:00 2001
From: Tim Murray <timmurray@google.com>
Date: Mon, 13 May 2013 15:47:58 -0700
Subject: Only link librsjni in unbundled branches.

bug 8939828

Change-Id: I87d28185c6fb2b23852eb66487bf99d6111c3a7a
---
 Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 73c216ce6..5e461d82b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -39,7 +39,7 @@ LOCAL_SDK_VERSION := current
 ifneq (,$(TARGET_BUILD_APPS))
   LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_eglfence libjni_filtershow_filters librsjni
 else
-  LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_eglfence libjni_filtershow_filters librsjni
+  LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_eglfence libjni_filtershow_filters
 endif
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-- 
cgit v1.2.3


From 14c458d819037f5782c8c64f73c5109004ea8acf Mon Sep 17 00:00:00 2001
From: Stephen Hines <srhines@google.com>
Date: Wed, 29 May 2013 11:33:16 -0700
Subject: Use hyphenated path for android-support-v8-renderscript.

Bug: 9188088
Change-Id: Id435b35712fd944369b8515f7f84ea30f1eecbe3
---
 Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 5e461d82b..c17ee0421 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,7 +8,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
-LOCAL_STATIC_JAVA_LIBRARIES += android.support.v8.renderscript
+LOCAL_STATIC_JAVA_LIBRARIES += android-support-v8-renderscript
 
 LOCAL_RENDERSCRIPT_TARGET_API := 18
 LOCAL_RENDERSCRIPT_COMPATIBILITY := 18
-- 
cgit v1.2.3


From 51e2332e79dc9be46210c3bf3ae3c7087b5175e3 Mon Sep 17 00:00:00 2001
From: Stephen Hines <srhines@google.com>
Date: Tue, 28 May 2013 17:52:03 -0700
Subject: Use hyphenated path for android-support-v8-renderscript.

Bug: 9188088

Change-Id: Id30e0a67d89419aeb323f43bf5e65321bf862e79
(cherry picked from commit 79f4335753c1cffba15d6c7ea5ec6b7bb3db3f8e)
---
 Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 5e461d82b..c17ee0421 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,7 +8,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
-LOCAL_STATIC_JAVA_LIBRARIES += android.support.v8.renderscript
+LOCAL_STATIC_JAVA_LIBRARIES += android-support-v8-renderscript
 
 LOCAL_RENDERSCRIPT_TARGET_API := 18
 LOCAL_RENDERSCRIPT_COMPATIBILITY := 18
-- 
cgit v1.2.3


From 0372c360195f856b09c5f3679179cfdbb185e649 Mon Sep 17 00:00:00 2001
From: Doris Liu <tianliu@google.com>
Date: Thu, 20 Jun 2013 18:32:26 -0700
Subject: Remove SRI panorama

Change-Id: Icbe154aede474fb678ae4e0b2088626a4a8b31d8
---
 Android.mk                    |  6 ++---
 jni_mosaic/Android.mk         | 60 -------------------------------------------
 perftests/panorama/Android.mk | 26 -------------------
 3 files changed, 3 insertions(+), 89 deletions(-)
 delete mode 100755 jni_mosaic/Android.mk
 delete mode 100755 perftests/panorama/Android.mk

diff --git a/Android.mk b/Android.mk
index c17ee0421..2dd759f30 100644
--- a/Android.mk
+++ b/Android.mk
@@ -37,9 +37,9 @@ LOCAL_SDK_VERSION := current
 # the libraries in the APK, otherwise just put them in /system/lib and
 # leave them out of the APK
 ifneq (,$(TARGET_BUILD_APPS))
-  LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_eglfence libjni_filtershow_filters librsjni
+  LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni
 else
-  LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_eglfence libjni_filtershow_filters
+  LOCAL_REQUIRED_MODULES := libjni_eglfence libjni_filtershow_filters
 endif
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
@@ -50,7 +50,7 @@ include $(call all-makefiles-under, jni)
 
 ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
 
-# Use the following include to make gallery test apk and the mosaic library
+# Use the following include to make gallery test apk
 include $(call all-makefiles-under, $(LOCAL_PATH))
 
 endif
diff --git a/jni_mosaic/Android.mk b/jni_mosaic/Android.mk
deleted file mode 100755
index 9f6f73925..000000000
--- a/jni_mosaic/Android.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_C_INCLUDES := \
-        $(LOCAL_PATH)/feature_stab/db_vlvm \
-        $(LOCAL_PATH)/feature_stab/src \
-        $(LOCAL_PATH)/feature_stab/src/dbreg \
-        $(LOCAL_PATH)/feature_mos/src \
-        $(LOCAL_PATH)/feature_mos/src/mosaic
-
-LOCAL_CFLAGS := -O3 -DNDEBUG -fstrict-aliasing
-
-LOCAL_SRC_FILES := \
-        feature_mos_jni.cpp \
-        mosaic_renderer_jni.cpp \
-        feature_mos/src/mosaic/trsMatrix.cpp \
-        feature_mos/src/mosaic/AlignFeatures.cpp \
-        feature_mos/src/mosaic/Blend.cpp \
-        feature_mos/src/mosaic/Delaunay.cpp \
-        feature_mos/src/mosaic/ImageUtils.cpp \
-        feature_mos/src/mosaic/Mosaic.cpp \
-        feature_mos/src/mosaic/Pyramid.cpp \
-        feature_mos/src/mosaic_renderer/Renderer.cpp \
-        feature_mos/src/mosaic_renderer/WarpRenderer.cpp \
-        feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp \
-        feature_mos/src/mosaic_renderer/YVURenderer.cpp \
-        feature_mos/src/mosaic_renderer/FrameBuffer.cpp \
-        feature_stab/db_vlvm/db_feature_detection.cpp \
-        feature_stab/db_vlvm/db_feature_matching.cpp \
-        feature_stab/db_vlvm/db_framestitching.cpp \
-        feature_stab/db_vlvm/db_image_homography.cpp \
-        feature_stab/db_vlvm/db_rob_image_homography.cpp \
-        feature_stab/db_vlvm/db_utilities.cpp \
-        feature_stab/db_vlvm/db_utilities_camera.cpp \
-        feature_stab/db_vlvm/db_utilities_indexing.cpp \
-        feature_stab/db_vlvm/db_utilities_linalg.cpp \
-        feature_stab/db_vlvm/db_utilities_poly.cpp \
-        feature_stab/src/dbreg/dbreg.cpp \
-        feature_stab/src/dbreg/dbstabsmooth.cpp \
-        feature_stab/src/dbreg/vp_motionmodel.c
-
-ifeq ($(TARGET_ARCH), arm)
-        LOCAL_SDK_VERSION := 9
-endif
-
-ifeq ($(TARGET_ARCH), x86)
-        LOCAL_SDK_VERSION := 9
-endif
-
-ifeq ($(TARGET_ARCH), mips)
-        LOCAL_SDK_VERSION := 9
-endif
-
-LOCAL_LDFLAGS := -llog -lGLESv2
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE    := libjni_mosaic
-include $(BUILD_SHARED_LIBRARY)
diff --git a/perftests/panorama/Android.mk b/perftests/panorama/Android.mk
deleted file mode 100755
index 17632df5c..000000000
--- a/perftests/panorama/Android.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-local_target_dir := $(TARGET_OUT_DATA)/local/tmp
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../../jni_mosaic/feature_mos/src \
-    $(LOCAL_PATH)/../../jni_mosaic/feature_stab/src \
-    $(LOCAL_PATH)/../../jni_mosaic/feature_stab/db_vlvm
-
-LOCAL_CFLAGS := -O3 -DNDEBUG
-
-LOCAL_SRC_FILES := benchmark.cpp
-
-LOCAL_SHARED_LIBRARIES := libjni_mosaic libGLESv2 libEGL
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_LDFLAGS :=  -llog -lGLESv2
-
-LOCAL_MODULE := panorama_bench
-
-LOCAL_MODULE_PATH := $(local_target_dir)
-
-include $(BUILD_EXECUTABLE)
-- 
cgit v1.2.3


From 4b1935cdecda5fd02955b4529daf828a4353e664 Mon Sep 17 00:00:00 2001
From: Ruben Brunk <rubenbrunk@google.com>
Date: Fri, 28 Jun 2013 20:02:54 -0700
Subject: Added jpeg streaming classes.

- Provides streaming operations for decompressing/compressing
  JPEG files.
- Allows pixel operations to be performed on large JPEG images
  without holding the entire bitmap in memory.

Change-Id: I597ddf282b59d2ba6d6bca4722208121e3728f94
---
 Android.mk                |  4 ++--
 jni_jpegstream/Android.mk | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 jni_jpegstream/Android.mk

diff --git a/Android.mk b/Android.mk
index 2dd759f30..cf5b767bb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -37,9 +37,9 @@ LOCAL_SDK_VERSION := current
 # the libraries in the APK, otherwise just put them in /system/lib and
 # leave them out of the APK
 ifneq (,$(TARGET_BUILD_APPS))
-  LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni
+  LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni libjni_jpegstream
 else
-  LOCAL_REQUIRED_MODULES := libjni_eglfence libjni_filtershow_filters
+  LOCAL_REQUIRED_MODULES := libjni_eglfence libjni_filtershow_filters libjni_jpegstream
 endif
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
diff --git a/jni_jpegstream/Android.mk b/jni_jpegstream/Android.mk
new file mode 100644
index 000000000..de11733f8
--- /dev/null
+++ b/jni_jpegstream/Android.mk
@@ -0,0 +1,41 @@
+LOCAL_PATH:= $(call my-dir)
+
+# Jpeg Streaming native
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE        := libjni_jpegstream
+
+LOCAL_NDK_STL_VARIANT := stlport_static
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH) \
+                    $(LOCAL_PATH)/src \
+                    external/jpeg
+
+LOCAL_SHARED_LIBRARIES := libjpeg
+ifeq (,$(TARGET_BUILD_APPS))
+   # platform build
+   LOCAL_SHARED_LIBRARIES := libcutils
+endif
+
+LOCAL_LDFLAGS        := -llog
+LOCAL_SDK_VERSION   := 9
+LOCAL_ARM_MODE := arm
+
+LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops
+LOCAL_CPPFLAGS += $(JNI_CFLAGS)
+
+
+LOCAL_CPP_EXTENSION := .cpp
+LOCAL_SRC_FILES     := \
+    src/inputstream_wrapper.cpp \
+    src/jpegstream.cpp \
+    src/jerr_hook.cpp \
+    src/jpeg_hook.cpp \
+    src/jpeg_writer.cpp \
+    src/jpeg_reader.cpp \
+    src/outputstream_wrapper.cpp \
+    src/stream_wrapper.cpp
+
+
+include $(BUILD_SHARED_LIBRARY)
-- 
cgit v1.2.3