summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Android.mk56
-rw-r--r--gallerycommon/Android.mk27
-rw-r--r--jni/Android.mk52
-rw-r--r--jni_jpegstream/Android.mk41
-rw-r--r--tests/Android.mk18
-rw-r--r--tests_camera/Android.mk16
6 files changed, 0 insertions, 210 deletions
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index cf5b767..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-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_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
-
-# 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
-
-LOCAL_AAPT_FLAGS := --auto-add-overlay
-
-LOCAL_PACKAGE_NAME := Gallery2
-
-LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D
-
-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
-# leave them out of the APK
-ifneq (,$(TARGET_BUILD_APPS))
- LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni libjni_jpegstream
-else
- LOCAL_REQUIRED_MODULES := libjni_eglfence libjni_filtershow_filters libjni_jpegstream
-endif
-
-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))
-
-endif
diff --git a/gallerycommon/Android.mk b/gallerycommon/Android.mk
deleted file mode 100644
index 1d34147..0000000
--- a/gallerycommon/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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 := 16
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/jni/Android.mk b/jni/Android.mk
deleted file mode 100644
index e612486..0000000
--- a/jni/Android.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES
-
-LOCAL_SRC_FILES := jni_egl_fence.cpp
-
-LOCAL_SDK_VERSION := 9
-
-LOCAL_LDFLAGS := -llog -lEGL
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE := libjni_eglfence
-
-
-include $(BUILD_SHARED_LIBRARY)
-
-# Filtershow
-
-include $(CLEAR_VARS)
-
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_LDFLAGS := -llog -ljnigraphics
-LOCAL_SDK_VERSION := 9
-LOCAL_MODULE := libjni_filtershow_filters
-LOCAL_SRC_FILES := filters/gradient.c \
- filters/saturated.c \
- filters/exposure.c \
- filters/edge.c \
- filters/contrast.c \
- filters/hue.c \
- filters/shadows.c \
- filters/highlight.c \
- filters/hsv.c \
- filters/vibrance.c \
- filters/geometry.c \
- filters/negative.c \
- filters/vignette.c \
- filters/redEyeMath.c \
- filters/fx.c \
- filters/wbalance.c \
- filters/redeye.c \
- filters/bwfilter.c \
- filters/tinyplanet.cc \
- filters/kmeans.cc
-
-LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops
-LOCAL_ARM_MODE := arm
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/jni_jpegstream/Android.mk b/jni_jpegstream/Android.mk
deleted file mode 100644
index de11733..0000000
--- a/jni_jpegstream/Android.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-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)
diff --git a/tests/Android.mk b/tests/Android.mk
deleted file mode 100644
index 0cc5f87..0000000
--- a/tests/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-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)
-
-LOCAL_PACKAGE_NAME := Gallery2Tests
-
-LOCAL_INSTRUMENTATION_FOR := Gallery2
-
-include $(BUILD_PACKAGE)
diff --git a/tests_camera/Android.mk b/tests_camera/Android.mk
deleted file mode 100644
index f39533a..0000000
--- a/tests_camera/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SDK_VERSION := 16
-
-# 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)