Mesa (master): Android: Fix vc4 build since XML changes.

[Rob Herring]

Module: Mesa
Branch: master
Commit: 7a7a84c8dbe7b519df46a71ac28f8fd4965f8627
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7a7a84c8dbe7b519df46a71ac28f8fd4965f8627

Author: Rob Herring <robh at kernel.org>
Date:   Wed Jul  5 11:19:58 2017 -0700

Android: Fix vc4 build since XML changes.

Since commit 7f80a9ff1312 ("vc4: Introduce XML-based packet header
generation like Intel's."), the vc4 build on Android is broken:

out/target/product/linaro_x86_64/gen/STATIC_LIBRARIES/libmesa_broadcom_genxml_intermediates/broadcom/cle/v3d_packet_v21_pack.h:12:10: fatal error: 'v3d_packet_helpers.h' file not found
external/mesa3d/src/gallium/drivers/vc4/vc4_cl_dump.c:28:10: fatal error: 'vc4_packet.h' file not found

The path of the generated header needs to be fixed since we build out of
tree.

Acked-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Rob Herring <robh at kernel.org>

---

 src/broadcom/Android.genxml.mk        | 10 +++++-----
 src/gallium/drivers/vc4/vc4_cl_dump.c |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/broadcom/Android.genxml.mk b/src/broadcom/Android.genxml.mk
index df44b2ec0b..a504326135 100644
--- a/src/broadcom/Android.genxml.mk
+++ b/src/broadcom/Android.genxml.mk
@@ -37,7 +37,7 @@ $(intermediates)/dummy.c:
 	$(hide) touch $@
 
 # This is the list of auto-generated files headers
-LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, $(BROADCOM_GENXML_GENERATED_FILES))
+LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/broadcom/, $(BROADCOM_GENXML_GENERATED_FILES))
 
 define header-gen
 	@mkdir -p $(dir $@)
@@ -45,13 +45,13 @@ define header-gen
 	$(hide) $(PRIVATE_SCRIPT) $(PRIVATE_SCRIPT_FLAGS) $(PRIVATE_XML) > $@
 endef
 
-$(intermediates)/cle/v3d_packet_v21_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/cle/gen_pack_header.py
-$(intermediates)/cle/v3d_packet_v21_pack.h: PRIVATE_XML := $(LOCAL_PATH)/cle/v3d_packet_v21.xml
-$(intermediates)/cle/v3d_packet_v21_pack.h: $(LOCAL_PATH)/cle/v3d_packet_v21.xml $(LOCAL_PATH)/cle/gen_pack_header.py
+$(intermediates)/broadcom/cle/v3d_packet_v21_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/cle/gen_pack_header.py
+$(intermediates)/broadcom/cle/v3d_packet_v21_pack.h: PRIVATE_XML := $(LOCAL_PATH)/cle/v3d_packet_v21.xml
+$(intermediates)/broadcom/cle/v3d_packet_v21_pack.h: $(LOCAL_PATH)/cle/v3d_packet_v21.xml $(LOCAL_PATH)/cle/gen_pack_header.py
 	$(call header-gen)
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
-	$(MESA_TOP)/src/broadcom \
+	$(MESA_TOP)/src/broadcom/cle \
 	$(intermediates)
 
 include $(MESA_COMMON_MK)
diff --git a/src/gallium/drivers/vc4/vc4_cl_dump.c b/src/gallium/drivers/vc4/vc4_cl_dump.c
index cbe35b0208..b14cf387d1 100644
--- a/src/gallium/drivers/vc4/vc4_cl_dump.c
+++ b/src/gallium/drivers/vc4/vc4_cl_dump.c
@@ -25,7 +25,7 @@
 #include "util/u_prim.h"
 #include "util/macros.h"
 #include "vc4_cl_dump.h"
-#include "vc4_packet.h"
+#include "kernel/vc4_packet.h"
 
 #define __gen_user_data void
 #define __gen_address_type uint32_t