summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorPuneet Lall <puneetl@google.com>2014-08-07 17:05:38 -0700
committerPuneet Lall <puneetl@google.com>2014-08-11 13:02:23 -0700
commit967b782837a22974f565f5bbc71bef7bc05fc878 (patch)
tree3d8844fb1b737aaf81631020cf767803981af2b8 /Android.mk
parent30ffce08f511fbed4cf18daa743778b541583351 (diff)
downloadandroid_packages_apps_Camera2-967b782837a22974f565f5bbc71bef7bc05fc878.tar.gz
android_packages_apps_Camera2-967b782837a22974f565f5bbc71bef7bc05fc878.tar.bz2
android_packages_apps_Camera2-967b782837a22974f565f5bbc71bef7bc05fc878.zip
Implemented NDK libjpeg wrapper for YUV420 encoding.
Bug: 16676082 Change-Id: I588b8023b401d5e713762563c9265ec3d774a678
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk9
1 files changed, 1 insertions, 8 deletions
diff --git a/Android.mk b/Android.mk
index ca6d26a50..8a50335ed 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,14 +30,7 @@ LOCAL_SDK_VERSION := current
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-# 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_tinyplanet
-else
- LOCAL_REQUIRED_MODULES := libjni_tinyplanet
-endif
+LOCAL_JNI_SHARED_LIBRARIES := libjni_tinyplanet libjni_jpegutil
include $(BUILD_PACKAGE)