Commit 2a70a1d6 authored by Roman Stratiienko's avatar Roman Stratiienko Committed by Marge Bot
Browse files

panfrost: Align Android makefiles with recent changes


Reviewed-by: Alyssa Rosenzweig's avatarAlyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Signed-off-by: Roman Stratiienko's avatarRoman Stratiienko <roman.stratiienko@nure.ua>
Tested-by: Marge Bot <mesa/mesa!4280>
Part-of: <mesa/mesa!4280>
parent 6c8ccbe4
......@@ -45,7 +45,8 @@ LOCAL_STATIC_LIBRARIES := \
libpanfrost_decode \
libpanfrost_encoder \
libpanfrost_midgard \
libpanfrost_shared
libpanfrost_shared \
libpanfrost_util \
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
......
......@@ -15,6 +15,8 @@ C_SOURCES := \
pan_blit.c \
pan_bo.c \
pan_bo.h \
pan_cmdstream.c \
pan_cmdstream.h \
pan_compute.c \
pan_context.c \
pan_context.h \
......
......@@ -64,7 +64,8 @@ LOCAL_STATIC_LIBRARIES += \
libpanfrost_decode \
libpanfrost_encoder \
libpanfrost_midgard \
libpanfrost_shared
libpanfrost_shared \
libpanfrost_util \
ifeq ($(USE_LIBBACKTRACE),true)
LOCAL_SHARED_LIBRARIES += libbacktrace
......
......@@ -44,7 +44,8 @@ LOCAL_C_INCLUDES := \
LOCAL_STATIC_LIBRARIES := \
libmesa_glsl \
libmesa_nir \
libmesa_st_mesa
libmesa_st_mesa \
libpanfrost_util \
midgard_nir_algebraic_gen := $(LOCAL_PATH)/midgard/midgard_nir_algebraic.py
midgard_nir_algebraic_deps := \
......
......@@ -25,6 +25,7 @@
LOCAL_PATH := $(call my-dir)
include $(LOCAL_PATH)/Makefile.sources
include $(LOCAL_PATH)/Android.util.mk
include $(LOCAL_PATH)/Android.bifrost.mk
include $(LOCAL_PATH)/Android.encoder.mk
include $(LOCAL_PATH)/Android.midgard.mk
......
# Mesa 3-D graphics library
#
# Copyright (C)
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included
# in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
# Android.mk for libpanfrost_util.a
# ---------------------------------------
# Build libpanfrost_util
# ---------------------------------------
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
$(util_FILES)
LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/panfrost/include/ \
$(MESA_TOP)/src/gallium/auxiliary/ \
$(MESA_TOP)/src/gallium/include/
LOCAL_STATIC_LIBRARIES := \
libmesa_nir \
LOCAL_MODULE := libpanfrost_util
LOCAL_GENERATED_SOURCES := \
LOCAL_EXPORT_C_INCLUDE_DIRS := \
$(MESA_TOP)/src/panfrost/util/ \
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
......@@ -17,6 +17,7 @@ encoder_FILES := \
encoder/pan_afbc.c \
encoder/pan_attributes.c \
encoder/pan_encoder.h \
encoder/pan_format.c \
encoder/pan_invocation.c \
encoder/pan_props.c \
encoder/pan_sampler.c \
......@@ -68,3 +69,11 @@ pandecode_FILES := \
pandecode/pan_pretty_print.c \
pandecode/pan_pretty_print.h \
pandecode/public.h
util_FILES := \
util/lcra.c \
util/lcra.h \
util/pan_ir.c \
util/pan_ir.h \
util/pan_liveness.c \
util/pan_sysval.c \
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