summaryrefslogtreecommitdiff
path: root/tools/aapt2/util/Util.cpp
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2016-01-11 13:10:24 -0800
committerAdam Lesinski <adamlesinski@google.com>2016-01-13 18:48:24 -0800
commit52364f7ae31716d7827ea8f8566f4a28bd30a921 (patch)
treece146fb6dc5e9f9b1166964b77273b6481f8258b /tools/aapt2/util/Util.cpp
parentd901155166983adde84d9da2a6b265371191068a (diff)
AAPT2: Variety of small fixes to get the build working
- Add option to rename package in AndroidManifest.xml - Support default versionName and versionCode - Accept True and False as valid booleans Change-Id: I400e350b9dcd0fd1c197d1929144299c7823617d
Diffstat (limited to 'tools/aapt2/util/Util.cpp')
-rw-r--r--tools/aapt2/util/Util.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/aapt2/util/Util.cpp b/tools/aapt2/util/Util.cpp
index 9ecc974d3a1c..7b0c71d93bb5 100644
--- a/tools/aapt2/util/Util.cpp
+++ b/tools/aapt2/util/Util.cpp
@@ -175,10 +175,11 @@ Maybe<std::u16string> getFullyQualifiedClassName(const StringPiece16& package,
return {};
}
- std::u16string result(package.data(), package.size());
if (className.data()[0] != u'.') {
- result += u'.';
+ return {};
}
+
+ std::u16string result(package.data(), package.size());
result.append(className.data(), className.size());
if (!isJavaClassName(result)) {
return {};