aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeon Scroggins <scroggo@google.com>2019-06-06 14:19:53 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-06-06 14:19:53 -0700
commit8c407f0cf06ff004f0ae789f0103b3cb58cd432b (patch)
tree7a8bb1cd3e71e7aa9ad17f165a281182bb113c2a
parent5aff8307d1e1b29edb289ba676233df51436dfc6 (diff)
parent84a68a43e536c917a60bd4683602f86b7e8071de (diff)
downloadlibpng-8c407f0cf06ff004f0ae789f0103b3cb58cd432b.tar.gz
Merge "Add METATA for libpng" am: 3a08d09702 am: 7ad9526619 am: 4fae3c1bbc
am: 84a68a43e5 Change-Id: Iec4422c305d7ad27ff101de195b7f62c1c92413a
-rw-r--r--METADATA14
-rw-r--r--README.android7
-rw-r--r--README.version3
3 files changed, 18 insertions, 6 deletions
diff --git a/METADATA b/METADATA
new file mode 100644
index 000000000..cf383c0f6
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,14 @@
+name: "libpng"
+description: "libpng is a PNG image codec."
+third_party {
+ url {
+ type: GIT
+ value: "https://github.com/glennrp/libpng.git"
+ }
+ version: "v1.6.34"
+ last_upgrade_date {
+ year: 2017
+ month: 10
+ day: 6
+ }
+}
diff --git a/README.android b/README.android
index 5f94dc96e..25d01e61b 100644
--- a/README.android
+++ b/README.android
@@ -1,12 +1,13 @@
-Any Android specific modifications to upstream libpng (1.6.34) should
-be listed here:
+Any Android specific modifications to upstream libpng (the version
+specified in METADATA) should be listed here:
(1) Android has added the following files.
pngusr.h
Android.bp
CleanSpec.mk
MODULE_LICENSE_BSD_LIKE
- README.version
+ METADATA
+ OWNERS
(2) pnglibconf.h
This is copied from scripts/pnglibconf.h.prebuilt.
diff --git a/README.version b/README.version
deleted file mode 100644
index ab95c6da5..000000000
--- a/README.version
+++ /dev/null
@@ -1,3 +0,0 @@
-URL: http://libpng.download/src/libpng16/libpng-1.6.34.tar.gz
-Version: 1.6.34
-BugComponent: 87896