diff options
| author | Jesse Natalie <jenatali@microsoft.com> | 2021-08-04 17:55:58 -0700 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2021-11-19 21:21:35 +0000 |
| commit | 33e5a4378efee353ddadf103300ab27ed4dc32c7 (patch) | |
| tree | 70937c3523ff09dbe1c72f409c217c628f2ef34a /android | |
| parent | 6138b047e294db910d16da63e2e7280e55823899 (diff) | |
| download | mesa-33e5a4378efee353ddadf103300ab27ed4dc32c7.tar.gz mesa-33e5a4378efee353ddadf103300ab27ed4dc32c7.tar.bz2 mesa-33e5a4378efee353ddadf103300ab27ed4dc32c7.zip | |
android,d3d12: Support using DirectX-Headers dependency from AOSP
Note that the Android build system apparently lowercases stuff,
so add a lowercase "directx-headers" dependency which is searched first,
before falling back to the proper-cased "DirectX-Headers" dependency.
Reviewed-by: Roman Stratiienko <r.stratiienko@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13532>
Diffstat (limited to 'android')
| -rw-r--r-- | android/Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/android/Android.mk b/android/Android.mk index 4cc400f2883..2523bc4fd4a 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -75,6 +75,12 @@ LOCAL_SHARED_LIBRARIES += libdrm_nouveau MESON_GEN_PKGCONFIGS += libdrm_nouveau:$(LIBDRM_VERSION) endif +ifneq ($(filter d3d12,$(BOARD_MESA3D_GALLIUM_DRIVERS)),) +LOCAL_HEADER_LIBRARIES += DirectX-Headers +LOCAL_STATIC_LIBRARIES += DirectX-Guids +MESON_GEN_PKGCONFIGS += DirectX-Headers +endif + ifneq ($(MESON_GEN_LLVM_STUB),) MESON_LLVM_VERSION := 12.0.0 # Required for swr gallium target |