Skip to content

Commit bd3ff54

Browse files
build(jni): android folder is not yet generated
1 parent 0de5d33 commit bd3ff54

File tree

4 files changed

+0
-31
lines changed

4 files changed

+0
-31
lines changed

goldenmaster/Plugins/buildTestPlugins.bat

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -164,15 +164,6 @@ xcopy /E /Y "%script_path%\TbRefIfaces" "%TbRefIfacesPluginTarget_path%\" >nul
164164
if %ERRORLEVEL% GEQ 1 exit /b %ERRORLEVEL%
165165

166166

167-
@REM copy android plugins to blank project for build and functional testing
168-
set androidTarget_path=%ProjectTarget_path%\android
169-
echo android from "%script_path%\..\android" to "%androidTarget_path%\"
170-
mkdir %androidTarget_path%
171-
if %ERRORLEVEL% GEQ 1 exit /b %ERRORLEVEL%
172-
xcopy /E /Y "%script_path%\..\android" "%androidTarget_path%\" >nul
173-
if %ERRORLEVEL% GEQ 1 exit /b %ERRORLEVEL%
174-
175-
176167
@REM run build and tests
177168
call :buildTestPlugins "%ProjectTarget_path%/TP_Blank.uproject" %script_path% ".Impl.+.OLink.+.MsgBus.+.Jni."
178169
exit /b 0

goldenmaster/Plugins/buildTestPlugins.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,5 @@ mkdir -p "$ProjectTarget_path/Plugins/TbRefIfaces" && cp -rf "$script_path/TbRef
121121
if [ $? -ne 0 ]; then exit 1; fi;
122122

123123

124-
# copy android plugin to blank project for build and functional testing
125-
mkdir -p "$ProjectTarget_path/../android" && cp -rf "$script_path/android" "$ProjectTarget_path/android/" 1>&-
126-
if [ $? -ne 0 ]; then exit 1; fi;
127-
128-
129124
buildTestPlugins "$ProjectTarget_path/TP_Blank.uproject" "$script_path" ".Impl.+.OLink.+.MsgBus.+.Jni."
130125
if [ $buildresult -ne 0 ]; then exit 1; fi;

templates/buildTestPlugins.bat.tpl

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,6 @@ xcopy /E /Y "%script_path%\{{ Camel .Name}}" "%{{ Camel .Name}}PluginTarget_path
7373
if %ERRORLEVEL% GEQ 1 exit /b %ERRORLEVEL%
7474
{{ end }}
7575
76-
{{ if .Features.jni -}}
77-
78-
@REM copy android plugins to blank project for build and functional testing
79-
set androidTarget_path=%ProjectTarget_path%\android
80-
echo android from "%script_path%\..\android" to "%androidTarget_path%\"
81-
mkdir %androidTarget_path%
82-
if %ERRORLEVEL% GEQ 1 exit /b %ERRORLEVEL%
83-
xcopy /E /Y "%script_path%\..\android" "%androidTarget_path%\" >nul
84-
if %ERRORLEVEL% GEQ 1 exit /b %ERRORLEVEL%
85-
{{ end }}
86-
8776
@REM run build and tests
8877
call :buildTestPlugins "%ProjectTarget_path%/TP_Blank.uproject" %script_path% ".Impl.{{ if .Features.olink -}}+.OLink.{{ end }}{{ if .Features.msgbus_tests -}}+.MsgBus.{{ end }}{{ if .Features.jni_tests -}}+.Jni.{{ end }}"
8978
exit /b 0

templates/buildTestPlugins.sh.tpl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,5 @@ mkdir -p "$ProjectTarget_path/Plugins/{{Camel .Name}}" && cp -rf "$script_path/{
7575
if [ $? -ne 0 ]; then exit 1; fi;
7676
{{ end }}
7777

78-
{{ if .Features.jni -}}
79-
# copy android plugin to blank project for build and functional testing
80-
mkdir -p "$ProjectTarget_path/../android" && cp -rf "$script_path/android" "$ProjectTarget_path/android/" 1>&-
81-
if [ $? -ne 0 ]; then exit 1; fi;
82-
{{ end }}
83-
8478
buildTestPlugins "$ProjectTarget_path/TP_Blank.uproject" "$script_path" ".Impl.{{ if .Features.olink -}}+.OLink.{{ end }}{{ if .Features.msgbus_tests -}}+.MsgBus.{{ end }}{{ if .Features.jni_tests -}}+.Jni.{{ end }}"
8579
if [ $buildresult -ne 0 ]; then exit 1; fi;

0 commit comments

Comments
 (0)