Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: I763cdccb66631c589227158bae8e75d016acbc26
diff --git a/Android.bp b/Android.bp
index aea02bf..8daf08d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -76,9 +76,11 @@
cc_library {
name: "libpng",
vendor_available: true,
+ recovery_available: true,
vndk: {
enabled: true,
},
+ double_loadable: true,
host_supported: true,
defaults: ["libpng-defaults"],
target: {
diff --git a/README.android b/README.android
index 80e837e..5f94dc9 100644
--- a/README.android
+++ b/README.android
@@ -10,4 +10,5 @@
(2) pnglibconf.h
This is copied from scripts/pnglibconf.h.prebuilt.
- Android has undefined PNG_WARNINGS_SUPPORTED.
+ Android has undefined PNG_WARNINGS_SUPPORTED and
+ PNG_READ_OPT_PLTE_SUPPORTED.
diff --git a/pnglibconf.h b/pnglibconf.h
index 366cdc6..32e60aa 100644
--- a/pnglibconf.h
+++ b/pnglibconf.h
@@ -65,7 +65,7 @@
#define PNG_READ_INT_FUNCTIONS_SUPPORTED
#define PNG_READ_INVERT_ALPHA_SUPPORTED
#define PNG_READ_INVERT_SUPPORTED
-#define PNG_READ_OPT_PLTE_SUPPORTED
+/*#undef PNG_READ_OPT_PLTE_SUPPORTED*/
#define PNG_READ_PACKSWAP_SUPPORTED
#define PNG_READ_PACK_SUPPORTED
#define PNG_READ_QUANTIZE_SUPPORTED
