update to master

update build files add depthspace, add batchspace_8 try to fix high priority issues update copyright dates update makefiles
XiaoMi · May 1, 2018 · 4a3259a · 4a3259a
1 parent b0a8e8e
commit 4a3259a
Show file tree

Hide file tree

Showing 118 changed files with 9,269 additions and 2,590 deletions.
diff --git a/glue/V_android_Release.min → glue/V_android.min b/glue/V_android_Release.min → glue/V_android.min
@@ -1,21 +1,21 @@
 #  min file
 
-MAKE_D_3_LIBDIR = $(HEXAGON_SDK_ROOT)/libs/fastcv/dspCV/android_Release/ship
-MAKE_D_2_LIBDIR = $(HEXAGON_SDK_ROOT)/libs/common/rpcmem/android_Release/ship
+MAKE_D_3_LIBDIR = $(HEXAGON_SDK_ROOT)/libs/fastcv/dspCV/$(V)/ship
+MAKE_D_2_LIBDIR = $(HEXAGON_SDK_ROOT)/libs/common/rpcmem/$(V)/ship
 MAKE_D_1_INCDIR = $(HEXAGON_SDK_ROOT)/incs
-MAKE_D_EXT_c_DIR = $(HEXAGON_SDK_ROOT)/build/make.d.ext/c/android_Release
-MAKE_D_2_INCDIR = $(HEXAGON_SDK_ROOT)/libs/common/remote/ship/android_Release
+MAKE_D_EXT_c_DIR = $(HEXAGON_SDK_ROOT)/build/make.d.ext/c/$(V)
+MAKE_D_2_INCDIR = $(HEXAGON_SDK_ROOT)/libs/common/remote/ship/$(V)
 MAKE_D_3_INCDIR = $(HEXAGON_SDK_ROOT)/incs/stddef
 MAKE_D_EXT_2_DIR = $(HEXAGON_SDK_ROOT)/build/make.d.ext/android
 QURT_IMAGE_DIR = $(HEXAGON_SDK_ROOT)/libs/common/qurt
 MAKE_D_DIR = $(HEXAGON_SDK_ROOT)/build/make.d
-MAKE_D_1_LIBDIR = $(HEXAGON_SDK_ROOT)/libs/common/remote/ship/android_Release
-MAKE_D_DSPCV_INCDIR = $(HEXAGON_SDK_ROOT)/libs/fastcv/dspCV/android_Release/ship
+MAKE_D_1_LIBDIR = $(HEXAGON_SDK_ROOT)/libs/common/remote/ship/$(V)
+MAKE_D_DSPCV_INCDIR = $(HEXAGON_SDK_ROOT)/libs/fastcv/dspCV/$(V)/ship
 MAKE_D_EXT_1_DIR = $(HEXAGON_SDK_ROOT)/build/make.d.ext/hexagon
 MAKE_D_EXT_3_DIR = $(HEXAGON_SDK_ROOT)/build/make.d.ext/qaic
-MAKE_D_4_INCDIR = $(HEXAGON_SDK_ROOT)/libs/common/rpcmem/android_Release/ship
-MAKE_D_ADSPMSGD_INCDIR = $(HEXAGON_SDK_ROOT)/libs/common/adspmsgd/ship/android_Release
-MAKE_D_ADSPMSGD_LIBDIR = $(HEXAGON_SDK_ROOT)/libs/common/adspmsgd/ship/android_Release
+MAKE_D_4_INCDIR = $(HEXAGON_SDK_ROOT)/libs/common/rpcmem/$(V)/ship
+MAKE_D_ADSPMSGD_INCDIR = $(HEXAGON_SDK_ROOT)/libs/common/adspmsgd/ship/$(V)
+MAKE_D_ADSPMSGD_LIBDIR = $(HEXAGON_SDK_ROOT)/libs/common/adspmsgd/ship/$(V)
 
 # adjust paths to be relative to current working dir
 _pkg_deps = MAKE_D_3_LIBDIR MAKE_D_2_LIBDIR MAKE_D_1_INCDIR MAKE_D_EXT_c_DIR MAKE_D_2_INCDIR MAKE_D_3_INCDIR MAKE_D_EXT_2_DIR QURT_IMAGE_DIR MAKE_D_DIR MAKE_D_1_LIBDIR MAKE_D_DSPCV_INCDIR MAKE_D_EXT_1_DIR MAKE_D_EXT_3_DIR MAKE_D_4_INCDIR MAKE_D_ADSPMSGD_LIBDIR MAKE_D_ADSPMSGD_INCDIR
@@ -25,9 +25,9 @@ __pkg_dir := $(filter-out ./,$(dir $(lastword $(MAKEFILE_LIST))))
 # assign these variables only for the top-level makefile
 ifeq ($(origin __pkg_root),undefined)
   __pkg_root    := $(__pkg_dir)..
-  __pkg_result  := $(__pkg_root)$(filter-out /.,/android_Release/ship)
+  __pkg_result  := $(__pkg_root)$(filter-out /.,/$(V)/ship)
   __pkg_deps    := $(_pkg_deps)
 endif
 __pkg_version ?= 10419363
 
-SHIP_DIR := $(__pkg_dir)../android_Release/ship
+SHIP_DIR := $(__pkg_dir)../$(V)/ship
diff --git a/glue/V_android_Release_aarch64.min b/glue/V_android_Release_aarch64.min
diff --git a/glue/V_hexagon.min b/glue/V_hexagon.min
@@ -0,0 +1,34 @@
+#  min file
+
+MAKE_D_3_LIBDIR = $(HEXAGON_SDK_ROOT)/libs/fastcv/dspCV/$(V)/ship
+MAKE_D_EXT_3_DIR = $(HEXAGON_SDK_ROOT)/build/make.d.ext/qaic
+MAKE_D_EXT_c_DIR = $(HEXAGON_SDK_ROOT)/build/make.d.ext/c/$(V)
+MAKE_D_2_INCDIR = $(HEXAGON_SDK_ROOT)/libs/common/remote/ship/$(V)
+MAKE_D_3_INCDIR = $(HEXAGON_SDK_ROOT)/incs/stddef
+MAKE_D_4_LIBDIR = $(HEXAGON_SDK_ROOT)/test/common/test_util/$(V)/ship
+MAKE_D_5_LIBDIR = $(HEXAGON_SDK_ROOT)/libs/common/atomic/$(V)/ship
+MAKE_D_DIR = $(HEXAGON_SDK_ROOT)/build/make.d
+MAKE_D_1_LIBDIR = $(HEXAGON_SDK_ROOT)/libs/common/remote/ship/$(V)
+MAKE_D_2_LIBDIR = $(HEXAGON_SDK_ROOT)/libs/common/rpcmem/$(V)/ship
+MAKE_D_1_INCDIR = $(HEXAGON_SDK_ROOT)/incs
+MAKE_D_EXT_2_DIR = $(HEXAGON_SDK_ROOT)/build/make.d.ext/android
+QURT_IMAGE_DIR = $(HEXAGON_SDK_ROOT)/libs/common/qurt
+MAKE_D_4_INCDIR = $(HEXAGON_SDK_ROOT)/libs/common/rpcmem/$(V)/ship
+MAKE_D_EXT_1_DIR = $(HEXAGON_SDK_ROOT)/build/make.d.ext/hexagon
+MAKE_D_DSPCV_INCDIR = $(HEXAGON_SDK_ROOT)/libs/fastcv/dspCV/$(V)/ship
+MAKE_D_5_INCDIR = $(HEXAGON_SDK_ROOT)/test/common/test_util/$(V)/ship
+
+# adjust paths to be relative to current working dir
+_pkg_deps = MAKE_D_3_LIBDIR MAKE_D_EXT_3_DIR MAKE_D_EXT_c_DIR MAKE_D_2_INCDIR MAKE_D_3_INCDIR MAKE_D_4_LIBDIR MAKE_D_5_LIBDIR MAKE_D_DIR MAKE_D_1_LIBDIR MAKE_D_2_LIBDIR MAKE_D_1_INCDIR MAKE_D_EXT_2_DIR QURT_IMAGE_DIR MAKE_D_4_INCDIR MAKE_D_EXT_1_DIR MAKE_D_DSPCV_INCDIR MAKE_D_5_INCDIR
+__pkg_dir := $(filter-out ./,$(dir $(lastword $(MAKEFILE_LIST))))
+#$(foreach v,$(_pkg_deps),$(eval $v := $(__pkg_dir)$$($v)))
+
+# assign these variables only for the top-level makefile
+ifeq ($(origin __pkg_root),undefined)
+  __pkg_root    := $(__pkg_dir)..
+  __pkg_result  := $(__pkg_root)$(filter-out /.,/$(V)/ship)
+  __pkg_deps    := $(_pkg_deps)
+endif
+__pkg_version ?= 10419363
+
+SHIP_DIR := $(__pkg_dir)../$(V)/ship
diff --git a/glue/V_hexagon_Release_dynamic_toolv72_v60.min b/glue/V_hexagon_Release_dynamic_toolv72_v60.min
diff --git a/glue/V_hexagon_Release_dynamic_toolv80_v60.min b/glue/V_hexagon_Release_dynamic_toolv80_v60.min
diff --git a/glue/V_hexagon_Release_dynamic_toolv81_v60.min b/glue/V_hexagon_Release_dynamic_toolv81_v60.min
diff --git a/glue/V_hexagon_Release_dynamic_toolv82_v60.min b/glue/V_hexagon_Release_dynamic_toolv82_v60.min
diff --git a/glue/android_Release.mak → glue/android.mak b/glue/android_Release.mak → glue/android.mak
@@ -3,50 +3,51 @@ _@ ?= @
 
 .PHONY: QAIC_DIR MAKE_D_EXT_3_DIR MAKE_D_3_LIBDIR MAKE_D_1_LIBDIR MAKE_D_2_LIBDIR_MAKE_D_2_LIBDIR MAKE_D_2_LIBDIR tree QAIC_DIR_clean MAKE_D_EXT_3_DIR_clean MAKE_D_3_LIBDIR_clean MAKE_D_1_LIBDIR_clean MAKE_D_2_LIBDIR_MAKE_D_2_LIBDIR_clean MAKE_D_2_LIBDIR_clean tree_clean
 
-tree: MAKE_D_3_LIBDIR MAKE_D_2_LIBDIR MAKE_D_3_LIBDIR MAKE_D_EXT_3_DIR MAKE_D_2_LIBDIR
-	$(call job,,$(MAKE) V=android_Release,making .)
+tree: MAKE_D_3_LIBDIR MAKE_D_2_LIBDIR MAKE_D_EXT_3_DIR MAKE_D_2_LIBDIR
+	$(call job,,$(MAKE) V=$(V),making .)
 
 tree_clean: MAKE_D_3_LIBDIR_clean MAKE_D_2_LIBDIR_clean MAKE_D_3_LIBDIR_clean MAKE_D_EXT_3_DIR_clean MAKE_D_2_LIBDIR_clean
-	$(call job,,$(MAKE) V=android_Release clean,cleaning .)
+	$(call job,,$(MAKE) V=$(V) clean,cleaning .)
 
 MAKE_D_2_LIBDIR: MAKE_D_EXT_3_DIR MAKE_D_1_LIBDIR MAKE_D_2_LIBDIR_MAKE_D_2_LIBDIR
-	$(call job,$(HEXAGON_SDK_ROOT)/libs/common/rpcmem,$(MAKE) V=android_Release,making $(HEXAGON_SDK_ROOT)/libs/common/rpcmem)
+	$(call job,$(HEXAGON_SDK_ROOT)/libs/common/rpcmem,$(MAKE) V=$(V),making $(HEXAGON_SDK_ROOT)/libs/common/rpcmem)
 
 MAKE_D_2_LIBDIR_clean: MAKE_D_EXT_3_DIR_clean MAKE_D_1_LIBDIR_clean MAKE_D_2_LIBDIR_MAKE_D_2_LIBDIR_clean
-	$(call job,$(HEXAGON_SDK_ROOT)/libs/common/rpcmem,$(MAKE) V=android_Release clean,cleaning $(HEXAGON_SDK_ROOT)/libs/common/rpcmem)
+	$(call job,$(HEXAGON_SDK_ROOT)/libs/common/rpcmem,$(MAKE) V=$(V) clean,cleaning $(HEXAGON_SDK_ROOT)/libs/common/rpcmem)
 
 MAKE_D_2_LIBDIR_MAKE_D_2_LIBDIR: 
-	$(call job,$(HEXAGON_SDK_ROOT)/libs/common/atomic,$(MAKE) V=android_Release,making $(HEXAGON_SDK_ROOT)/libs/common/atomic)
+	$(call job,$(HEXAGON_SDK_ROOT)/libs/common/atomic,$(MAKE) V=$(V),making $(HEXAGON_SDK_ROOT)/libs/common/atomic)
 
 MAKE_D_2_LIBDIR_MAKE_D_2_LIBDIR_clean: 
-	$(call job,$(HEXAGON_SDK_ROOT)/libs/common/atomic,$(MAKE) V=android_Release clean,cleaning $(HEXAGON_SDK_ROOT)/libs/common/atomic)
+	$(call job,$(HEXAGON_SDK_ROOT)/libs/common/atomic,$(MAKE) V=$(V) clean,cleaning $(HEXAGON_SDK_ROOT)/libs/common/atomic)
 
 MAKE_D_1_LIBDIR: 
-	$(call job,$(HEXAGON_SDK_ROOT)/test/common/test_util,$(MAKE) V=android_Release,making $(HEXAGON_SDK_ROOT)/test/common/test_util)
+	$(call job,$(HEXAGON_SDK_ROOT)/test/common/test_util,$(MAKE) V=$(V),making $(HEXAGON_SDK_ROOT)/test/common/test_util)
 
 MAKE_D_1_LIBDIR_clean: 
-	$(call job,$(HEXAGON_SDK_ROOT)/test/common/test_util,$(MAKE) V=android_Release clean,cleaning $(HEXAGON_SDK_ROOT)/test/common/test_util)
+	$(call job,$(HEXAGON_SDK_ROOT)/test/common/test_util,$(MAKE) V=$(V) clean,cleaning $(HEXAGON_SDK_ROOT)/test/common/test_util)
 
 MAKE_D_3_LIBDIR: MAKE_D_EXT_3_DIR
-	$(call job,$(HEXAGON_SDK_ROOT)/libs/fastcv/dspCV,$(MAKE) V=android_Release,making $(HEXAGON_SDK_ROOT)/libs/fastcv/dspCV)
+	$(call job,$(HEXAGON_SDK_ROOT)/libs/fastcv/dspCV,$(MAKE) V=$(V),making $(HEXAGON_SDK_ROOT)/libs/fastcv/dspCV)
 
 MAKE_D_3_LIBDIR_clean: MAKE_D_EXT_3_DIR_clean
-	$(call job,$(HEXAGON_SDK_ROOT)/libs/fastcv/dspCV,$(MAKE) V=android_Release clean,cleaning $(HEXAGON_SDK_ROOT)/libs/fastcv/dspCV)
+	$(call job,$(HEXAGON_SDK_ROOT)/libs/fastcv/dspCV,$(MAKE) V=$(V) clean,cleaning $(HEXAGON_SDK_ROOT)/libs/fastcv/dspCV)
 
 MAKE_D_EXT_3_DIR: QAIC_DIR
 
 MAKE_D_EXT_3_DIR_clean: QAIC_DIR_clean
 
+W := $(findstring ECHO,$(shell echo))# W => Windows environment
+
 QAIC_DIR: 
-	$(call job,$(HEXAGON_SDK_ROOT)/tools/qaic,make,making $(HEXAGON_SDK_ROOT)/tools/qaic)
+	$(if $W,,$(call job,$(HEXAGON_SDK_ROOT)/tools/qaic,make,making $(HEXAGON_SDK_ROOT)/tools/qaic))
 
 QAIC_DIR_clean: 
-	$(call job,$(HEXAGON_SDK_ROOT)/tools/qaic,make clean,cleaning $(HEXAGON_SDK_ROOT)/tools/qaic)
+	$(if $W,,$(call job,$(HEXAGON_SDK_ROOT)/tools/qaic,make clean,cleaning $(HEXAGON_SDK_ROOT)/tools/qaic))
 
-W := $(findstring ECHO,$(shell echo))# W => Windows environment
 @LOG = $(if $W,$(TEMP)\\)$@-build.log
 
-C = $(if $1,cd $1 && )$2
+C = $(if $1,$(if $W,cd /D,cd) $1 && )$2
 job = $(_@)echo $3 && ( $C )> $(@LOG) && $(if $W,del,rm) $(@LOG) || ( echo ERROR $3 && $(if $W,type,cat) $(@LOG) && $(if $W,del,rm) $(@LOG) && exit 1)
 ifdef VERBOSE
   job = $(_@)echo $3 && $C