Move some classes to private

libs/filament-matp/CMakeLists.txt

@@ -8,26 +8,26 @@ set(PUBLIC_HDR_DIR include)
 # Sources and headers
 # ==================================================================================================
 set(PUBLIC_HDRS
-        include/filament-matp/JsonishLexeme.h
-        include/filament-matp/JsonishLexer.h
-        include/filament-matp/JsonishParser.h
-        include/filament-matp/Lexeme.h
-        include/filament-matp/Lexer.h
-        include/filament-matp/MaterialLexeme.h
-        include/filament-matp/MaterialLexer.h
-        include/filament-matp/ParametersProcessor.h
-        include/filament-matp/DirIncluder.h
         include/filament-matp/Config.h
         include/filament-matp/MaterialParser.h
 )
 
 set(SRCS
+        src/DirIncluder.h
+        src/JsonishLexeme.h
+        src/JsonishLexer.h
+        src/JsonishParser.h
+        src/Lexeme.h
+        src/Lexer.h
+        src/MaterialLexeme.h
+        src/MaterialLexer.h
+        src/ParametersProcessor.h
+        src/DirIncluder.cpp
         src/JsonishLexer.cpp
         src/JsonishParser.cpp
         src/MaterialLexer.cpp
-        src/ParametersProcessor.cpp
-        src/DirIncluder.cpp
         src/MaterialParser.cpp
+        src/ParametersProcessor.cpp
 )
 
 # ==================================================================================================

libs/filament-matp/include/filament-matp/Config.h

@@ -17,8 +17,8 @@
 #ifndef TNT_CONFIG_H
 #define TNT_CONFIG_H
 
-#include <backend/DriverEnums.h>
 #include <filament/MaterialEnums.h>
+#include <backend/DriverEnums.h>
 
 #include <filamat/MaterialBuilder.h>
 

libs/filament-matp/include/filament-matp/MaterialParser.h

@@ -21,9 +21,6 @@
 #include <string>
 #include <unordered_map>
 
-#include "JsonishLexeme.h"
-#include "JsonishParser.h"
-#include "MaterialLexeme.h"
 #include "Config.h"
 
 namespace filamat {
@@ -34,6 +31,8 @@ class TestMaterialParser;
 namespace matp {
 
 class JsonishValue;
+class MaterialLexeme;
+
 class MaterialParser {
 public:
     MaterialParser();

libs/filament-matp/src/DirIncluder.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <filament-matp/DirIncluder.h>
+#include "DirIncluder.h"
 
 #include <utils/Log.h>
 

libs/filament-matp/src/JsonishLexer.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <filament-matp/JsonishLexer.h>
+#include "JsonishLexer.h"
 
 #include <string.h>
 

libs/filament-matp/src/JsonishParser.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <filament-matp/JsonishParser.h>
+#include "JsonishParser.h"
 
 #include <stdlib.h>
 

libs/filament-matp/src/MaterialLexer.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <filament-matp/MaterialLexer.h>
+#include "MaterialLexer.h"
 
 namespace matp {
 

libs/filament-matp/src/MaterialParser.cpp

@@ -27,12 +27,12 @@
 #include <utils/Log.h>
 #include <utils/JobSystem.h>
 
-#include <filament-matp/DirIncluder.h>
-#include <filament-matp/JsonishLexer.h>
-#include <filament-matp/JsonishParser.h>
-#include <filament-matp/MaterialLexeme.h>
-#include <filament-matp/MaterialLexer.h>
-#include <filament-matp/ParametersProcessor.h>
+#include "DirIncluder.h"
+#include "JsonishLexer.h"
+#include "JsonishParser.h"
+#include "MaterialLexeme.h"
+#include "MaterialLexer.h"
+#include "ParametersProcessor.h"
 #include <filament-matp/Config.h>
 
 using namespace utils;

libs/filament-matp/src/ParametersProcessor.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <filament-matp/ParametersProcessor.h>
+#include "ParametersProcessor.h"
 
 #include <filamat/Enums.h>
 

libs/filament-matp/tests/test_includer.cpp

@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include <filament-matp/DirIncluder.h>
+#include "../src/DirIncluder.h"
 
 using namespace utils;
 using namespace filamat;

libs/filament-matp/tests/test_matp.cpp

@@ -1,5 +1,5 @@
 /*
-* Copyright (C) 2018 The Android Open Source Project
+* Copyright (C) 2025 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@
 #include "TestMaterialParser.h"
 
 #include <filament-matp/MaterialParser.h>
-#include <filament-matp/JsonishLexer.h>
-#include <filament-matp/JsonishParser.h>
-#include <filament-matp/MaterialLexer.h>
+#include "../src/JsonishLexer.h"
+#include "../src/JsonishParser.h"
+#include "../src/MaterialLexer.h"
 
 class MaterialLexer: public ::testing::Test {
 protected:

tools/matc/src/matc/MaterialCompiler.cpp

@@ -25,7 +25,7 @@
 #include <utils/Log.h>
 #include <utils/JobSystem.h>
 
-#include <filament-matp/DirIncluder.h>
+#include "../../../../libs/filament-matp/src/DirIncluder.h"
 #include <filament-matp/Config.h>
 
 #include "SPIRV/GlslangToSpv.h"

tools/matc/src/matc/MaterialCompiler.h

@@ -20,7 +20,7 @@
 #include <string>
 #include <unordered_map>
 
-#include <filament-matp/MaterialLexeme.h>
+#include "../../../../libs/filament-matp/src/MaterialLexeme.h"
 #include <filament-matp/Config.h>
 #include <filament-matp/MaterialParser.h>
 #include "Compiler.h"