Commit 511c6408 authored by John Stultz's avatar John Stultz Committed by Marge Bot
Browse files

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's avatarTapani Pälli <tapani.palli@intel.com>
Acked-by: maurossi's avatarMauro Rossi <issor.oruam@gmail.com>
Signed-off-by: John Stultz's avatarJohn Stultz <john.stultz@linaro.org>
Part-of: <mesa/mesa!4175>
parent 9dbff6f6
......@@ -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
......@@ -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
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment