diff options
author | Colin Cross <ccross@android.com> | 2022-03-14 22:10:56 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-14 22:10:56 +0000 |
commit | f693e4c775bffb872c961be2454bf46cbfd8fb3b (patch) | |
tree | 053d3acaad91c69e7ad71b460a591612de7d19c3 | |
parent | 4bc9d0d28154610618b643317e871ae5f6332450 (diff) | |
parent | 1763bf7fde2393d9dbb932e69e0c75f8d9b7fc5b (diff) | |
download | virglrenderer-android13-qpr3-s8-release.tar.gz |
Tweak linux_glibc properties for musl builds in external/virglrenderer am: cf1de0f462 am: f6c12bd7e3 am: 1763bf7fdet_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-release
Original change: https://android-review.googlesource.com/c/platform/external/virglrenderer/+/2019635
Change-Id: I45b3c3b5a26cf46fadc94a17ec64c524ec6e9780
-rw-r--r-- | Android.bp | 17 |
1 files changed, 8 insertions, 9 deletions
@@ -122,22 +122,21 @@ cc_library { "src/vrend_winsys_gbm.c", ], target: { + host_linux: { + shared_libs: [ + "libdrm", + "libepoxy", + "libgbm", + ], + }, linux_glibc: { // Avoid linking to another host copy of libdrm; this library will cause // binary GPU drivers to be loaded from the host, which might be linked // to a system copy of libdrm, which conflicts with the AOSP one allow_undefined_symbols: true, header_libs: ["libdrm_headers"], - shared_libs: [ - "libepoxy", - "libgbm" - ], - }, - linux_bionic: { - shared_libs: [ + exclude_shared_libs: [ "libdrm", - "libepoxy", - "libgbm", ], }, android: { |