commit 967b782837a22974f565f5bbc71bef7bc05fc878
author Puneet Lall <puneetl@google.com> Thu Aug 07 17:05:38 2014 -0700
committer Puneet Lall <puneetl@google.com> Mon Aug 11 13:02:23 2014 -0700
tree 3d8844fb1b737aaf81631020cf767803981af2b8
parent 30ffce08f511fbed4cf18daa743778b541583351

Implemented NDK libjpeg wrapper for YUV420 encoding.

Bug: 16676082
Change-Id: I588b8023b401d5e713762563c9265ec3d774a678

Android.mk

diff --git a/Android.mk b/Android.mk
index ca6d26a..8a50335 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,14 +30,7 @@
 
 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)