KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
John Stultz 2019-04-26 09:35:13 -07:00 committed by Marge Bot
parent 9dbff6f6ce
commit 511c6408f4
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/amd/Android.common.mk
View File

@ -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

4
src/gallium/drivers/radeonsi/Android.mk
View File

@ -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

4
src/gallium/winsys/amdgpu/drm/Android.mk
View File

@ -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