commit 1e994a5d0c9544a8090a38e16822f3a5f11ca0f8
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Dec 14 02:40:10 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Dec 14 02:40:10 2019 +0000
tree 6670e7befa1367ac4d6b834b0069370859a5527d
parent 49ff0a13cc770b5ee6f5ca04315ccfd5c8ffc05a
parent 18f0b2d502c4090ab96bb215586367d4d95b5de9

Merge "Set legacy_android10_support to apex modules" am: 097f05bdfb am: 0958b1af0f am: 18f0b2d502

Change-Id: Ide017a482765b1e65e227c2c0571b95268d82e9b

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 42a620b..73dc264 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -41,6 +41,8 @@
 
     // Use a custom AndroidManifest.xml used for API targeting.
     androidManifest: ":com.android.media-androidManifest",
+
+    legacy_android10_support: true,
 }
 
 apex {
@@ -76,6 +78,8 @@
 
     // Use a custom AndroidManifest.xml used for API targeting.
     androidManifest: ":com.android.media.swcodec-androidManifest",
+
+    legacy_android10_support: true,
 }
 
 prebuilt_etc {