summaryrefslogtreecommitdiff
path: root/tools/aapt2/split/TableSplitter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tools/aapt2/split/TableSplitter.cpp')
-rw-r--r--tools/aapt2/split/TableSplitter.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/aapt2/split/TableSplitter.cpp b/tools/aapt2/split/TableSplitter.cpp
index 1dd5502202b2..2e717ff2bc3b 100644
--- a/tools/aapt2/split/TableSplitter.cpp
+++ b/tools/aapt2/split/TableSplitter.cpp
@@ -156,6 +156,12 @@ static void MarkNonPreferredDensitiesAsClaimed(
bool TableSplitter::VerifySplitConstraints(IAaptContext* context) {
bool error = false;
for (size_t i = 0; i < split_constraints_.size(); i++) {
+ if (split_constraints_[i].configs.size() == 0) {
+ // For now, treat this as a warning. We may consider aborting processing.
+ context->GetDiagnostics()->Warn(DiagMessage()
+ << "no configurations for constraint '"
+ << split_constraints_[i].name << "'");
+ }
for (size_t j = i + 1; j < split_constraints_.size(); j++) {
for (const ConfigDescription& config : split_constraints_[i].configs) {
if (split_constraints_[j].configs.find(config) != split_constraints_[j].configs.end()) {
@@ -242,6 +248,7 @@ void TableSplitter::SplitTable(ResourceTable* original_table) {
if (!split_entry->id) {
split_entry->id = entry->id;
split_entry->visibility = entry->visibility;
+ split_entry->overlayable_declarations = entry->overlayable_declarations;
}
// Copy the selected values into the new Split Entry.