From 8a9355a98ece3d7fc9d022e759d05378060c86e2 Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Tue, 10 Mar 2015 16:55:43 -0700 Subject: Output modified bcp47 tag in ResTable_config::toString() We expect to be able to parse the output of ResTable_config::toString(), so it should use modified bcp47 (b+en+Latn+US). Change-Id: I597a1779a1fa5cff171c473e6a0368d93b9c7722 --- tools/aapt/AaptAssets.cpp | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'tools/aapt/AaptAssets.cpp') diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index 871e04f7aa9d..d346731e63e2 100644 --- a/tools/aapt/AaptAssets.cpp +++ b/tools/aapt/AaptAssets.cpp @@ -367,33 +367,6 @@ int AaptLocaleValue::initFromDirName(const Vector& parts, const int sta return currentIndex; } - -String8 AaptLocaleValue::toDirName() const { - String8 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 AaptLocaleValue::initFromResTable(const ResTable_config& config) { config.unpackLanguage(language); config.unpackRegion(region); -- cgit v1.2.3-59-g8ed1b