Merge "Revert "Revert "Updating the platform sdk version for Q""" into qt-dev
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 8b43a7d..6738a77 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -93,7 +93,7 @@
# These are the current development codenames, if the build is not a final
# release build. If this is a final release build, it is simply "REL".
-PLATFORM_VERSION_CODENAME.QP1A := Q
+PLATFORM_VERSION_CODENAME.QP1A := REL
ifndef PLATFORM_VERSION
PLATFORM_VERSION := $(PLATFORM_VERSION.$(TARGET_PLATFORM_VERSION))
@@ -259,7 +259,7 @@
# It must be of the form "YYYY-MM-DD" on production devices.
# It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
# If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
- PLATFORM_SECURITY_PATCH := 2019-06-05
+ PLATFORM_SECURITY_PATCH := 2019-07-05
endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH
diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk
index 66207df..54a9625 100644
--- a/target/product/mainline_system.mk
+++ b/target/product/mainline_system.mk
@@ -85,6 +85,11 @@
libnl \
libprotobuf-cpp-full \
+# Camera service uses 'libdepthphoto' for adding dynamic depth
+# metadata inside depth jpegs.
+PRODUCT_PACKAGES += \
+ libdepthphoto \
+
PRODUCT_PACKAGES_DEBUG += \
avbctl \
bootctl \