commit 5f6b29054ce1ec000e2e90983e0762e0510a694f
author Alan Newberger <alann@google.com> Tue Sep 23 19:50:52 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 23 19:50:52 2014 +0000
tree 7d433abf8aa360ac67100127c86cde4695628a61
parent 9e8e96556697c955d4eea058ac051f11aea0a3b5
parent bad9708bd92213e65bfc9761ce3e69f8a59e1483

am bad9708b: Add error log to API1 CameraAgent

* commit 'bad9708bd92213e65bfc9761ce3e69f8a59e1483':
  Add error log to API1 CameraAgent

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)