From a1ac650151176485d3fedb5ee598857f853a10a6 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Thu, 17 Apr 2014 18:33:18 -0700
Subject: Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled
 build.

Change-Id: Id0a381ce06370347670ab9b324039ccc2222f93c
---
 Android.mk | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index cf5b767bb..b814907b4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -33,14 +33,7 @@ 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_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni libjni_jpegstream
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
-- 
cgit v1.2.3