diff options
Diffstat (limited to 'tools/aapt2/ResourceTable.h')
| -rw-r--r-- | tools/aapt2/ResourceTable.h | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/tools/aapt2/ResourceTable.h b/tools/aapt2/ResourceTable.h index 8ffff1f70710..7f5c2b8c0f37 100644 --- a/tools/aapt2/ResourceTable.h +++ b/tools/aapt2/ResourceTable.h @@ -23,6 +23,7 @@ #include "ResourceValues.h" #include "Source.h" #include "StringPool.h" +#include "io/File.h" #include <android-base/macros.h> #include <map> @@ -202,17 +203,17 @@ public: IDiagnostics* diag); bool addFileReference(const ResourceNameRef& name, - const ConfigDescription& config, - const Source& source, - const StringPiece16& path, - IDiagnostics* diag); - - bool addFileReference(const ResourceNameRef& name, - const ConfigDescription& config, - const Source& source, - const StringPiece16& path, - std::function<int(Value*,Value*)> conflictResolver, - IDiagnostics* diag); + const ConfigDescription& config, + const Source& source, + const StringPiece16& path, + IDiagnostics* diag); + + bool addFileReferenceAllowMangled(const ResourceNameRef& name, + const ConfigDescription& config, + const Source& source, + const StringPiece16& path, + io::IFile* file, + IDiagnostics* diag); /** * Same as addResource, but doesn't verify the validity of the name. This is used @@ -280,6 +281,14 @@ public: private: ResourceTablePackage* findOrCreatePackage(const StringPiece16& name); + bool addFileReferenceImpl(const ResourceNameRef& name, + const ConfigDescription& config, + const Source& source, + const StringPiece16& path, + io::IFile* file, + const char16_t* validChars, + IDiagnostics* diag); + bool addResourceImpl(const ResourceNameRef& name, ResourceId resId, const ConfigDescription& config, |