commit 6240840387335632fdc92d5d168f924e2f414dda
author Adam Lesinski <adamlesinski@google.com> Thu Aug 07 21:26:53 2014 -0700
committer Adam Lesinski <adamlesinski@google.com> Thu Aug 14 19:29:47 2014 +0000
tree c6e61afb94092c457c16c1c2c31b8cbb7277e4bf
parent d7c1fae12ef0b31c225ef130e6b06445b5af53a9

Ensure that split names are valid

Generate valid split names for resource splits.
Validate split names for features.

Change-Id: I3040438af0156778c2bd66ddeffdf62fe9dcc9fc

tools/aapt/Resource.cpp

diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp
index 2401b3a..010d59b 100644
--- a/tools/aapt/Resource.cpp
+++ b/tools/aapt/Resource.cpp
@@ -937,8 +937,8 @@
     }
 
     // Add the 'split' attribute which describes the configurations included.
-    String8 splitName("config_");
-    splitName.append(split->getDirectorySafeName());
+    String8 splitName("config.");
+    splitName.append(split->getPackageSafeName());
     manifest->addAttribute(String16(), String16("split"), String16(splitName));
 
     // Build an empty <application> tag (required).