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 /carrier | |
| 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 'carrier')
| -rw-r--r-- | carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java | 4 | ||||
| -rw-r--r-- | carrier/test/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapperTest.java | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java b/carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java index 4d328b95..201062d9 100644 --- a/carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java +++ b/carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java @@ -30,10 +30,8 @@ import java.util.Locale; */ public class PhoneNumberToCarrierMapper { private static PhoneNumberToCarrierMapper 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/carrier/data/".replace("gaggle", "google"); + "/com/google/i18n/phonenumbers/carrier/data/"; private PrefixFileReader prefixFileReader = null; private final PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance(); diff --git a/carrier/test/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapperTest.java b/carrier/test/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapperTest.java index 37c81582..8ca0e2d6 100644 --- a/carrier/test/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapperTest.java +++ b/carrier/test/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapperTest.java @@ -28,10 +28,8 @@ import java.util.Locale; public class PhoneNumberToCarrierMapperTest extends TestCase { private final PhoneNumberToCarrierMapper carrierMapper = new PhoneNumberToCarrierMapper(TEST_MAPPING_DATA_DIRECTORY); - // TODO: Revert this hideous hack once the build system has been changed - // to let resource files be jar-jared. private static final String TEST_MAPPING_DATA_DIRECTORY = - "/com/gaggle/i18n/phonenumbers/carrier/testing_data/".replace("gaggle", "google"); + "/com/google/i18n/phonenumbers/carrier/testing_data/"; // Set up some test numbers to re-use. private static final PhoneNumber AO_MOBILE1 = |