Commit b9e58be3 authored by maurossi's avatar maurossi
Browse files

android: panfrost: Move pandecode into lib/

Fixes the following building errors:

target  C: libpanfrost_decode <= external/mesa/src/panfrost/pandecode/common.c
...
clang: error: no such file or directory: 'external/mesa/src/panfrost/pandecode/common.c'
clang: error: no input files

Fixes: d62a6e7c

 ("panfrost: Move pandecode into lib/")
Signed-off-by: maurossi's avatarMauro Rossi <issor.oruam@gmail.com>
Reviewed-by: Alyssa Rosenzweig's avatarAlyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <mesa/mesa!6261>
parent de352f58
......@@ -42,7 +42,6 @@ LOCAL_STATIC_LIBRARIES := \
libmesa_nir \
libmesa_winsys_panfrost \
libpanfrost_bifrost \
libpanfrost_decode \
libpanfrost_lib \
libpanfrost_midgard \
libpanfrost_shared \
......
......@@ -62,7 +62,6 @@ LOCAL_STATIC_LIBRARIES += \
libfreedreno_perfcntrs \
libmesa_gallium \
libpanfrost_bifrost \
libpanfrost_decode \
libpanfrost_lib \
libpanfrost_midgard \
libpanfrost_shared \
......
......@@ -30,4 +30,3 @@ include $(LOCAL_PATH)/Android.bifrost.mk
include $(LOCAL_PATH)/Android.lib.mk
include $(LOCAL_PATH)/Android.midgard.mk
include $(LOCAL_PATH)/Android.shared.mk
include $(LOCAL_PATH)/Android.pandecode.mk
# Copyright © 2019 Collabora Ltd.
#
# 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.
include $(CLEAR_VARS)
LOCAL_MODULE := libpanfrost_decode
LOCAL_SRC_FILES := \
$(pandecode_FILES)
LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/gallium/auxiliary/ \
$(MESA_TOP)/src/gallium/include/ \
$(MESA_TOP)/src/panfrost/include/ \
$(MESA_TOP)/src/panfrost/lib/ \
$(MESA_TOP)/src/panfrost/pandecode/
LOCAL_STATIC_LIBRARIES := \
libpanfrost_lib
LOCAL_GENERATED_SOURCES := \
LOCAL_EXPORT_C_INCLUDE_DIRS := \
$(MESA_TOP)/src/panfrost/pandecode/ \
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
......@@ -21,6 +21,8 @@ bifrost_FILES := \
bifrost/disassemble.h
lib_FILES := \
lib/decode_common.c \
lib/decode.c \
lib/pan_afbc.c \
lib/pan_attributes.c \
lib/pan_bo.c \
......@@ -78,14 +80,6 @@ shared_FILES := \
shared/pan_minmax_cache.h \
shared/pan_tiling.h \
pandecode_FILES := \
pandecode/common.c \
pandecode/decode.c \
pandecode/decode.h \
pandecode/pan_pretty_print.c \
pandecode/pan_pretty_print.h \
pandecode/public.h
util_FILES := \
util/lcra.c \
util/lcra.h \
......
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