Browse Source

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
Brenton Bostick 2 years ago
parent
commit
cdf248b1e2
1 changed files with 1 additions and 3 deletions
  1. 1 3
      java/jni/Android.mk

+ 1 - 3
java/jni/Android.mk

@@ -11,15 +11,13 @@ LOCAL_C_INCLUDES := \
 LOCAL_LDLIBS := -llog
 LOCAL_LDLIBS := -llog
 # LOCAL_CFLAGS := -g
 # LOCAL_CFLAGS := -g
 
 
-APP_UNIFIED_HEADERS := true
-
 LOCAL_CFLAGS := -DZT_USE_MINIUPNPC
 LOCAL_CFLAGS := -DZT_USE_MINIUPNPC
 ifeq ($(TARGET_ARCH_ABI),x86_64)
 ifeq ($(TARGET_ARCH_ABI),x86_64)
     LOCAL_CXXFLAGS := -maes -mpclmul -msse3 -msse4.1
     LOCAL_CXXFLAGS := -maes -mpclmul -msse3 -msse4.1
 endif
 endif
 ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
 ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
     LOCAL_ARM_NEON := true
     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
 endif
 
 
 # ZeroTierOne SDK source files
 # ZeroTierOne SDK source files