Skip to content

Commit f43bb15

Browse files
committed
Correct the fix for the merge conflict
I need to take the code from unity-staging at 8e38872 instead of the code from trunk to properly handle this merge conflict.
1 parent 5832c4f commit f43bb15

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

external/buildscripts/build_runtime_tizen.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ BUILDDIR=/$PWD
77
OUTDIR=builds/embedruntimes/tizen
88
BUILDSCRIPTSDIR=external/buildscripts
99

10-
#perl ${BUILDSCRIPTSDIR}/PrepareTizenNDK.pl -ndk=2.4.0 -env=envsetup.sh && source envsetup.sh && source ${TIZEN_NDK_ROOT}/tizen-ndk-env.sh
10+
perl ${BUILDSCRIPTSDIR}/SDKDownloader.pm --repo_name=tizen-sdk --artifacts_folder=artifacts && source artifacts/SDKDownloader/tizen-sdk/env.sh
1111

1212
CXXFLAGS="-Os -DHAVE_ARMV6=1 -DARM_FPU_VFP=1 -D__ARM_EABI__ -march=armv7-a -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a9 \
1313
-ffunction-sections -fdata-sections -fno-strict-aliasing -fPIC"

0 commit comments

Comments
 (0)