android: intel: Flatten the makefile structure

Android porting of commit bebc1a1 "intel: Flatten the makefile structure"

Automake approach was followed, by moving makefiles a level up,
naming them Android.genxml.mk and Android.isl.mk,
performing the necessary adjustments to the paths,
adding src/intel/Android.mk and fixing mesa top level makefile.

Acked-by: Jason Ekstrand <[email protected]>

1 files changed, 0 insertions, 217 deletions

diff --git a/src/intel/isl/Android.mk b/src/intel/isl/Android.mk
deleted file mode 100644
index e2771ad320f..00000000000
--- a/src/intel/isl/Android.mk
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright © 2016 Intel Corporation
-# Copyright © 2016 Mauro Rossi <[email protected]>
-#
-# 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-# Import variables LIBISL_FILES.
-include $(LOCAL_PATH)/Makefile.sources
-
-LIBISL_GENX_COMMON_INCLUDES := \
-	$(MESA_TOP)/src/ \
-	$(MESA_TOP)/src/mesa/drivers/dri/i965
-
-# ---------------------------------------
-# Build libisl_gen4
-# ---------------------------------------
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libmesa_isl_gen4
-
-LOCAL_SRC_FILES := $(ISL_GEN4_FILES)
-
-LOCAL_CFLAGS := -DGEN_VERSIONx10=40
-
-LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
-
-LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
-
-include $(MESA_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
-
-# ---------------------------------------
-# Build libisl_gen5
-# ---------------------------------------
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libmesa_isl_gen5
-
-LOCAL_SRC_FILES := $(ISL_GEN5_FILES)
-
-LOCAL_CFLAGS := -DGEN_VERSIONx10=50
-
-LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
-
-LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
-
-include $(MESA_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
-
-# ---------------------------------------
-# Build libisl_gen6
-# ---------------------------------------
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libmesa_isl_gen6
-
-LOCAL_SRC_FILES := $(ISL_GEN6_FILES)
-
-LOCAL_CFLAGS := -DGEN_VERSIONx10=60
-
-LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
-
-LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
-
-include $(MESA_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
-
-# ---------------------------------------
-# Build libisl_gen7
-# ---------------------------------------
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libmesa_isl_gen7
-
-LOCAL_SRC_FILES := $(ISL_GEN7_FILES)
-
-LOCAL_CFLAGS := -DGEN_VERSIONx10=70
-
-LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
-
-LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
-
-include $(MESA_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
-
-# ---------------------------------------
-# Build libisl_gen75
-# ---------------------------------------
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libmesa_isl_gen75
-
-LOCAL_SRC_FILES := $(ISL_GEN75_FILES)
-
-LOCAL_CFLAGS := -DGEN_VERSIONx10=75
-
-LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
-
-LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
-
-include $(MESA_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
-
-# ---------------------------------------
-# Build libisl_gen8
-# ---------------------------------------
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libmesa_isl_gen8
-
-LOCAL_SRC_FILES := $(ISL_GEN8_FILES)
-
-LOCAL_CFLAGS := -DGEN_VERSIONx10=80
-
-LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
-
-LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
-
-include $(MESA_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
-
-# ---------------------------------------
-# Build libisl_gen9
-# ---------------------------------------
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libmesa_isl_gen9
-
-LOCAL_SRC_FILES := $(ISL_GEN9_FILES)
-
-LOCAL_CFLAGS := -DGEN_VERSIONx10=90
-
-LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
-
-LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
-
-include $(MESA_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
-
-# ---------------------------------------
-# Build libisl
-# ---------------------------------------
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libmesa_isl
-
-LOCAL_SRC_FILES := $(ISL_FILES)
-
-LOCAL_C_INCLUDES := \
-	$(MESA_TOP)/src/gallium/include \
-	$(MESA_TOP)/src/gallium/auxiliary \
-	$(MESA_TOP)/src/mapi \
-	$(MESA_TOP)/src/mesa \
-	$(MESA_TOP)/src/mesa/drivers/dri/i965 \
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(MESA_TOP)/src/intel
-
-LOCAL_WHOLE_STATIC_LIBRARIES := \
-	libmesa_isl_gen4 \
-	libmesa_isl_gen5 \
-	libmesa_isl_gen6 \
-	libmesa_isl_gen7 \
-	libmesa_isl_gen75 \
-	libmesa_isl_gen8 \
-	libmesa_isl_gen9
-
-# Autogenerated sources
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-
-intermediates := $(call local-generated-sources-dir)
-
-LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, $(ISL_GENERATED_FILES))
-
-define bash-gen
-	@mkdir -p $(dir $@)
-	@echo "Gen Bash: $(PRIVATE_MODULE) <= $(notdir $(@))"
-	$(hide) $(PRIVATE_SCRIPT) --csv $(PRIVATE_CSV) --out $@
-endef
-
-isl_format_layout_deps := \
-	$(LOCAL_PATH)/gen_format_layout.py \
-	$(LOCAL_PATH)/isl_format_layout.csv
-
-$(intermediates)/isl_format_layout.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/gen_format_layout.py
-$(intermediates)/isl_format_layout.c: PRIVATE_CSV := $(LOCAL_PATH)/isl_format_layout.csv
-$(intermediates)/isl_format_layout.c: $(isl_format_layout_deps)
-	$(call bash-gen)
-
-include $(MESA_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)