commit 6a008170cb18666e04c42856f992fc7a0afa1e1f
author Adam Lesinski <adamlesinski@google.com> Tue Feb 02 17:02:58 2016 -0800
committer Adam Lesinski <adamlesinski@google.com> Tue Feb 02 17:02:58 2016 -0800
tree 5998b2ccc5c4e4006f6b0ab5ed37b40f7502b9dd
parent e909d94e03e2bd3eba0bb47b6295ae0bf6538c31

AAPT2: Support -c configuration filtering

Change-Id: I1e5855ca73440bdc30c21bcbc1dfdd31a9842363

tools/aapt2/link/TableMerger.h

diff --git a/tools/aapt2/link/TableMerger.h b/tools/aapt2/link/TableMerger.h
index e1be5d5..4539679 100644
--- a/tools/aapt2/link/TableMerger.h
+++ b/tools/aapt2/link/TableMerger.h
@@ -20,6 +20,7 @@
 #include "Resource.h"
 #include "ResourceTable.h"
 #include "ResourceValues.h"
+#include "filter/ConfigFilter.h"
 #include "io/File.h"
 #include "process/IResourceTableConsumer.h"
 #include "util/Util.h"
@@ -51,6 +52,11 @@
      * If true, resources in overlays can be added without previously having existed.
      */
     bool autoAddOverlay = false;
+
+    /**
+     * A filter that removes resources whose configurations don't match.
+     */
+    IConfigFilter* filter = nullptr;
 };
 
 /**