From c7c462af2582117b6d2af9adcd824fbc537e37af Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Fri, 17 Apr 2020 00:03:41 +0100 Subject: [PATCH] Move libsigchain version scripts to app_process, where they are used. This is a temporary measure to avoid exporting filegroups in the SDK snapshots. The version scripts will go away when libsigchain can be a shared lib. Test: Build and boot Bug: 153338107 Bug: 142944043 Change-Id: Id7bff041413569342cc5dcaeff144287b2ae1ef9 --- cmds/app_process/Android.bp | 6 ++++-- cmds/app_process/version-script32.txt | 15 +++++++++++++++ cmds/app_process/version-script64.txt | 14 ++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 cmds/app_process/version-script32.txt create mode 100644 cmds/app_process/version-script64.txt diff --git a/cmds/app_process/Android.bp b/cmds/app_process/Android.bp index 8be95e4659b4e..07221f97c72b8 100644 --- a/cmds/app_process/Android.bp +++ b/cmds/app_process/Android.bp @@ -5,11 +5,13 @@ cc_binary { multilib: { lib32: { - version_script: ":art_sigchain_version_script32.txt", + // TODO(b/142944043): Remove version script when libsigchain is a DSO. + version_script: "version-script32.txt", suffix: "32", }, lib64: { - version_script: ":art_sigchain_version_script64.txt", + // TODO(b/142944043): Remove version script when libsigchain is a DSO. + version_script: "version-script64.txt", suffix: "64", }, }, diff --git a/cmds/app_process/version-script32.txt b/cmds/app_process/version-script32.txt new file mode 100644 index 0000000000000..70810e0b71738 --- /dev/null +++ b/cmds/app_process/version-script32.txt @@ -0,0 +1,15 @@ +{ +global: + EnsureFrontOfChain; + AddSpecialSignalHandlerFn; + RemoveSpecialSignalHandlerFn; + SkipAddSignalHandler; + bsd_signal; + sigaction; + sigaction64; + signal; + sigprocmask; + sigprocmask64; +local: + *; +}; diff --git a/cmds/app_process/version-script64.txt b/cmds/app_process/version-script64.txt new file mode 100644 index 0000000000000..7bcd76b50f87b --- /dev/null +++ b/cmds/app_process/version-script64.txt @@ -0,0 +1,14 @@ +{ +global: + EnsureFrontOfChain; + AddSpecialSignalHandlerFn; + RemoveSpecialSignalHandlerFn; + SkipAddSignalHandler; + sigaction; + sigaction64; + signal; + sigprocmask; + sigprocmask64; +local: + *; +};