am 8a67598e: am cc9747ed: am d7252571: Merge "Add --error-on-failed-insert option...

[android/aapt.git] / AaptAssets.h

diff --git a/AaptAssets.h b/AaptAssets.h
index c5a397c73390163a5f9e559d4512e244300207a1..5cfa913500639f39e67f6a8601a8126318cfe5b0 100644 (file)
--- a/AaptAssets.h
+++ b/AaptAssets.h
@@ -7,14 +7,14 @@
 #define __AAPT_ASSETS_H
 
 #include <stdlib.h>
 #define __AAPT_ASSETS_H
 
 #include <stdlib.h>

-#include <utils/AssetManager.h>
+#include <androidfw/AssetManager.h>
+#include <androidfw/ResourceTypes.h>

 #include <utils/KeyedVector.h>
 #include <utils/KeyedVector.h>

-#include <utils/String8.h>
-#include <utils/ResourceTypes.h>
+#include <utils/RefBase.h>

 #include <utils/SortedVector.h>
 #include <utils/String8.h>
 #include <utils/SortedVector.h>
 #include <utils/String8.h>

+#include <utils/String8.h>

 #include <utils/Vector.h>
 #include <utils/Vector.h>

-#include <utils/RefBase.h>

 #include "ZipFile.h"
 
 #include "Bundle.h"
 #include "ZipFile.h"
 
 #include "Bundle.h"


@@ -22,6 +22,10 @@
 
 using namespace android;
 
 
 using namespace android;
 

+
+extern const char * const gDefaultIgnoreAssets;
+extern const char * gUserIgnoreAssets;
+

 bool valid_symbol_name(const String8& str);
 
 class AaptAssets;
 bool valid_symbol_name(const String8& str);
 
 class AaptAssets;


@@ -47,6 +51,7 @@ enum {
     AXIS_SMALLESTSCREENWIDTHDP,
     AXIS_SCREENWIDTHDP,
     AXIS_SCREENHEIGHTDP,
     AXIS_SMALLESTSCREENWIDTHDP,
     AXIS_SCREENWIDTHDP,
     AXIS_SCREENHEIGHTDP,

+    AXIS_LAYOUTDIR,

     AXIS_VERSION,
 
     AXIS_START = AXIS_MCC,
     AXIS_VERSION,
 
     AXIS_START = AXIS_MCC,


@@ -91,6 +96,7 @@ public:
     static bool getSmallestScreenWidthDpName(const char* name, ResTable_config* out = NULL);
     static bool getScreenWidthDpName(const char* name, ResTable_config* out = NULL);
     static bool getScreenHeightDpName(const char* name, ResTable_config* out = NULL);
     static bool getSmallestScreenWidthDpName(const char* name, ResTable_config* out = NULL);
     static bool getScreenWidthDpName(const char* name, ResTable_config* out = NULL);
     static bool getScreenHeightDpName(const char* name, ResTable_config* out = NULL);

+    static bool getLayoutDirectionName(const char* name, ResTable_config* out = NULL);

     static bool getVersionName(const char* name, ResTable_config* out = NULL);
 
     int compare(const AaptGroupEntry& o) const;
     static bool getVersionName(const char* name, ResTable_config* out = NULL);
 
     int compare(const AaptGroupEntry& o) const;


@@ -129,6 +135,7 @@ private:
     String8 navHidden;
     String8 navigation;
     String8 screenSize;
     String8 navHidden;
     String8 navigation;
     String8 screenSize;

+    String8 layoutDirection;

     String8 version;
 
     mutable bool mParamsChanged;
     String8 version;
 
     mutable bool mParamsChanged;


@@ -315,16 +322,16 @@ class AaptSymbolEntry
 {
 public:
     AaptSymbolEntry()
 {
 public:
     AaptSymbolEntry()

-        : isPublic(false), typeCode(TYPE_UNKNOWN)
+        : isPublic(false), isJavaSymbol(false), typeCode(TYPE_UNKNOWN)

     {
     }
     AaptSymbolEntry(const String8& _name)
     {
     }
     AaptSymbolEntry(const String8& _name)

-        : name(_name), isPublic(false), typeCode(TYPE_UNKNOWN)
+        : name(_name), isPublic(false), isJavaSymbol(false), typeCode(TYPE_UNKNOWN)

     {
     }
     AaptSymbolEntry(const AaptSymbolEntry& o)
         : name(o.name), sourcePos(o.sourcePos), isPublic(o.isPublic)
     {
     }
     AaptSymbolEntry(const AaptSymbolEntry& o)
         : name(o.name), sourcePos(o.sourcePos), isPublic(o.isPublic)

-        , comment(o.comment), typeComment(o.typeComment)
+        , isJavaSymbol(o.isJavaSymbol), comment(o.comment), typeComment(o.typeComment)

         , typeCode(o.typeCode), int32Val(o.int32Val), stringVal(o.stringVal)
     {
     }
         , typeCode(o.typeCode), int32Val(o.int32Val), stringVal(o.stringVal)
     {
     }


@@ -332,6 +339,7 @@ public:
     {
         sourcePos = o.sourcePos;
         isPublic = o.isPublic;
     {
         sourcePos = o.sourcePos;
         isPublic = o.isPublic;

+        isJavaSymbol = o.isJavaSymbol;

         comment = o.comment;
         typeComment = o.typeComment;
         typeCode = o.typeCode;
         comment = o.comment;
         typeComment = o.typeComment;
         typeCode = o.typeCode;


@@ -344,6 +352,7 @@ public:
     
     SourcePos sourcePos;
     bool isPublic;
     
     SourcePos sourcePos;
     bool isPublic;

+    bool isJavaSymbol;

     
     String16 comment;
     String16 typeComment;
     
     String16 comment;
     String16 typeComment;


@@ -401,6 +410,15 @@ public:
         return NO_ERROR;
     }
 
         return NO_ERROR;
     }
 

+    status_t makeSymbolJavaSymbol(const String8& name, const SourcePos& pos) {
+        if (!check_valid_symbol_name(name, pos, "symbol")) {
+            return BAD_VALUE;
+        }
+        AaptSymbolEntry& sym = edit_symbol(name, &pos);
+        sym.isJavaSymbol = true;
+        return NO_ERROR;
+    }
+

     void appendComment(const String8& name, const String16& comment, const SourcePos& pos) {
         if (comment.size() <= 0) {
             return;
     void appendComment(const String8& name, const String16& comment, const SourcePos& pos) {
         if (comment.size() <= 0) {
             return;


@@ -441,6 +459,8 @@ public:
         return sym;
     }
 
         return sym;
     }
 

+    status_t applyJavaSymbols(const sp<AaptSymbols>& javaSymbols);
+

     const KeyedVector<String8, AaptSymbolEntry>& getSymbols() const
         { return mSymbols; }
     const DefaultKeyedVector<String8, sp<AaptSymbols> >& getNestedSymbols() const
     const KeyedVector<String8, AaptSymbolEntry>& getSymbols() const
         { return mSymbols; }
     const DefaultKeyedVector<String8, sp<AaptSymbols> >& getNestedSymbols() const


@@ -509,7 +529,11 @@ public:
     virtual ~AaptAssets() { delete mRes; }
 
     const String8& getPackage() const { return mPackage; }
     virtual ~AaptAssets() { delete mRes; }
 
     const String8& getPackage() const { return mPackage; }

-    void setPackage(const String8& package) { mPackage = package; mSymbolsPrivatePackage = package; }
+    void setPackage(const String8& package) {
+        mPackage = package;
+        mSymbolsPrivatePackage = package;
+        mHavePrivateSymbols = false;
+    }

 
     const SortedVector<AaptGroupEntry>& getGroupEntries() const;
 
 
     const SortedVector<AaptGroupEntry>& getGroupEntries() const;
 


@@ -532,11 +556,22 @@ public:
 
     sp<AaptSymbols> getSymbolsFor(const String8& name);
 
 
     sp<AaptSymbols> getSymbolsFor(const String8& name);
 

+    sp<AaptSymbols> getJavaSymbolsFor(const String8& name);
+
+    status_t applyJavaSymbols();
+

     const DefaultKeyedVector<String8, sp<AaptSymbols> >& getSymbols() const { return mSymbols; }
 
     String8 getSymbolsPrivatePackage() const { return mSymbolsPrivatePackage; }
     const DefaultKeyedVector<String8, sp<AaptSymbols> >& getSymbols() const { return mSymbols; }
 
     String8 getSymbolsPrivatePackage() const { return mSymbolsPrivatePackage; }

-    void setSymbolsPrivatePackage(const String8& pkg) { mSymbolsPrivatePackage = pkg; }
-    
+    void setSymbolsPrivatePackage(const String8& pkg) {
+        mSymbolsPrivatePackage = pkg;
+        mHavePrivateSymbols = mSymbolsPrivatePackage != mPackage;
+    }
+
+    bool havePrivateSymbols() const { return mHavePrivateSymbols; }
+
+    bool isJavaSymbol(const AaptSymbolEntry& sym, bool includePrivate) const;
+

     status_t buildIncludedResources(Bundle* bundle);
     status_t addIncludedResources(const sp<AaptFile>& file);
     const ResTable& getIncludedResources() const;
     status_t buildIncludedResources(Bundle* bundle);
     status_t addIncludedResources(const sp<AaptFile>& file);
     const ResTable& getIncludedResources() const;


@@ -576,7 +611,9 @@ private:
     String8 mPackage;
     SortedVector<AaptGroupEntry> mGroupEntries;
     DefaultKeyedVector<String8, sp<AaptSymbols> > mSymbols;
     String8 mPackage;
     SortedVector<AaptGroupEntry> mGroupEntries;
     DefaultKeyedVector<String8, sp<AaptSymbols> > mSymbols;

+    DefaultKeyedVector<String8, sp<AaptSymbols> > mJavaSymbols;

     String8 mSymbolsPrivatePackage;
     String8 mSymbolsPrivatePackage;

+    bool mHavePrivateSymbols;

 
     Vector<sp<AaptDir> > mResDirs;
 
 
     Vector<sp<AaptDir> > mResDirs;