diff options
author | Qiwen Zhao <zhao@google.com> | 2013-08-05 19:53:46 -0700 |
---|---|---|
committer | Qiwen Zhao <zhao@google.com> | 2013-08-05 19:53:46 -0700 |
commit | 7ee16875b7f8c01b278f4dd009e8360e5c0b3bfb (patch) | |
tree | dff8abea644f1a4f8b665b9974f688c064bc312f | |
parent | 48634be18119e370989fefa3284ad600aef92a1b (diff) | |
parent | 4b1935cdecda5fd02955b4529daf828a4353e664 (diff) | |
download | android_packages_apps_Snap-7ee16875b7f8c01b278f4dd009e8360e5c0b3bfb.tar.gz android_packages_apps_Snap-7ee16875b7f8c01b278f4dd009e8360e5c0b3bfb.tar.bz2 android_packages_apps_Snap-7ee16875b7f8c01b278f4dd009e8360e5c0b3bfb.zip |
Merge Android.mk/ from platform/packages/apps/Gallery2 to Android.mk/
-rw-r--r-- | Android.mk | 56 | ||||
-rw-r--r-- | tests/Android.mk | 18 | ||||
-rw-r--r-- | tests_camera/Android.mk | 16 |
3 files changed, 90 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk new file mode 100644 index 000000000..cf5b767bb --- /dev/null +++ b/Android.mk @@ -0,0 +1,56 @@ +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/tests/Android.mk b/tests/Android.mk new file mode 100644 index 000000000..0cc5f877e --- /dev/null +++ b/tests/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_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 new file mode 100644 index 000000000..f39533a71 --- /dev/null +++ b/tests_camera/Android.mk @@ -0,0 +1,16 @@ +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) |