am 2be56ccb: Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair

[android/aapt.git] / ResourceTable.h

diff --git a/ResourceTable.h b/ResourceTable.h
index ec4331aa35579b600151fbfc0acce0d6c86e667c..3fff71c3f1c22962222fec46184155d965ffa532 100644 (file)
--- a/ResourceTable.h
+++ b/ResourceTable.h
@@ -132,6 +132,9 @@ public:
                            const String16& name,
                            const String16& comment);
     
                            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;
     size_t size() const;
     size_t numLocalResources() const;
     bool hasResources() const;


@@ -413,13 +416,16 @@ public:
         status_t addPublic(const SourcePos& pos,
                            const String16& name,
                            const uint32_t ident);
         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,
         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; }
 
 
         const SourcePos& getFirstPublicSourcePos() const { return *mFirstPublicSourcePos; }
 


@@ -435,6 +441,8 @@ public:
         const DefaultKeyedVector<String16, sp<ConfigList> >& getConfigs() const { return mConfigs; }
         const Vector<sp<ConfigList> >& getOrderedConfigs() const { return mOrderedConfigs; }
 
         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;
         const SourcePos& getPos() const { return mPos; }
     private:
         String16 mName;


@@ -443,6 +451,7 @@ public:
         SortedVector<ConfigDescription> mUniqueConfigs;
         DefaultKeyedVector<String16, sp<ConfigList> > mConfigs;
         Vector<sp<ConfigList> > mOrderedConfigs;
         SortedVector<ConfigDescription> mUniqueConfigs;
         DefaultKeyedVector<String16, sp<ConfigList> > mConfigs;
         Vector<sp<ConfigList> > mOrderedConfigs;

+        SortedVector<String16> mCanAddEntries;

         int32_t mPublicIndex;
         int32_t mIndex;
         SourcePos mPos;
         int32_t mPublicIndex;
         int32_t mIndex;
         SourcePos mPos;