commit 201efd79c4f0a9f259ece1429e54e5951bb4a13c
author Dongwon Kang <dwkang@google.com> Wed Jul 17 14:53:56 2019 -0700
committer Dongwon Kang <dwkang@google.com> Wed Nov 13 11:22:58 2019 -0800
tree cdc2145de37cfe3b1829f737b67c10431acf1d79
parent e6cbccaef91a63e0a739f084fdc94a216a08efd6

media apex: statically link hidl libraries in mpeg2extractor.

com.android.media size : 5.8MB -> 3.6MB
Also Q versions of statble libraries are specified, so that build time
check can happen when sub libraries tries to use new API.

Test: build
Bug: 141645332 Bug: 144271235
Change-Id: Id426e160c56949899e80372c7b13ed00795d4650

media/extractors/mpeg2/Android.bp

diff --git a/media/extractors/mpeg2/Android.bp b/media/extractors/mpeg2/Android.bp
index 1d9e1e6..86c3e8b 100644
--- a/media/extractors/mpeg2/Android.bp
+++ b/media/extractors/mpeg2/Android.bp
@@ -12,15 +12,11 @@
     ],
 
     shared_libs: [
-        "android.hardware.cas@1.0",
-        "android.hardware.cas.native@1.0",
-        "android.hidl.token@1.0-utils",
-        "android.hidl.allocator@1.0",
+        "libcgrouprc#29",
+        "liblog#10000",
+        "libmediandk#29",
+        "libvndksupport#29",
         "libcrypto",
-        "libhidlmemory",
-        "libhidlbase",
-        "liblog",
-        "libmediandk",
     ],
 
     header_libs: [
@@ -31,11 +27,24 @@
     ],
 
     static_libs: [
+        "android.hardware.cas@1.0",
+        "android.hardware.cas.native@1.0",
+        "android.hidl.allocator@1.0",
+        "android.hidl.memory@1.0",
+        "android.hidl.token@1.0",
+        "android.hidl.token@1.0-utils",
+        "libbase",
+        "libbinderthreadstate",
+        "libcutils",
+        "libhidlbase",
+        "libhidlmemory",
+        "libjsoncpp",
+        "libprocessgroup",
+        "libstagefright_esds",
         "libstagefright_foundation_without_imemory",
+        "libstagefright_mpeg2extractor",
         "libstagefright_mpeg2support",
         "libutils",
-        "libstagefright_mpeg2extractor",
-        "libstagefright_esds",
     ],
 
     name: "libmpeg2extractor",
@@ -51,11 +60,16 @@
     version_script: "exports.lds",
 
     sanitize: {
-        cfi: true,
+        // STOPSHIP: turn on cfi once b/139945549 is resolved.
+        cfi: false,
         misc_undefined: [
             "unsigned-integer-overflow",
             "signed-integer-overflow",
         ],
     },
 
+    apex_available: [
+        "com.android.media",
+        "test_com.android.media",
+    ],
 }