From d07222fc3c4fd84e6837134528469b24cdca2de7 Mon Sep 17 00:00:00 2001
From: Mathias Agopian <mathias@google.com>
Date: Wed, 27 Feb 2019 15:53:54 -0800
Subject: [PATCH] cleanup: break dependency filamat->filaflat dependency

---
 .../include/filament/MaterialChunkType.h}                       | 0
 libs/filaflat/src/MaterialParser.cpp                            | 2 +-
 libs/filamat/CMakeLists.txt                                     | 2 +-
 libs/filamat/src/eiff/Chunk.h                                   | 2 +-
 libs/filamat/src/eiff/ChunkContainer.h                          | 2 +-
 libs/filamat/src/eiff/MaterialInterfaceBlockChunk.cpp           | 2 +-
 tools/matinfo/src/main.cpp                                      | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename libs/{filaflat/include/filaflat/FilaflatDefs.h => filabridge/include/filament/MaterialChunkType.h} (100%)

diff --git a/libs/filaflat/include/filaflat/FilaflatDefs.h b/libs/filabridge/include/filament/MaterialChunkType.h
similarity index 100%
rename from libs/filaflat/include/filaflat/FilaflatDefs.h
rename to libs/filabridge/include/filament/MaterialChunkType.h
diff --git a/libs/filaflat/src/MaterialParser.cpp b/libs/filaflat/src/MaterialParser.cpp
index da713fd8eb..50487e61bf 100644
--- a/libs/filaflat/src/MaterialParser.cpp
+++ b/libs/filaflat/src/MaterialParser.cpp
@@ -19,7 +19,7 @@
 #include <filaflat/ChunkContainer.h>
 #include <filaflat/ShaderBuilder.h>
 #include <filaflat/Unflattener.h>
-#include <filaflat/FilaflatDefs.h>
+#include <filament/MaterialChunkType.h>
 
 #include "BlobDictionary.h"
 #include "ChunkInterfaceBlock.h"
diff --git a/libs/filamat/CMakeLists.txt b/libs/filamat/CMakeLists.txt
index 16798603e8..9029817eb1 100644
--- a/libs/filamat/CMakeLists.txt
+++ b/libs/filamat/CMakeLists.txt
@@ -61,7 +61,7 @@ include_directories(${CMAKE_BINARY_DIR})
 add_library(${TARGET} STATIC ${HDRS} ${PRIVATE_HDRS} ${SRCS})
 target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
 
-target_link_libraries(${TARGET} shaders filabridge filaflat utils smol-v)
+target_link_libraries(${TARGET} shaders filabridge utils smol-v)
 
 # We are being naughty and accessing private headers here
 # For spirv-tools, we're just following glslang's example
diff --git a/libs/filamat/src/eiff/Chunk.h b/libs/filamat/src/eiff/Chunk.h
index 55a31851c9..a232578163 100644
--- a/libs/filamat/src/eiff/Chunk.h
+++ b/libs/filamat/src/eiff/Chunk.h
@@ -21,7 +21,7 @@
 
 #include "Flattener.h"
 
-#include <filaflat/FilaflatDefs.h>
+#include <filament/MaterialChunkType.h>
 
 namespace filamat {
 
diff --git a/libs/filamat/src/eiff/ChunkContainer.h b/libs/filamat/src/eiff/ChunkContainer.h
index f93ff0034b..714b90668f 100644
--- a/libs/filamat/src/eiff/ChunkContainer.h
+++ b/libs/filamat/src/eiff/ChunkContainer.h
@@ -22,7 +22,7 @@
 #include "Chunk.h"
 #include "Flattener.h"
 
-#include <filaflat/FilaflatDefs.h>
+#include <filament/MaterialChunkType.h>
 
 namespace filamat {
 
diff --git a/libs/filamat/src/eiff/MaterialInterfaceBlockChunk.cpp b/libs/filamat/src/eiff/MaterialInterfaceBlockChunk.cpp
index a192f62690..60928aff94 100644
--- a/libs/filamat/src/eiff/MaterialInterfaceBlockChunk.cpp
+++ b/libs/filamat/src/eiff/MaterialInterfaceBlockChunk.cpp
@@ -15,7 +15,7 @@
  */
 #include "MaterialInterfaceBlockChunk.h"
 
-#include "filaflat/FilaflatDefs.h"
+#include "filament/MaterialChunkType.h"
 
 using namespace filament;
 
diff --git a/tools/matinfo/src/main.cpp b/tools/matinfo/src/main.cpp
index c68b17e854..4e0abfc10c 100644
--- a/tools/matinfo/src/main.cpp
+++ b/tools/matinfo/src/main.cpp
@@ -17,7 +17,7 @@
 #include <getopt/getopt.h>
 
 #include <filaflat/ChunkContainer.h>
-#include <filaflat/FilaflatDefs.h>
+#include <filament/MaterialChunkType.h>
 #include <filaflat/MaterialParser.h>
 #include <filaflat/Unflattener.h>
 #include <filaflat/ShaderBuilder.h>