Add libphonenumber-nogeocoder which does not have geocoder

libphonenumber is for unbundled apps, but is too fat (2MB) and most of
the space is contributed to geocoder. For unbundled apps which do not
use the geocoder feature, libphonenumber-nogeocoder is provided. This is
much smaller (< 500KB).

Bug: 73707956
Bug: 69899800
Test: m -j GoogleContactsSyncAdapter builds successfully and does not
show link-type check warning
Test: flash this to walleye. add a new account. contacts are synced
correctly.
Test: marlin builds

Change-Id: Ie74539cab61216421501633e506713122d2644d2

1 files changed, 35 insertions, 15 deletions

diff --git a/Android.bp b/Android.bp
index 5bc72c0e..500ea48a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,10 +13,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// For the platform, compile everything except the carrier to phone number
-// which isn't used.
-java_defaults {
-    name: "libphonenumber-platform-defaults",
+// For platform use, builds directly against core-libart to avoid circular
+// dependencies. *NOT* for unbundled use.
+java_library_static {
+    name: "libphonenumber-platform",
+
+    // For the platform, compile everything except the carrier to phone number
+    // which isn't used.
     java_resource_dirs: [
         "libphonenumber/src",
         "geocoder/src",
@@ -28,27 +31,44 @@ java_defaults {
         "geocoder/src/**/*.java",
         "internal/prefixmapper/src/**/*.java",
     ],
-}
-
-// For platform use, builds directly against core-libart to avoid circular
-// dependencies. *NOT* for unbundled use.
-java_library_static {
-    name: "libphonenumber-platform",
-    defaults: ["libphonenumber-platform-defaults"],
-
     jarjar_rules: "jarjar-rules.txt",
 
     sdk_version: "core_current",
     java_version: "1.7",
 }
 
+
+java_defaults {
+    name: "libphonenumber-unbundled-defaults",
+    java_resource_dirs: [
+        "libphonenumber/src",
+        "carrier/src",
+        "internal/prefixmapper/src",
+    ],
+
+    srcs: [
+        "libphonenumber/src/**/*.java",
+        "carrier/src/**/*.java",
+        "internal/prefixmapper/src/**/*.java",
+    ],
+}
+
 // For unbundled use, supports gingerbread and up.
 java_library_static {
     name: "libphonenumber",
-    defaults: ["libphonenumber-platform-defaults"],
+    defaults: ["libphonenumber-unbundled-defaults"],
+
+    srcs: ["geocoder/src/**/*.java"],
+    java_resource_dirs: ["geocoder/src"],
+
+    sdk_version: "9",
+    java_version: "1.7",
+}
 
-    srcs: ["carrier/src/**/*.java"],
-    java_resource_dirs: ["carrier/src"],
+// For unbundled use - without geocoder
+java_library_static {
+    name: "libphonenumber-nogeocoder",
+    defaults: ["libphonenumber-unbundled-defaults"],
 
     sdk_version: "9",
     java_version: "1.7",