Unconditionally depend on build/sysincl/android.yml

Also: provide universal sysincls for jni.h on Linux.

6 files changed, 16 insertions, 20 deletions

diff --git a/build/conf/sysincl.conf b/build/conf/sysincl.conf
index cc70119d2cf..3b502bff525 100644
--- a/build/conf/sysincl.conf
+++ b/build/conf/sysincl.conf
@@ -6,6 +6,7 @@ SYSINCL+=build/sysincl/stl-to-nothing.yml
 SYSINCL+=build/sysincl/linux.yml
 SYSINCL+=build/sysincl/windows.yml
 SYSINCL+=build/sysincl/darwin.yml
+SYSINCL+=build/sysincl/android.yml
 SYSINCL+=build/sysincl/intrinsic.yml
 SYSINCL+=build/sysincl/nvidia.yml
 SYSINCL+=build/sysincl/misc.yml
@@ -45,7 +46,6 @@ when ($OS_WINDOWS == "yes") {
 }
 
 when ($OS_ANDROID == "yes") {
-    SYSINCL+=build/sysincl/android.yml
     SYSINCL+=build/sysincl/android-vulkan.yml
 }
 
diff --git a/build/sysincl/android.yml b/build/sysincl/android.yml
index af72dd22a4a..9c89d6ae51a 100644
--- a/build/sysincl/android.yml
+++ b/build/sysincl/android.yml
@@ -6,7 +6,6 @@
   - android/log.h
   - android/native_window_jni.h
   - cpu-features.h: contrib/libs/android_cpufeatures/cpu-features.h
-  - ifaddrs.h: contrib/libs/libc_compat/include/ifaddrs/ifaddrs.h
   - jni.h
   - EGL/egl.h
   - EGL/eglext.h
@@ -28,3 +27,8 @@
     - sys/procfs.h: contrib/libs/breakpad/src/common/android/include/sys/procfs.h
     - sys/signal.h: contrib/libs/breakpad/src/common/android/include/sys/signal.h
     - sys/user.h:   contrib/libs/breakpad/src/common/android/include/sys/user.h
+
+- source_filter: "^contrib/libs/android_cpufeatures"
+  includes:
+    - stdint.h: contrib/libs/glibcasm/glibc/include/stdint.h
+    - sys/cdefs.h: contrib/libs/glibcasm/glibc/include/sys/cdefs.h
diff --git a/build/sysincl/libc-to-compat.yml b/build/sysincl/libc-to-compat.yml
index 19ec9a2d09d..058a5e2176b 100644
--- a/build/sysincl/libc-to-compat.yml
+++ b/build/sysincl/libc-to-compat.yml
@@ -1,6 +1,7 @@
 # We want musl to resolve itself without these sysincls, but its test must have them
 - source_filter: "^(?!contrib/libs/musl).*|^contrib/libs/musl/tests"
   includes:
+  - ifaddrs.h: contrib/libs/libc_compat/include/ifaddrs/ifaddrs.h
   - sys/random.h: "contrib/libs/libc_compat/random/sys/random.h"
   - readpassphrase.h: "contrib/libs/libc_compat/include/readpassphrase/readpassphrase.h"
   - stdlib.h: "contrib/libs/libc_compat/reallocarray/stdlib.h"
diff --git a/build/sysincl/libc-to-nothing.yml b/build/sysincl/libc-to-nothing.yml
index ad4ef9375dd..9d774349fe6 100644
--- a/build/sysincl/libc-to-nothing.yml
+++ b/build/sysincl/libc-to-nothing.yml
@@ -78,12 +78,14 @@
   - stdarg.h
   - stdatomic.h
   - stdio_ext.h
+  - stdint.h
   - stdnoreturn.h
   - strings.h
   - stropts.h
   - sys/acct.h
   - sys/auxv.h
   - sys/cachectl.h
+  - sys/cdefs.h
   - syscall.h
   - sys/dir.h
   - sys/epoll.h
diff --git a/build/sysincl/linux.yml b/build/sysincl/linux.yml
index 1df464fab30..df4d4b2b258 100644
--- a/build/sysincl/linux.yml
+++ b/build/sysincl/linux.yml
@@ -55,12 +55,18 @@
 
 - source_filter: "^contrib/libs/webrtc/modules"
   includes:
-    - jni.h
     - aaudio/AAudio.h
     - SLES/OpenSLES.h
     - SLES/OpenSLES_Android.h
     - SLES/OpenSLES_AndroidConfiguration.h
 
+- includes:
+  - jni.h: contrib/libs/jdk/include/jni.h
+  - jni_md.h:
+    - contrib/libs/jdk/include/darwin/jni_md.h
+    - contrib/libs/jdk/include/linux/jni_md.h
+    - contrib/libs/jdk/include/win32/jni_md.h
+
 - source_filter: "^contrib/python/(coverage|gevent|greenlet)"
   includes:
   - internal/pycore_frame.h: contrib/libs/python/Include/internal/pycore_frame.h
diff --git a/build/sysincl/misc.yml b/build/sysincl/misc.yml
index b0cb65570d2..13ab120c2a6 100644
--- a/build/sysincl/misc.yml
+++ b/build/sysincl/misc.yml
@@ -32,20 +32,11 @@
 - includes:
   - _cgo_export.h
 
-# Resolve jni.h from swig/Lib/java/javahead.swg when building non-java .swg
-# since they do not peerdir contrib/libs/jdk.
 # Resolve Python.h from swig/Lib/python/pyruntime.swg when building non-python .swg
 # since they do not peerdir contrib/libs/python.
 - source_filter: "[.]swg([.](h|c(c|pp|xx)?))?$"
   includes:
-  - jni.h:           contrib/libs/jdk/include/jni.h
   - Python.h:        contrib/libs/python/Include/Python.h
-- source_filter: "^contrib/libs/jdk/include/jni[.]h$"
-  includes:
-  - jni_md.h:
-    - contrib/libs/jdk/include/darwin/jni_md.h
-    - contrib/libs/jdk/include/linux/jni_md.h
-    - contrib/libs/jdk/include/win32/jni_md.h
 
 # libunistring, libidn and libidn2
 # have its own libc header wrappers that are added to ADDINCL
@@ -343,14 +334,6 @@
     - hwloc.h
     - hwloc/cudart.h
 
-- source_filter: "^contrib/libs/(aws-sdk-cpp|c-ares|proj)"
-  includes:
-    - jni.h
-
-- source_filter: "^contrib/(libs/ffmpeg-3|libs/ffmpeg-3.4.1|restricted/patched/ffmpeg_minimal)/libavcodec/"
-  includes:
-    - jni.h
-
 - source_filter: "^contrib/(libs/(ffmpeg-3|kyotocabinet)|tools/ag)"
   includes:
     - lzma.h