diff options
| author | 2016-07-19 01:29:28 +0000 | |
|---|---|---|
| committer | 2016-07-19 01:29:29 +0000 | |
| commit | d94f55552f4d4526c4b388b6616fb4afb8edb0b0 (patch) | |
| tree | c122516be398b0bc6e9e5b3e4d6890df0e819c00 /tools/aapt/ResourceTable.cpp | |
| parent | 3ab0b4a1a8df5f8a2459370d2714c20dac19ca0f (diff) | |
| parent | 526d73be4a3a2714fa6112769e16fb6cd0194451 (diff) | |
Merge "AAPT: Don't keep processing files that failed to be added" into nyc-mr1-dev
Diffstat (limited to 'tools/aapt/ResourceTable.cpp')
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 6a4b63789815..6d80a69b7444 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -4521,6 +4521,7 @@ bool ResourceTable::shouldGenerateVersionedResource( const ConfigDescription& sourceConfig, const int sdkVersionToGenerate) { assert(sdkVersionToGenerate > sourceConfig.sdkVersion); + assert(configList != NULL); const DefaultKeyedVector<ConfigDescription, sp<ResourceTable::Entry>>& entries = configList->getEntries(); ssize_t idx = entries.indexOfKey(sourceConfig); |