commit 1d8f17368e4bf8d2af6b1caa51e1535b03822fda
author Mopria <mopriaplay@gmail.com> Tue Dec 20 13:43:46 2016 -0800
committer Glade Diviney <gladed@gmail.com> Tue Dec 20 22:11:12 2016 +0000
tree 202bbcb4cff2a87ebadaa8883e4823074a775b36
parent d7dc147de6f49b562200b4195065aaf9a054c1c1

Updated makefiles for BuiltInPrintService

Signed-off-by: Mopria <mopriaplay@gmail.com>

Android.mk

diff --git a/Android.mk b/Android.mk
index cf95d92..7f4d8de 100644
--- a/Android.mk
+++ b/Android.mk
@@ -31,4 +31,4 @@
 
 include $(BUILD_PACKAGE)
 
-include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
+include $(call all-makefiles-under,$(LOCAL_PATH))

jni/Android.mk

diff --git a/jni/Android.mk b/jni/Android.mk
index e7e95a1..12e3803 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -14,12 +14,8 @@
 # limitations under the License.
 
 LOCAL_PATH:= $(call my-dir)
-JNI_LOCAL_PATH := $(LOCAL_PATH)
-include $(call all-subdir-makefiles)
 include $(CLEAR_VARS)
 
-LOCAL_PATH:= $(JNI_LOCAL_PATH)
-
 INCLUDE_DIR    := include
 LIB_DIR        := lib
 PLUGINS_DIR    := plugins
@@ -54,11 +50,9 @@
 
 LOCAL_C_INCLUDES += \
       $(LOCAL_PATH)/$(INCLUDE_DIR) $(LOCAL_PATH)/$(PLUGINS_DIR)/genPCLm/inc \
-      $(LOCAL_PATH)/$(IPP_HELPER_DIR) external/zlib
+      $(LOCAL_PATH)/$(IPP_HELPER_DIR)
 
-LOCAL_SHARED_LIBRARIES := libcups libjpeg
-
-LOCAL_LDLIBS += -llog -lz
+LOCAL_SHARED_LIBRARIES := libcups libjpeg liblog libz
 LOCAL_MODULE := libwfds
 LOCAL_MODULE_TAGS := optional
 include $(BUILD_SHARED_LIBRARY)