Sort shared libs in Android.bp for extractors
Test: build
Change-Id: I56601466235bb570661e5cf2db5614c434b80c09
diff --git a/media/extractors/aac/Android.bp b/media/extractors/aac/Android.bp
index b4ef53e..9629807 100644
--- a/media/extractors/aac/Android.bp
+++ b/media/extractors/aac/Android.bp
@@ -7,11 +7,11 @@
],
shared_libs: [
- "libstagefright",
+ "liblog",
"libmedia",
+ "libstagefright",
"libstagefright_foundation",
"libutils",
- "liblog",
],
name: "libaacextractor",
diff --git a/media/extractors/amr/Android.bp b/media/extractors/amr/Android.bp
index 85e4777..a8f5eee 100644
--- a/media/extractors/amr/Android.bp
+++ b/media/extractors/amr/Android.bp
@@ -7,11 +7,11 @@
],
shared_libs: [
- "libstagefright",
+ "liblog",
"libmedia",
+ "libstagefright",
"libstagefright_foundation",
"libutils",
- "liblog",
],
name: "libamrextractor",
diff --git a/media/extractors/flac/Android.bp b/media/extractors/flac/Android.bp
index 5edc182..443657a 100644
--- a/media/extractors/flac/Android.bp
+++ b/media/extractors/flac/Android.bp
@@ -8,11 +8,11 @@
],
shared_libs: [
- "libstagefright",
+ "liblog",
"libmedia",
+ "libstagefright",
"libstagefright_foundation",
"libutils",
- "liblog",
],
static_libs: [
diff --git a/media/extractors/midi/Android.bp b/media/extractors/midi/Android.bp
index 1b84b94..bf23688 100644
--- a/media/extractors/midi/Android.bp
+++ b/media/extractors/midi/Android.bp
@@ -7,12 +7,12 @@
],
shared_libs: [
+ "liblog",
+ "libmedia",
"libsonivox",
"libstagefright",
- "libmedia",
"libstagefright_foundation",
"libutils",
- "liblog",
],
name: "libmidiextractor",
diff --git a/media/extractors/mkv/Android.bp b/media/extractors/mkv/Android.bp
index f855bbb..cd920d8 100644
--- a/media/extractors/mkv/Android.bp
+++ b/media/extractors/mkv/Android.bp
@@ -5,17 +5,17 @@
include_dirs: [
"external/flac/include",
"external/libvpx/libwebm",
- "frameworks/av/media/libstagefright/include",
"frameworks/av/media/libstagefright/flac/dec",
+ "frameworks/av/media/libstagefright/include",
],
shared_libs: [
- "libstagefright",
- "libmedia",
- "libstagefright_foundation",
- "libstagefright_flacdec",
- "libutils",
"liblog",
+ "libmedia",
+ "libstagefright",
+ "libstagefright_flacdec",
+ "libstagefright_foundation",
+ "libutils",
],
static_libs: [
diff --git a/media/extractors/mp3/Android.bp b/media/extractors/mp3/Android.bp
index b189ddf..4618a0d 100644
--- a/media/extractors/mp3/Android.bp
+++ b/media/extractors/mp3/Android.bp
@@ -11,11 +11,11 @@
],
shared_libs: [
- "libstagefright",
+ "liblog",
"libmedia",
+ "libstagefright",
"libstagefright_foundation",
"libutils",
- "liblog",
],
static_libs: [
diff --git a/media/extractors/mp4/Android.bp b/media/extractors/mp4/Android.bp
index a957e98..52ddde4 100644
--- a/media/extractors/mp4/Android.bp
+++ b/media/extractors/mp4/Android.bp
@@ -12,11 +12,11 @@
],
shared_libs: [
- "libstagefright",
+ "liblog",
"libmedia",
+ "libstagefright",
"libstagefright_foundation",
"libutils",
- "liblog",
],
static_libs: [
diff --git a/media/extractors/mpeg2/Android.bp b/media/extractors/mpeg2/Android.bp
index e69afd8..3b2641f 100644
--- a/media/extractors/mpeg2/Android.bp
+++ b/media/extractors/mpeg2/Android.bp
@@ -12,19 +12,18 @@
],
shared_libs: [
- "libbinder",
- "libstagefright",
- "libmedia",
- "libstagefright_foundation",
- "libcutils",
- "libutils",
- "liblog",
- "libcrypto",
- "libmedia",
- "libhidlbase",
- "android.hidl.token@1.0-utils",
"android.hardware.cas@1.0",
"android.hardware.cas.native@1.0",
+ "android.hidl.token@1.0-utils",
+ "libbinder",
+ "libcrypto",
+ "libcutils",
+ "libhidlbase",
+ "liblog",
+ "libmedia",
+ "libstagefright",
+ "libstagefright_foundation",
+ "libutils",
],
static_libs: [
diff --git a/media/extractors/ogg/Android.bp b/media/extractors/ogg/Android.bp
index 17b939a..3b93bc1 100644
--- a/media/extractors/ogg/Android.bp
+++ b/media/extractors/ogg/Android.bp
@@ -8,11 +8,11 @@
],
shared_libs: [
- "libstagefright",
+ "liblog",
"libmedia",
+ "libstagefright",
"libstagefright_foundation",
"libutils",
- "liblog",
"libvorbisidec",
],
diff --git a/media/extractors/wav/Android.bp b/media/extractors/wav/Android.bp
index ead02a9..e6dadd1 100644
--- a/media/extractors/wav/Android.bp
+++ b/media/extractors/wav/Android.bp
@@ -7,11 +7,11 @@
],
shared_libs: [
- "libstagefright",
+ "liblog",
"libmedia",
+ "libstagefright",
"libstagefright_foundation",
"libutils",
- "liblog",
],
static_libs: [