diff options
| author | Xavier Ducrohet <xav@android.com> | 2010-02-04 18:45:31 -0800 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2010-02-12 17:37:50 -0800 |
| commit | b9d2dc2319d1ced5cabedabe0dfbf5add9753dbd (patch) | |
| tree | 6f0f743d309cc5a20fb00cd41b1ab647a8f49a29 /tools/aapt/ResourceTable.h | |
| parent | e88192b9d2a8c364d8545471907c5baa275bb5f6 (diff) | |
| download | frameworks_base-b9d2dc2319d1ced5cabedabe0dfbf5add9753dbd.zip frameworks_base-b9d2dc2319d1ced5cabedabe0dfbf5add9753dbd.tar.gz frameworks_base-b9d2dc2319d1ced5cabedabe0dfbf5add9753dbd.tar.bz2 | |
Add --auto-add-overlay option to aapt. DO NOT MERGE
This option allows resources only present in overlays to be
added automatically instead of being declared through <add-resource>
(merge from master)
Change-Id: I5f402a1fa7213d18724d91f84bc05ef39ace2ed9
Diffstat (limited to 'tools/aapt/ResourceTable.h')
| -rw-r--r-- | tools/aapt/ResourceTable.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/aapt/ResourceTable.h b/tools/aapt/ResourceTable.h index caa01b3..3fff71c 100644 --- a/tools/aapt/ResourceTable.h +++ b/tools/aapt/ResourceTable.h @@ -424,7 +424,8 @@ public: 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; } |