X-Git-Url: https://git.saurik.com/android/aapt.git/blobdiff_plain/0b27d12badbf3afbd1890fbdc1bc05243c9dfde3..54f200b09c1a7a5e0ea5fe5d8f0601002b6040c9:/ResourceTable.h diff --git a/ResourceTable.h b/ResourceTable.h index ec4331a..186c7ca 100644 --- a/ResourceTable.h +++ b/ResourceTable.h @@ -24,6 +24,7 @@ enum { XML_COMPILE_COMPACT_WHITESPACE = 1<<2, XML_COMPILE_STRIP_WHITESPACE = 1<<3, XML_COMPILE_STRIP_RAW_VALUES = 1<<4, + XML_COMPILE_UTF8 = 1<<5, XML_COMPILE_STANDARD_RESOURCE = XML_COMPILE_STRIP_COMMENTS | XML_COMPILE_ASSIGN_ATTRIBUTE_IDS @@ -35,6 +36,12 @@ status_t compileXmlFile(const sp<AaptAssets>& assets, ResourceTable* table, int options = XML_COMPILE_STANDARD_RESOURCE); +status_t compileXmlFile(const sp<AaptAssets>& assets, + const sp<AaptFile>& target, + const sp<AaptFile>& outTarget, + ResourceTable* table, + int options = XML_COMPILE_STANDARD_RESOURCE); + status_t compileXmlFile(const sp<AaptAssets>& assets, const sp<XMLNode>& xmlTree, const sp<AaptFile>& target, @@ -132,6 +139,9 @@ public: const String16& name, const String16& comment); + void canAddEntry(const SourcePos& pos, + const String16& package, const String16& type, const String16& name); + size_t size() const; size_t numLocalResources() const; bool hasResources() const; @@ -413,13 +423,16 @@ public: status_t addPublic(const SourcePos& pos, const String16& name, const uint32_t ident); - + + void canAddEntry(const String16& name); + String16 getName() const { return mName; } sp<Entry> getEntry(const String16& entry, const SourcePos& pos, const ResTable_config* config = NULL, bool doSetIndex = false, - bool overlay = false); + bool overlay = false, + bool autoAddOverlay = false); const SourcePos& getFirstPublicSourcePos() const { return *mFirstPublicSourcePos; } @@ -435,6 +448,8 @@ public: const DefaultKeyedVector<String16, sp<ConfigList> >& getConfigs() const { return mConfigs; } const Vector<sp<ConfigList> >& getOrderedConfigs() const { return mOrderedConfigs; } + const SortedVector<String16>& getCanAddEntries() const { return mCanAddEntries; } + const SourcePos& getPos() const { return mPos; } private: String16 mName; @@ -443,6 +458,7 @@ public: SortedVector<ConfigDescription> mUniqueConfigs; DefaultKeyedVector<String16, sp<ConfigList> > mConfigs; Vector<sp<ConfigList> > mOrderedConfigs; + SortedVector<String16> mCanAddEntries; int32_t mPublicIndex; int32_t mIndex; SourcePos mPos;