Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: I84862f0e096281a4234c14f908872dea3e5c3428
diff --git a/products/atv_base.mk b/products/atv_base.mk
index 8e8cc04..4b2602e 100644
--- a/products/atv_base.mk
+++ b/products/atv_base.mk
@@ -34,36 +34,8 @@
# From build/target/product/core_base.mk
PRODUCT_PACKAGES += \
- ContactsProvider \
- DefaultContainerService \
UserDictionaryProvider \
- libaudiopreprocessing \
- libfilterpack_imageproc \
- libgabi++ \
libkeystore \
- libstagefright_soft_aacdec \
- libstagefright_soft_aacenc \
- libstagefright_soft_amrdec \
- libstagefright_soft_amrnbenc \
- libstagefright_soft_amrwbenc \
- libstagefright_soft_avcdec \
- libstagefright_soft_avcenc \
- libstagefright_soft_flacdec \
- libstagefright_soft_flacenc \
- libstagefright_soft_g711dec \
- libstagefright_soft_gsmdec \
- libstagefright_soft_hevcdec \
- libstagefright_soft_mp3dec \
- libstagefright_soft_mpeg2dec \
- libstagefright_soft_mpeg4dec \
- libstagefright_soft_mpeg4enc \
- libstagefright_soft_opusdec \
- libstagefright_soft_rawdec \
- libstagefright_soft_vorbisdec \
- libstagefright_soft_vpxdec \
- libstagefright_soft_vpxenc \
- mdnsd \
- requestsync
# From build/target/product/core.mk
PRODUCT_PACKAGES += \
@@ -81,8 +53,7 @@
ProxyHandler \
SharedStorageBackup \
VpnDialogs \
- com.android.media.tv.remoteprovider \
- com.android.media.tv.remoteprovider.xml
+ com.android.media.tv.remoteprovider
# From build/target/product/generic_no_telephony.mk
PRODUCT_PACKAGES += \
diff --git a/sdk/images_armeabi-v7a_source.prop_template b/sdk/images_armeabi-v7a_source.prop_template
index c0fc670..f65eaed 100644
--- a/sdk/images_armeabi-v7a_source.prop_template
+++ b/sdk/images_armeabi-v7a_source.prop_template
@@ -1,6 +1,6 @@
Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
Pkg.UserSrc=false
-Pkg.Revision=4
+Pkg.Revision=5
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
SystemImage.Abi=armeabi-v7a
diff --git a/sdk/images_x86_source.prop_template b/sdk/images_x86_source.prop_template
index 5477fcd..636280d 100644
--- a/sdk/images_x86_source.prop_template
+++ b/sdk/images_x86_source.prop_template
@@ -1,6 +1,6 @@
Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
Pkg.UserSrc=false
-Pkg.Revision=4
+Pkg.Revision=5
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
SystemImage.Abi=x86
