commit f7400b8ad32e57b89840b53c94a9fbcca66fcc5f
author Qiwen Zhao <zhao@google.com> Wed Nov 12 23:50:38 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 12 23:50:38 2014 +0000
tree 056416d3c973baca64ec62110ffc854adf9eb3b3
parent 41663542e572c06b1be98d0b4c0bc198a43242e0
parent 3238136a95ea85c0283a1b623e501c835ed5b753

am 3238136a: Merge commit \'733ca8dfa76ac34d1f9caff8798d01a4a8f44002\' into lmp-mr1-dev

* commit '3238136a95ea85c0283a1b623e501c835ed5b753':
  Return more detailed debugging info for logging purposes.

variablespeed/jni/Android.mk

diff --git a/variablespeed/jni/Android.mk b/variablespeed/jni/Android.mk
index 0a7818a..ef6ff78 100644
--- a/variablespeed/jni/Android.mk
+++ b/variablespeed/jni/Android.mk
@@ -14,6 +14,7 @@
 #
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 # TODO: Remove the .cc extension, just .cpp.
 # TODO: Change module name to use underscores not hyphens.
@@ -36,14 +37,12 @@
 
 LOCAL_C_INCLUDES := \
     $(call include-path-for, wilhelm) \
-    external/stlport/stlport \
-    bionic \
 
 LOCAL_SHARED_LIBRARIES := \
     libOpenSLES \
-    libstlport \
     libutils \
     libcutils \
     liblog \
 
+include external/stlport/libstlport.mk
 include $(BUILD_SHARED_LIBRARY)