summaryrefslogtreecommitdiff
path: root/libphonenumber/src/com/google
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-01-21 09:59:36 +0000
committerNarayan Kamath <narayan@google.com>2015-01-21 09:59:36 +0000
commit2a6873bca754abbfe2b869883a4a5e917b22225b (patch)
treedf8bb64a3599946cae82ee74fd44fca4d2a96d73 /libphonenumber/src/com/google
parent9907540e90c6794a028d7e1bd5bab0a6cc4a3e5b (diff)
downloadlibphonenumber-2a6873bca754abbfe2b869883a4a5e917b22225b.tar.gz
Revert "Temporary workaround to prevent automated jarjar renaming."
This reverts commit 19073bca93281204c5d0c42b04811ac0e6ef3bdd. Fixed properly in the build system now.
Diffstat (limited to 'libphonenumber/src/com/google')
-rw-r--r--libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
index 760e0009..418164a8 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
@@ -77,13 +77,8 @@ public class PhoneNumberUtil {
// input from overflowing the regular-expression engine.
private static final int MAX_INPUT_STRING_LENGTH = 250;
- // Begin ANDROID-CHANGED
- //
- // TODO: Revert this hideous hack once the build system has been changed
- // to let resource files be jar-jared.
private static final String META_DATA_FILE_PREFIX =
- "/com/gaggle/i18n/phonenumbers/data/PhoneNumberMetadataProto".replace("gaggle", "google");
- // End ANDROID-CHANGED
+ "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto";
// Region-code for the unknown region.
private static final String UNKNOWN_REGION = "ZZ";