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: 9 additions & 0 deletions toolchain/android-toolchain-clang.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,15 @@
<!-- Build time error, not run time -->
<flag value="-Wl,--no-undefined" unless="HXCPP_ALLOW_UNDEFINED" />

<!-- Disable 16KB page alignment workaround when explicitly requested -->
<section unless="HXCPP_ANDROID_NO_16K_PAGES">
<!-- Enable 16KB page size for NDK r27 and below -->
<flag value="-Wl,-z,max-page-size=16384" unless="NDKV28+" />

<!-- Extra 16KB alignment workaround for NDK r22 and below -->
<flag value="-Wl,-z,common-page-size=16384" unless="NDKV23+" />
</section>

<flag value="-stdlib=libc++" unless="NDKV20+" />
<flag value ="-static-libstdc++" />
<!-- This shows the android link line, which may be so long that it breaks the tool
Expand Down
8 changes: 8 additions & 0 deletions toolchain/android-toolchain-gcc.xml
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,10 @@
</section>
<flag value="-Wl,--no-undefined" unless="dll_import" />
<flag value="-Wl,--unresolved-symbols=ignore-in-object-files" if="dll_import" />
<section unless="HXCPP_ANDROID_NO_16K_PAGES">
<flag value="-Wl,-z,max-page-size=16384" />
<flag value="-Wl,-z,common-page-size=16384" />
</section>
<flag value="-Wl,-z,noexecstack"/>
<flag value="--sysroot=${ANDROID_NDK_ROOT}/platforms/${PLATFORM}/${PLATFORM_ARCH}"/>
<flag value="-L${ANDROID_NDK_ROOT}/platforms/${PLATFORM}/${PLATFORM_ARCH}/usr/lib"/>
Expand Down Expand Up @@ -217,6 +221,10 @@
<flag value="-std=c++11" if="HXCPP_CPP11"/>
<flag value="-Wl,--no-undefined" unless="dll_import" />
<flag value="-Wl,--unresolved-symbols=ignore-in-object-files" if="dll_import" />
<section unless="HXCPP_ANDROID_NO_16K_PAGES">
<flag value="-Wl,-z,max-page-size=16384" />
<flag value="-Wl,-z,common-page-size=16384" />
</section>
<flag value="-Wl,-z,noexecstack"/>
<flag value="--sysroot=${ANDROID_NDK_ROOT}/platforms/${PLATFORM}/${PLATFORM_ARCH}"/>
<flag value="-L${ANDROID_NDK_ROOT}/platforms/${PLATFORM}/${PLATFORM_ARCH}/usr/lib"/>
Expand Down
Loading