Use pre-built acl by environment variable (#3533)

* Use pre-built acl by environment variable

When environment variable EXT_ACL_FOLDER is set, use pre-built acl binary

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
* Fix if-else syntax in Makefile

diff --git a/Makefile b/Makefile
index 44234de..59fa357 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -111,6 +111,9 @@ endif
 ACL_FOLDER_NAME=$(ACL_BUILD_OUT).$(BUILD_TYPE_LC)
 ACL_COMMAND+= build_dir=$(ACL_FOLDER_NAME)
 ACL_FOLDER_BUILD=$(ACL_FOLDER)/build/$(ACL_FOLDER_NAME)
+ifneq ($(EXT_ACL_FOLDER),)
+       ACL_FOLDER_BUILD=$(EXT_ACL_FOLDER)
+endif
 
 ifeq ($(OBS_BUILD),ON)
        UPDATE_MODULE=0
@@ -169,20 +172,23 @@ install_internal:
        touch $(TIMESTAMP_INSTALL)
 
 internal_acl_build: configure_internal
+ifeq ($(EXT_ACL_FOLDER),)
 ifeq ($(TARGET_OS),android)
        cd $(ACL_FOLDER) && CXX=clang++ CC=clang PATH=$(ANDROID_GNUSTL_PATH) $(ACL_COMMAND)
 else
        cd $(ACL_FOLDER) && $(ACL_COMMAND)
 endif
+endif
 
 internal_acl_install:
+       @echo $(ACL_FOLDER_BUILD)
        @mkdir -vp $(INSTALL_PATH)/lib
        @cp -v $(ACL_FOLDER_BUILD)/libarm_compute_core.so $(INSTALL_PATH)/lib/.
        @cp -v $(ACL_FOLDER_BUILD)/libarm_compute_graph.so $(INSTALL_PATH)/lib/.
        @cp -v $(ACL_FOLDER_BUILD)/libarm_compute.so $(INSTALL_PATH)/lib/.
 
 external_acl:
-ifneq ($(EXT_ACL_FOLDER),"")
+ifneq ($(EXT_ACL_FOLDER),)
        @mkdir -vp $(INSTALL_PATH)/lib
        @cp -v $(EXT_ACL_FOLDER)/libarm_compute_core.so $(INSTALL_PATH)/lib/.
        @cp -v $(EXT_ACL_FOLDER)/libarm_compute_graph.so $(INSTALL_PATH)/lib/.