From 235ae0d9313f85c74f8c93bbda0e75d196a66389 Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Wed, 21 Oct 2020 11:08:12 +0900 Subject: [PATCH] List up libraries with system dependency in the configuration file List up libraries which has dependency with system image in the configuration file. The list was located in linkerconfig source code, but this makes dependency between linkerconfig and system image. This change will remove the dependency. Bug: 168262631 Test: cuttlefish and crosshatch boot succeeded Change-Id: Id0abc0070b475d834096a85b90a8e88e535c6171 --- rootdir/Android.bp | 6 +++ rootdir/etc/linker.config.json | 72 ++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 rootdir/etc/linker.config.json diff --git a/rootdir/Android.bp b/rootdir/Android.bp index 96b5e0db4..a21f68661 100644 --- a/rootdir/Android.bp +++ b/rootdir/Android.bp @@ -24,3 +24,9 @@ prebuilt_etc { src: "ueventd.rc", recovery_available: true, } + +// TODO(b/147210213) Generate list of libraries during build and fill in at build time +linker_config { + name: "system_linker_config", + src: "etc/linker.config.json", +} diff --git a/rootdir/etc/linker.config.json b/rootdir/etc/linker.config.json new file mode 100644 index 000000000..d66ab73a4 --- /dev/null +++ b/rootdir/etc/linker.config.json @@ -0,0 +1,72 @@ +{ + // These are list of libraries which has stub interface and installed + // in system image so other partition and APEX modules can link to it. + // TODO(b/147210213) : Generate this list on build and read from the file + "provideLibs": [ + // LLNDK libraries + "libEGL.so", + "libGLESv1_CM.so", + "libGLESv2.so", + "libGLESv3.so", + "libRS.so", + "libandroid_net.so", + "libbinder_ndk.so", + "libc.so", + "libcgrouprc.so", + "libclang_rt.asan-arm-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", + "libsync.so", + "libvndksupport.so", + "libvulkan.so", + // NDK libraries + "libaaudio.so", + "libandroid.so", + // adb + "libadbd_auth.so", + "libadbd_fs.so", + // bionic + "libdl_android.so", + // statsd + "libincident.so", + // media + "libmediametrics.so", + // nn + "libneuralnetworks_packageinfo.so", + // SELinux + "libselinux.so" + ], + "requireLibs": [ + // Keep in sync with the "platform" namespace in art/build/apex/ld.config.txt. + "libdexfile_external.so", + "libdexfiled_external.so", + "libnativebridge.so", + "libnativehelper.so", + "libnativeloader.so", + "libandroidicu.so", + "libicu.so", + // TODO(b/122876336): Remove libpac.so once it's migrated to Webview + "libpac.so", + // TODO(b/120786417 or b/134659294): libicuuc.so + // and libicui18n.so are kept for app compat. + "libicui18n.so", + "libicuuc.so", + // resolv + "libnetd_resolv.so", + // nn + "libneuralnetworks.so", + // statsd + "libstatspull.so", + "libstatssocket.so", + // adbd + "libadb_pairing_auth.so", + "libadb_pairing_connection.so", + "libadb_pairing_server.so" + ] +} \ No newline at end of file