diff options
| author | Narayan Kamath <narayan@google.com> | 2015-01-21 09:59:15 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-01-21 09:59:15 +0000 |
| commit | 9907540e90c6794a028d7e1bd5bab0a6cc4a3e5b (patch) | |
| tree | f07fa568468ecc8da97f50802f149255580599e6 /geocoder/src/com/google/i18n | |
| parent | 4f84888a47efdb9d8f4b08216cbd0f7bb7887247 (diff) | |
| download | libphonenumber-9907540e90c6794a028d7e1bd5bab0a6cc4a3e5b.tar.gz | |
Revert "Temporary workaround build system issues."
This reverts commit d627ef9abbc8f6e641c92c2fd1c7a502a6485b87.
Fixed properly in the build system now.
Diffstat (limited to 'geocoder/src/com/google/i18n')
| -rw-r--r-- | geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java | 4 | ||||
| -rw-r--r-- | geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java b/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java index 71e3a1ba..afbc0b2d 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java +++ b/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java @@ -34,10 +34,8 @@ import java.util.logging.Logger; */ public class PhoneNumberToTimeZonesMapper { private static PhoneNumberToTimeZonesMapper instance = null; - // TODO: Revert this hideous hack once the build system has been changed - // to let resource files be jar-jared. private static final String MAPPING_DATA_DIRECTORY = - "/com/gaggle/i18n/phonenumbers/timezones/data/".replace("gaggle", "google"); + "/com/google/i18n/phonenumbers/timezones/data/"; private static final String MAPPING_DATA_FILE_NAME = "map_data"; // This is defined by ICU as the unknown time zone. private static final String UNKNOWN_TIMEZONE = "Etc/Unknown"; diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java b/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java index 46c6d0fd..5642a11d 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java @@ -32,10 +32,8 @@ import java.util.Locale; */ public class PhoneNumberOfflineGeocoder { private static PhoneNumberOfflineGeocoder instance = null; - // TODO: Revert this hideous hack once the build system has been changed - // to let resource files be jar-jared. private static final String MAPPING_DATA_DIRECTORY = - "/com/gaggle/i18n/phonenumbers/geocoding/data/".replace("gaggle", "google"); + "/com/google/i18n/phonenumbers/geocoding/data/"; private PrefixFileReader prefixFileReader = null; private final PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance(); |