summaryrefslogtreecommitdiff
path: root/libphonenumber/src
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-01-21 09:59:15 +0000
committerNarayan Kamath <narayan@google.com>2015-01-21 09:59:15 +0000
commit9907540e90c6794a028d7e1bd5bab0a6cc4a3e5b (patch)
treef07fa568468ecc8da97f50802f149255580599e6 /libphonenumber/src
parent4f84888a47efdb9d8f4b08216cbd0f7bb7887247 (diff)
downloadlibphonenumber-9907540e90c6794a028d7e1bd5bab0a6cc4a3e5b.tar.gz
Revert "Temporary workaround build system issues."
This reverts commit d627ef9abbc8f6e641c92c2fd1c7a502a6485b87. Fixed properly in the build system now.
Diffstat (limited to 'libphonenumber/src')
-rw-r--r--libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java b/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java
index 5e36dcb3..e6f44dee 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java
@@ -37,12 +37,10 @@ import java.util.logging.Logger;
* would handle the main metadata file (PhoneNumberMetadata.xml) as well.
*/
class MetadataManager {
- // TODO: Revert this hideous hack once the build system has been changed
- // to let resource files be jar-jared.
private static final String ALTERNATE_FORMATS_FILE_PREFIX =
- "/com/gaggle/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto".replace("gaggle", "google");
+ "/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto";
private static final String SHORT_NUMBER_METADATA_FILE_PREFIX =
- "/com/gaggle/i18n/phonenumbers/data/ShortNumberMetadataProto".replace("gaggle", "google");
+ "/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto";
private static final Logger LOGGER = Logger.getLogger(MetadataManager.class.getName());