diff options
| author | John Stultz <john.stultz@linaro.org> | 2019-04-26 09:35:13 -0700 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-03-19 21:20:08 +0000 |
| commit | 511c6408f48097bb4c04087931e3712ade662525 (patch) | |
| tree | 080543726aeeea77185c4cf0f05336cfa5578426 | |
| parent | 9dbff6f6ce0dea622f98c9d14336148e9afc19ae (diff) | |
Android.mk: Tweak MESA_ENABLE_LLVM checks
Change the MESA_ENABLE_LLVM checks in Android.mk
files in order to get mesa3d to build w/ AOSP
using mmma.
This tries to re-create a change that was introduced
in the following merge in the AOSP branch:
69f2c0128d2b Merge branch 'aosp/upstream-18.0'
Acked-by: Tapani Pälli <tapani.palli@intel.com>
Acked-by: Mauro Rossi <issor.oruam@gmail.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4175>
| -rw-r--r-- | src/amd/Android.common.mk | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/Android.mk | 4 | ||||
| -rw-r--r-- | src/gallium/winsys/amdgpu/drm/Android.mk | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk index 1ee06e9b63e..416bae107fa 100644 --- a/src/amd/Android.common.mk +++ b/src/amd/Android.common.mk @@ -20,6 +20,8 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. +ifeq ($(MESA_ENABLE_LLVM),true) + # --------------------------------------- # Build libmesa_amd_common # --------------------------------------- @@ -97,3 +99,5 @@ $(call mesa-build-with-llvm) include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) + +endif # MESA_ENABLE_LLVM == true diff --git a/src/gallium/drivers/radeonsi/Android.mk b/src/gallium/drivers/radeonsi/Android.mk index f69b0d9219e..bbee9336065 100644 --- a/src/gallium/drivers/radeonsi/Android.mk +++ b/src/gallium/drivers/radeonsi/Android.mk @@ -21,6 +21,8 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. +ifeq ($(MESA_ENABLE_LLVM),true) + LOCAL_PATH := $(call my-dir) # get C_SOURCES and GENERATED_SOURCES @@ -96,3 +98,5 @@ $(eval GALLIUM_LIBS += \ libmesa_winsys_amdgpu) $(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES)) endif + +endif # MESA_ENABLE_LLVM==true diff --git a/src/gallium/winsys/amdgpu/drm/Android.mk b/src/gallium/winsys/amdgpu/drm/Android.mk index 0b8edf972dc..90f56e45bdc 100644 --- a/src/gallium/winsys/amdgpu/drm/Android.mk +++ b/src/gallium/winsys/amdgpu/drm/Android.mk @@ -21,6 +21,8 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. +ifeq ($(MESA_ENABLE_LLVM),true) + LOCAL_PATH := $(call my-dir) # get C_SOURCES @@ -46,3 +48,5 @@ ifneq ($(HAVE_GALLIUM_RADEONSI),) $(eval GALLIUM_LIBS += $(LOCAL_MODULE) $(LOCAL_STATIC_LIBRARIES)) $(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES)) endif + +endif # MESA_ENABLE_LLVM==true |