Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 623fc514 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "frameworks/av: Update libprocessgroup dependencies" into main... 

Merge "Merge "frameworks/av: Update libprocessgroup dependencies" into main am: 7feebced am: 3e89b3db" into main
parents 942a3cd6 ebf8f1be

apex/ld.config.txt

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ namespace.default.links = platform 
# TODO: replace the following when apex has a way to auto-generate this list

# namespace.default.link.platform.shared_libs  = %LLNDK_LIBRARIES%

# namespace.default.link.platform.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%

namespace.default.link.platform.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.asan-i686-android.so:libclang_rt.asan-x86_64-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libdl_android.so:libvulkan.so:libbinder_ndk.so

namespace.default.link.platform.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libandroid_net.so:libc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.asan-i686-android.so:libclang_rt.asan-x86_64-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libdl_android.so:libvulkan.so:libbinder_ndk.so



###############################################################################

# "platform" namespace
@@ -138,7 +138,7 @@ namespace.sphal.links = platform 
# TODO: replace the following when apex has a way to auto-generate this list

# namespace.sphal.link.platform.shared_libs  = %LLNDK_LIBRARIES%

# namespace.sphal.link.platform.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%

namespace.sphal.link.platform.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.asan-i686-android.so:libclang_rt.asan-x86_64-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so:libbinder_ndk.so

namespace.sphal.link.platform.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libandroid_net.so:libc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.asan-i686-android.so:libclang_rt.asan-x86_64-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so:libbinder_ndk.so



# Add a link for libz.so which is llndk on devices where VNDK is not enforced.

namespace.sphal.link.platform.shared_libs += libz.so

media/libaaudio/fuzzer/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ cc_fuzz { 
        "libaudioclient",

        "libaudioutils",

        "libbase_ndk",

        "libcgrouprc",

        "libcgrouprc_format",

        "libcutils",

        "libjsoncpp",

        "liblog",

media/libaudioclient/aidl/fuzzer/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ cc_defaults { 
        "android.hardware.audio.common@7.0-enums",

        "audiopermissioncontroller",

        "libaudiomockhal",

        "libcgrouprc",

        "libcgrouprc_format",

        "libfakeservicemanager",

        "libjsoncpp",

        "libmediametricsservice",

media/libaudioclient/fuzzer/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ cc_fuzz { 
        "effect-aidl-cpp",

        "libaudioclient",

        "libbase",

        "libcgrouprc",

        "libcgrouprc_format",

        "libcutils",

        "libjsoncpp",

        "liblog",

media/libaudioclient/tests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ cc_defaults { 
        "framework-permission-aidl-cpp",

        "libaudioutils",

        "libbase",

        "libcgrouprc",

        "libdl",

        "libmedia",

        "libmedia_helper",