commit ad065b7693ce57522920c987b67f79985139f8fb
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Apr 13 23:58:54 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 13 23:58:54 2023 +0000
tree 62e22b921750efb3c1ab416e99d68edaa3dac294
parent 0fdbbe7ed9f02f06aab3f82fa45f086d0278d6c3
parent b097ba5afdb9ebc62b2f75e44318eeaf41aa03d9

Merge "Better partitioning module/non-module libraries" into udc-dev

media/libstagefright/Android.bp

diff --git a/media/libstagefright/Android.bp b/media/libstagefright/Android.bp
index 569a25f..ec6a00a 100644
--- a/media/libstagefright/Android.bp
+++ b/media/libstagefright/Android.bp
@@ -79,6 +79,7 @@
     },
 }
 
+// this library gets wrapped into libstagefright as well as modules
 cc_library_static {
     name: "libstagefright_mpeg2extractor",
     apex_available: [
@@ -241,7 +242,6 @@
         "CodecErrorLog.cpp",
         "CryptoAsync.cpp",
         "FrameDecoder.cpp",
-        "HevcUtils.cpp",
         "InterfaceUtils.cpp",
         "JPEGSource.cpp",
         "MPEG2TSWriter.cpp",
@@ -255,7 +255,6 @@
         "MediaCodecSource.cpp",
         "MediaExtractor.cpp",
         "MediaExtractorFactory.cpp",
-        "MediaSource.cpp",
         "MediaSync.cpp",
         "MediaTrack.cpp",
         "MediaMuxer.cpp",
@@ -269,7 +268,6 @@
         "StagefrightMediaScanner.cpp",
         "SurfaceUtils.cpp",
         "ThrottledSource.cpp",
-        "Utils.cpp",
         "VideoFrameSchedulerBase.cpp",
         "VideoFrameScheduler.cpp",
     ],
@@ -328,6 +326,11 @@
         "libmedia_ndkformatpriv",
     ],
 
+    // to get Utils, MediaSource, HevcUtils
+    whole_static_libs: [
+        "libstagefright_mpeg2extractor",
+    ],
+
     header_libs:[
         "libmediadrm_headers",
         "libnativeloader-headers",