Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions test/std/testAndroid.hxml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
-D exe_link
-L hx4compat
-L utest
--cmd adb push arm32/Test /storage/ext_sd
--cmd adb push Test.hx /storage/ext_sd
--cmd adb shell "cd /storage/ext_sd && ./Test"
--cpp arm32
--cpp arm64
--cmd adb push arm64/Test-64 /data/local/tmp
--cmd adb push Test.hx /data/local/tmp
--cmd adb shell "cd /data/local/tmp && ./Test-64"
--cmd adb shell "rm /data/local/tmp/Test{-64,.hx}"
22 changes: 20 additions & 2 deletions toolchain/android-toolchain-clang.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,25 @@
<prefix value="lib"/>
<lib name="-llog"/>
<ext value=".so"/>


</linker>

<linker id="exe" exe="clang++" >

<exe name="clang++" />

<ext value="" />
<outflag value="-o" />
<prefix value="" />

<flag value="--target=${ABITRIPLE}${HXCPP_ANDROID_PLATFORM}" />

<flag value="-Wl,--no-undefined" unless="HXCPP_ALLOW_UNDEFINED" />

<flag value="-static-libstdc++" />

<lib name="-llog" />

</linker>

</xml>
4 changes: 4 additions & 0 deletions tools/hxcpp/BuildTool.hx
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ class BuildTool
m32 = arch=="x86";
arm64 = arch=="arm64";
}
else if (mDefines.exists("android"))
{
arm64 = true;
}
else
{
var hostArch = getArch();
Expand Down
Loading