Merge remote-tracking branch 'upstream/develop' into develop

CMakeLists.txt

@@ -14,26 +14,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY build)
 file(GLOB_RECURSE PADDLE_MOBILE_CC src/*.cc src/*.cpp src/*.c)
 file(GLOB_RECURSE PADDLE_MOBILE_H src/*.h)
 
-# include headers
 include_directories(src/)
 
-#include(ExternalProject)
-#ExternalProject_Add(openblas_proj
-#        GIT_REPOSITORY "https://github.com/xianyi/OpenBLAS.git"
-#        GIT_TAG "v0.2.20"
-#        SOURCE_DIR "openblas/"
-#        BUILD_IN_SOURCE 1
-#        CONFIGURE_COMMAND ""
-#        BUILD_COMMAND "make" "ONLY_CBLAS=1"
-#        INSTALL_COMMAND "make" "PREFIX=${CMAKE_BINARY_DIR}/" "install"
-#        )
-#set_target_properties(openblas_proj PROPERTIES EXCLUDE_FROM_ALL 1)
-
-#add_dependencies(paddle-mobile openblas_proj)
-
-# gen static
-ADD_LIBRARY(paddle-mobile SHARED ${PADDLE_MOBILE_CC} ${PADDLE_MOBILE_H})
-
-#add_dependencies(paddle-mobile openblas_proj)
+add_library(paddle-mobile SHARED ${PADDLE_MOBILE_CC} ${PADDLE_MOBILE_H})
 
 add_subdirectory(test)

build.sh

@@ -38,8 +38,9 @@ build_for_android() {
         exit -1
     fi
 
-    PLATFORM="arm-v7a"
-#    PLATFORM="arm-v8a"
+    if [ -z "$PLATFORM" ]; then
+        PLATFORM="arm-v7a"  # Users could choose "arm-v8a" or other platforms from the command line.
+    fi
 
     if [ "${PLATFORM}" = "arm-v7a" ]; then
         ABI="armeabi-v7a with NEON"