Use generated source not jarjar

This is in preparation to adding UnsupportedAppUsage annotations to the
source.

Note: Although the classes in the android/ directory are in the correct
package and so do not need to be moved to a different package they do
reference classes that are in the wrong package and so they need
those references transformed.

Tested using:
  m -j32 droid
  adb reboot bootloader
  fastboot flashall -w
  m -j32 cts
  cts-tradefed run cts -m CtsTelephonyTestCases -t android.telephony.cts.PhoneNumberUtilsTest

Bug: 117818301
Test: see above
Change-Id: I523e98eabc7eddff593afeddd399c11061664a59

1 files changed, 6 insertions, 8 deletions

diff --git a/Android.bp b/Android.bp
index 500ea48a..51f3ee5e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,17 +21,16 @@ java_library_static {
     // For the platform, compile everything except the carrier to phone number
     // which isn't used.
     java_resource_dirs: [
-        "libphonenumber/src",
-        "geocoder/src",
-        "internal/prefixmapper/src",
+        "repackaged/libphonenumber/src",
+        "repackaged/geocoder/src",
+        "repackaged/internal/prefixmapper/src",
     ],
 
     srcs: [
-        "libphonenumber/src/**/*.java",
-        "geocoder/src/**/*.java",
-        "internal/prefixmapper/src/**/*.java",
+        "repackaged/libphonenumber/src/**/*.java",
+        "repackaged/geocoder/src/**/*.java",
+        "repackaged/internal/prefixmapper/src/**/*.java",
     ],
-    jarjar_rules: "jarjar-rules.txt",
 
     sdk_version: "core_current",
     java_version: "1.7",
@@ -73,4 +72,3 @@ java_library_static {
     sdk_version: "9",
     java_version: "1.7",
 }
-