diff options
| author | Narayan Kamath <narayan@google.com> | 2014-12-23 13:29:15 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-12-23 13:32:00 +0000 |
| commit | 19073bca93281204c5d0c42b04811ac0e6ef3bdd (patch) | |
| tree | 5da34623957495242493c58604bf68397e2f5340 /libphonenumber/src/com/google/i18n/phonenumbers | |
| parent | a77faddfc3b3e4cca8f585c82d669054aec221f4 (diff) | |
| download | libphonenumber-19073bca93281204c5d0c42b04811ac0e6ef3bdd.tar.gz | |
Temporary workaround to prevent automated jarjar renaming.
The build system adds in resources from LOCAL_JAVA_RESOURCE_DIRS
*after* the source has been jar-jared. This means jarjar will rename
references to what it thinks are resources but cannot rename the
resources themselves.
bug: 18837479
Change-Id: I2b6ef8e705c6db832ebec047f751cc51e100b1c0
Diffstat (limited to 'libphonenumber/src/com/google/i18n/phonenumbers')
| -rw-r--r-- | libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java index 418164a8..760e0009 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java @@ -77,8 +77,13 @@ 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/google/i18n/phonenumbers/data/PhoneNumberMetadataProto"; + "/com/gaggle/i18n/phonenumbers/data/PhoneNumberMetadataProto".replace("gaggle", "google"); + // End ANDROID-CHANGED // Region-code for the unknown region. private static final String UNKNOWN_REGION = "ZZ"; |