Merge "Look for non-existent files listed in avb_vbmeta_args." into oc-dr1-dev
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index e188bb4..d664774 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -186,7 +186,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 := 2017-08-05
+ PLATFORM_SECURITY_PATCH := 2017-09-05
endif
ifndef PLATFORM_BASE_OS
diff --git a/target/product/core_base.mk b/target/product/core_base.mk
index e0a20b8..151e8de 100644
--- a/target/product/core_base.mk
+++ b/target/product/core_base.mk
@@ -43,6 +43,7 @@
libstagefright_soft_amrwbenc \
libstagefright_soft_avcdec \
libstagefright_soft_avcenc \
+ libstagefright_soft_flacdec \
libstagefright_soft_flacenc \
libstagefright_soft_g711dec \
libstagefright_soft_gsmdec \
diff --git a/target/product/treble_common.mk b/target/product/treble_common.mk
index 3fe8135..6b33aed 100644
--- a/target/product/treble_common.mk
+++ b/target/product/treble_common.mk
@@ -82,6 +82,7 @@
android.hardware.vr@1.0 \
android.hardware.weaver@1.0 \
android.hardware.wifi@1.0 \
+ android.hardware.wifi@1.1 \
android.hardware.wifi.supplicant@1.0 \
android.hidl.allocator@1.0 \
android.hidl.manager@1.0 \