Revert "Install extractors for 1st and 2nd ABIs to the test APEX"
This reverts commit 784bfac0b0e32c668aefdae2281e1f1c370c9097.
Reason for revert: decided to use device which matches to the test suite.
Bug: 131869673, Bug: 125914810
Change-Id: I5738a5303f3368f63fcd51074ee9b2db7344d518
diff --git a/apex/Android.bp b/apex/Android.bp
index ec0efe6..2cc6fcb 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -12,22 +12,27 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-com_android_media_extractors = [
- "libaacextractor",
- "libamrextractor",
- "libflacextractor",
- "libmidiextractor",
- "libmkvextractor",
- "libmp3extractor",
- "libmp4extractor",
- "libmpeg2extractor",
- "liboggextractor",
- "libwavextractor",
-]
-
apex_defaults {
name: "com.android.media-defaults",
java_libs: ["updatable-media"],
+ multilib: {
+ first: {
+ // Extractor process runs only with the primary ABI.
+ native_shared_libs: [
+ // Extractor plugins
+ "libaacextractor",
+ "libamrextractor",
+ "libflacextractor",
+ "libmidiextractor",
+ "libmkvextractor",
+ "libmp3extractor",
+ "libmp4extractor",
+ "libmpeg2extractor",
+ "liboggextractor",
+ "libwavextractor",
+ ],
+ },
+ },
key: "com.android.media.key",
certificate: ":com.android.media.certificate",
@@ -39,12 +44,6 @@
name: "com.android.media",
manifest: "manifest.json",
defaults: ["com.android.media-defaults"],
- multilib: {
- first: {
- // Extractor process runs only with the primary ABI.
- native_shared_libs: com_android_media_extractors,
- },
- },
}
filegroup {