Snap for 4620899 from 18669b27bb20d324539ab97e0823b189a4449ffb to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-release

Change-Id: Iee7394cefa89c8b0e9fea87b7a24f0e0a10303c8

2 files changed, 36 insertions, 16 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",
diff --git a/update-from-external.sh b/update-from-external.sh
index 397dac87..18ada952 100755
--- a/update-from-external.sh
+++ b/update-from-external.sh
@@ -7,7 +7,7 @@
 #
 # Does not create a GIT commit.
 
-if [ $# -eq 0 ]; then
+if [ $# -ne 1 ]; then
     echo "usage: $0 <version>"
     echo "  where <version> is the version number, e.g. 7.7.3"
     exit 1