From 526d73be4a3a2714fa6112769e16fb6cd0194451 Mon Sep 17 00:00:00 2001
From: Adam Lesinski <adamlesinski@google.com>
Date: Mon, 18 Jul 2016 17:01:14 -0700
Subject: AAPT: Don't keep processing files that failed to be added

AAPT will continue ahead without reporting an error if a file
failed to be added to the ResourceTable. This would cause crashes
later when the file was assumed to be present.

Bug:30200166
Change-Id: Ieb2daf97ccf0345153b6f4598d130a38d108c937
---
 tools/aapt/ResourceTable.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tools/aapt/ResourceTable.cpp')

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);
-- 
cgit v1.2.3-59-g8ed1b