diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-04 07:26:37 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-11-04 07:26:37 -0700 |
| commit | 5580e44c250944f5cd011b2682eea5cc2de9706c (patch) | |
| tree | e49d19666d7ad5f0f2e9e980f488b0085f163db6 /tools | |
| parent | db2403ff3251bebb5dd6bdb98f826a8e04dc6ed1 (diff) | |
| parent | 2fda9f45623e888f71c6ea769305ccc4d9e76af2 (diff) | |
| download | frameworks_base-5580e44c250944f5cd011b2682eea5cc2de9706c.zip frameworks_base-5580e44c250944f5cd011b2682eea5cc2de9706c.tar.gz frameworks_base-5580e44c250944f5cd011b2682eea5cc2de9706c.tar.bz2 | |
Merge "Support changing style parent in overlays"
Diffstat (limited to 'tools')
| -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 a2f085a..82c143d 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -1629,13 +1629,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); } @@ -1683,13 +1676,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); } |