From 1db39d513c108fddb53a272f321fa58713ce5dc4 Mon Sep 17 00:00:00 2001
From: garryyan <garryyan@tencent.com>
Date: Fri, 8 Dec 2017 15:19:59 +0800
Subject: [PATCH] fixed build xlog fail when APP_STL:=stlport_static

---
 mars/libraries/build_android.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 mars/libraries/build_android.py

diff --git a/mars/libraries/build_android.py b/mars/libraries/build_android.py
old mode 100755
new mode 100644
index 0a9e3d5da..004927454
--- a/mars/libraries/build_android.py
+++ b/mars/libraries/build_android.py
@@ -51,8 +51,14 @@ def build_android_xlog_static_libs(_path="mars_xlog_sdk", _arch="armeabi", _lib_
     for i in range(len(BUILD_XLOG_PATHS)-1, -1, -1):
         if not os.path.exists("../" + BUILD_XLOG_PATHS[i] + "/jni"):
             continue
-        
-        files = os.listdir("../" + BUILD_XLOG_PATHS[i] + "/libs")
+		
+			
+        files = []
+        if os.path.exists("../" + BUILD_XLOG_PATHS[i] + "/libs"):
+            files = os.listdir("../" + BUILD_XLOG_PATHS[i] + "/libs")
+        elif os.path.exists("../" + BUILD_XLOG_PATHS[i] + "/obj/local/"):
+            files = os.listdir("../" + BUILD_XLOG_PATHS[i] + "/obj/local/")
+			
         for f in files:
             if os.path.isfile(f):
                 continue