summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSadaf Ebrahimi <sadafebrahimi@google.com>2023-07-18 18:36:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-07-18 18:36:57 +0000
commitedb62b93deb3980867d5e128d9615be9b5ef3dc8 (patch)
treef0db847bfd2f6684300f91dd865b5916ff413b2a
parent48edaefe613577e5130493d3c2a897eea839919a (diff)
parent5d8468b699705278e6fac9ca0c0d08b4a444cd2d (diff)
downloadlibphonenumber-edb62b93deb3980867d5e128d9615be9b5ef3dc8.tar.gz
Merge "Edit METADATA file" into main am: e7c25b8d08 am: 0efb6b40bf am: 8f55a03bf0 am: 5d8468b699
Original change: https://android-review.googlesource.com/c/platform/external/libphonenumber/+/2656956 Change-Id: I4d389b75db55a74523b996d1d8d9cf73e257e92b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--METADATA16
-rw-r--r--README.android7
-rwxr-xr-xupdate-from-external.sh49
3 files changed, 16 insertions, 56 deletions
diff --git a/METADATA b/METADATA
index d97975ca..3274c5f2 100644
--- a/METADATA
+++ b/METADATA
@@ -1,3 +1,19 @@
+name: "libphonenumber"
+description: "Google's common Java, C++ and JavaScript library for parsing, formatting, and validating international phone numbers."
third_party {
+ url {
+ type: HOMEPAGE
+ value: "https://github.com/google/libphonenumber"
+ }
+ url {
+ type: ARCHIVE
+ value: "https://github.com/google/libphonenumber/archive/refs/tags/v8.13.16.tar.gz"
+ }
+ version: "v8.13.16"
license_type: NOTICE
+ last_upgrade_date {
+ year: 2023
+ month: 7
+ day: 11
+ }
}
diff --git a/README.android b/README.android
deleted file mode 100644
index 146b9b78..00000000
--- a/README.android
+++ /dev/null
@@ -1,7 +0,0 @@
-URL: https://github.com/googlei18n/libphonenumber
-Version: 8.13.16
-License: Apache 2
-Description: Google Phone Number Library.
-
-Run ./update-from-external.sh <version> to update this from a version that
-has been pushed to the github repository.
diff --git a/update-from-external.sh b/update-from-external.sh
deleted file mode 100755
index 8135e9f2..00000000
--- a/update-from-external.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2016 The Android Open Source Project.
-#
-# Retrieves the specified version of libphonenumber into the
-# external/libphonenumber directory
-#
-# Does not create a GIT commit.
-
-if [ $# -ne 1 ]; then
- echo "usage: $0 <version>"
- echo " where <version> is the version number, e.g. 7.7.3"
- exit 1
-fi
-
-if [ -z "$ANDROID_BUILD_TOP" ]; then
- echo "Missing environment variables. Did you run build/envsetup.sh and lunch?" 1>&2
- exit 1
-fi
-
-VERSION=$1
-TAG=v$VERSION
-SOURCE="https://github.com/googlei18n/libphonenumber/"
-DIR=$ANDROID_BUILD_TOP/external/libphonenumber
-
-tmp=$(mktemp -d)
-trap "echo Removing temporary directory; rm -fr $tmp" EXIT
-
-echo "Fetching source into $tmp"
-(cd $tmp; git clone -q -b $TAG --depth 1 $SOURCE source)
-
-for i in $(ls $tmp/source/java)
-do
- echo "Updating $i"
- rm -fr $DIR/$i
- cp -r $tmp/source/java/$i $DIR/$i
- (cd $DIR; git add $i)
-done
-
-for i in README.version README.android
-do
- echo "Updating $i"
- cp $DIR/$i $tmp
- sed "s|Version: .*$|Version: $VERSION|" < $tmp/$i > $DIR/$i
- (cd $DIR; git add $i)
-done
-
-${DIR}/srcgen/generate_android_src.sh
-git add repackaged