summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Roozbeh Pournader <roozbeh@google.com> 2016-06-24 17:01:07 -0700
committer Roozbeh Pournader <roozbeh@google.com> 2016-06-24 17:01:07 -0700
commit112373006f082f6f1a648c34eace0efa87b38e6c (patch)
tree3bfa547010d363670f2d2aaff50c2a37d765039b
parent42e62608e55d65109310d1596486e295fb82a2f5 (diff)
Remove LocaleValue::toDirName() from AAPT2
There was no user, and the code was incorrect too. Bug: 25599046 Change-Id: I50d14f58995ac611385a6fb17661a357bf473687
-rw-r--r--tools/aapt2/Locale.cpp27
-rw-r--r--tools/aapt2/Locale.h2
2 files changed, 0 insertions, 29 deletions
diff --git a/tools/aapt2/Locale.cpp b/tools/aapt2/Locale.cpp
index be576613b9b2..f7956c0e8d70 100644
--- a/tools/aapt2/Locale.cpp
+++ b/tools/aapt2/Locale.cpp
@@ -223,33 +223,6 @@ ssize_t LocaleValue::initFromParts(std::vector<std::string>::iterator iter,
return static_cast<ssize_t>(iter - startIter);
}
-
-std::string LocaleValue::toDirName() const {
- std::string dirName;
- if (language[0]) {
- dirName += language;
- } else {
- return dirName;
- }
-
- if (script[0]) {
- dirName += "-s";
- dirName += script;
- }
-
- if (region[0]) {
- dirName += "-r";
- dirName += region;
- }
-
- if (variant[0]) {
- dirName += "-v";
- dirName += variant;
- }
-
- return dirName;
-}
-
void LocaleValue::initFromResTable(const ResTable_config& config) {
config.unpackLanguage(language);
config.unpackRegion(region);
diff --git a/tools/aapt2/Locale.h b/tools/aapt2/Locale.h
index b1c80ab27641..33f80ada2987 100644
--- a/tools/aapt2/Locale.h
+++ b/tools/aapt2/Locale.h
@@ -57,8 +57,6 @@ struct LocaleValue {
*/
void writeTo(android::ResTable_config* out) const;
- std::string toDirName() const;
-
inline int compare(const LocaleValue& other) const;
inline bool operator<(const LocaleValue& o) const;