diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-05 14:05:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-05 14:05:41 -0700 |
| commit | 3442611ee11b2987c83054fe3c7ed5521f27f052 (patch) | |
| tree | ff4a2db0081d7c404b0c5a1bdc4ac28768272405 /tools/aapt | |
| parent | 8806fc729b96bf806806ef8d82147d59abfc1536 (diff) | |
| parent | 5580e44c250944f5cd011b2682eea5cc2de9706c (diff) | |
| download | frameworks_base-3442611ee11b2987c83054fe3c7ed5521f27f052.zip frameworks_base-3442611ee11b2987c83054fe3c7ed5521f27f052.tar.gz frameworks_base-3442611ee11b2987c83054fe3c7ed5521f27f052.tar.bz2 | |
am 5580e44c: Merge "Support changing style parent in overlays"
* commit '5580e44c250944f5cd011b2682eea5cc2de9706c':
Support changing style parent in overlays
Diffstat (limited to 'tools/aapt')
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 29644a6..fc576a6 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -1724,13 +1724,6 @@ status_t ResourceTable::startBag(const SourcePos& sourcePos, // If a parent is explicitly specified, set it. if (bagParent.size() > 0) { - String16 curPar = e->getParent(); - if (curPar.size() > 0 && curPar != bagParent) { - sourcePos.error("Conflicting parents specified, was '%s', now '%s'\n", - String8(e->getParent()).string(), - String8(bagParent).string()); - return UNKNOWN_ERROR; - } e->setParent(bagParent); } @@ -1778,13 +1771,6 @@ status_t ResourceTable::addBag(const SourcePos& sourcePos, // If a parent is explicitly specified, set it. if (bagParent.size() > 0) { - String16 curPar = e->getParent(); - if (curPar.size() > 0 && curPar != bagParent) { - sourcePos.error("Conflicting parents specified, was '%s', now '%s'\n", - String8(e->getParent()).string(), - String8(bagParent).string()); - return UNKNOWN_ERROR; - } e->setParent(bagParent); } |