diff options
| author | Brenton Bostick <[email protected]> | 2022-12-05 09:56:13 -0500 |
|---|---|---|
| committer | Brenton Bostick <[email protected]> | 2022-12-05 10:34:12 -0500 |
| commit | cdf248b1e2333f914fcecb8dabc651914f2a65d7 (patch) | |
| tree | 6d1707c3baf8f1541ba60d68f89f439421729346 /java | |
| parent | ebc1ed40158eadf8f9da6a28e337a9ba6058f8cd (diff) | |
Fix build problem related to unified headers
Since NDKr15 (released 2017), unified headers are used by default [1]
Remove -isystem option that was passing bad values to command-line.
The actual value being passed to command-line was:
```
-isystem DK/sysroot/usr/include/RIPLE
```
because of using $NDK and $TRIPLE instead of $(NDK) and $(TRIPLE)
But regardless, $NDK and $TRIPLE were never actually defined values and were just
place-holders mentioned in [1]
[1] https://android.googlesource.com/platform/ndk/+/ndk-release-r16/docs/UnifiedHeaders.md
Diffstat (limited to 'java')
| -rw-r--r-- | java/jni/Android.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/java/jni/Android.mk b/java/jni/Android.mk index 952bc432..9f3434b7 100644 --- a/java/jni/Android.mk +++ b/java/jni/Android.mk @@ -11,15 +11,13 @@ LOCAL_C_INCLUDES := \ LOCAL_LDLIBS := -llog # LOCAL_CFLAGS := -g -APP_UNIFIED_HEADERS := true - LOCAL_CFLAGS := -DZT_USE_MINIUPNPC ifeq ($(TARGET_ARCH_ABI),x86_64) LOCAL_CXXFLAGS := -maes -mpclmul -msse3 -msse4.1 endif ifeq ($(TARGET_ARCH_ABI),arm64-v8a) LOCAL_ARM_NEON := true - LOCAL_CXXFLAGS := -march=armv8-a+crypto -mfloat-abi=softfp -mfpu=neon -maes -isystem $NDK/sysroot/usr/include/$TRIPLE + LOCAL_CXXFLAGS := -march=armv8-a+crypto -mfloat-abi=softfp -mfpu=neon -maes endif # ZeroTierOne SDK source files |