This is a series of clean-ups and fixes to the Android build files. Overall, it removes a lot of the if conditions that aren't necessary for normal builds and also enables "mmma external/mesa3d" to build everything for easier build testing.
This fixes LLVM enabled builds on master though that requires changes to LLVM as well. In the process, LLVM builds with Lollipop are dropped as L doesn't have the minimum LLVM version for several drivers. Also, android-x86 L support is using mesa 11.0. I've only tested against AOSP master so far. Mauro tested M and N with the previous version of the series. I don't think there's anything really different here that would break M or N. A git branch including llvmpipe building is here[1]. v2 highlights: - Rework handling of LLVM settings - Cleanup of libcxx includes - Clarify the "all" driver option - Make libelf a whole static lib - Warn on LLVM enabled on L or earlier - Various comments requested by Emil Rob [1] https://github.com/robherring/mesa.git android-make-cleanup Mauro Rossi (2): Android: drop static linking of R600 LLVM libraries Android: define required __STDC* macros as cflags Rob Herring (12): Android: remove remaining explicit libcxx includes Android: amd: use exported include dirs instead of explicit includes Android: amd/common: fix dependency on libmesa_nir Android: Fix swrast only build Android: remove needless conditional including of child makefiles Android: push driver build details to driver makefiles Android: Add driver "all" option to enable all drivers Android: drop LLVM support on Lollipop Android: rework libelf dependencies Android: rework LLVM build support Android: Add LLVM support for Android O Android: Drop linking libgcc Android.common.mk | 19 +------ Android.mk | 77 +++++++++++++++++----------- src/amd/Android.addrlib.mk | 6 +++ src/amd/Android.common.mk | 15 ++++-- src/compiler/Android.nir.gen.mk | 1 + src/egl/Android.mk | 18 +++---- src/gallium/Android.common.mk | 8 --- src/gallium/Android.mk | 61 ++++------------------ src/gallium/auxiliary/Android.mk | 8 +-- src/gallium/auxiliary/pipe-loader/Android.mk | 7 ++- src/gallium/drivers/freedreno/Android.mk | 5 ++ src/gallium/drivers/i915/Android.mk | 4 ++ src/gallium/drivers/nouveau/Android.mk | 6 ++- src/gallium/drivers/r300/Android.mk | 4 ++ src/gallium/drivers/r600/Android.mk | 12 +++-- src/gallium/drivers/radeon/Android.mk | 12 +++-- src/gallium/drivers/radeonsi/Android.mk | 15 +++++- src/gallium/drivers/softpipe/Android.mk | 4 ++ src/gallium/drivers/svga/Android.mk | 4 ++ src/gallium/drivers/vc4/Android.mk | 4 ++ src/gallium/drivers/virgl/Android.mk | 4 ++ src/gallium/state_trackers/dri/Android.mk | 10 ++-- src/gallium/targets/dri/Android.mk | 70 ++----------------------- src/gallium/winsys/amdgpu/drm/Android.mk | 14 ++--- src/gallium/winsys/i915/drm/Android.mk | 4 ++ src/mesa/Android.libmesa_dricore.mk | 4 -- src/mesa/Android.libmesa_st_mesa.mk | 4 -- src/mesa/drivers/dri/Android.mk | 11 +--- 28 files changed, 180 insertions(+), 231 deletions(-) -- 2.11.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
