From f9a071386662d7264376f4413d9adbedba229957 Mon Sep 17 00:00:00 2001 From: "leozwang@webrtc.org" Date: Thu, 4 Oct 2012 15:59:11 +0000 Subject: [PATCH] Make Android.mk to be able to inclucde subfolder makefiles BUG=None TEST=trybot Review URL: https://webrtc-codereview.appspot.com/868006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2870 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/video_engine/test/android/jni/Android.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/video_engine/test/android/jni/Android.mk b/src/video_engine/test/android/jni/Android.mk index 15ec8a0e0..7688d19e2 100644 --- a/src/video_engine/test/android/jni/Android.mk +++ b/src/video_engine/test/android/jni/Android.mk @@ -8,6 +8,8 @@ LOCAL_PATH := $(call my-dir) +include $(call all-makefiles-under, $(LOCAL_PATH)) + MY_LIBS_PATH := ../../../../../out/Debug/obj.target include $(CLEAR_VARS) @@ -311,6 +313,7 @@ LOCAL_STATIC_LIBRARIES := \ libjpeg_turbo \ libaudioproc_debug_proto \ libprotobuf_lite \ - libvpx + libvpx \ + $(MY_SUPPLEMENTAL_LIBS) include $(BUILD_SHARED_LIBRARY)