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

Commit cd859a0c authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by Automerger Merge Worker
Browse files

Merge "Make libsigchain a regular shared library dependency of app_process."... 

Merge "Make libsigchain a regular shared library dependency of app_process." am: 2fea6f3f am: 5040afaa am: 07618a55 am: f920684a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621159

Change-Id: I3a28c267fd697922eb682a2dd543adc9e1685688
parents 62a76c9b f920684a

cmds/app_process/Android.bp

+7 −6
Original line number Original line Diff line number Diff line
@@ -22,13 +22,9 @@ cc_binary { 




    multilib: {

    multilib: {

        lib32: {

        lib32: {

            // TODO(b/142944043): Remove version script when libsigchain is a DSO.

            version_script: "version-script32.txt",

            suffix: "32",

            suffix: "32",

        },

        },

        lib64: {

        lib64: {

            // TODO(b/142944043): Remove version script when libsigchain is a DSO.

            version_script: "version-script64.txt",

            suffix: "64",

            suffix: "64",

        },

        },

    },

    },
@@ -43,6 +39,13 @@ cc_binary { 
        "libhidlbase",

        "libhidlbase",

        "liblog",

        "liblog",

        "libnativeloader",

        "libnativeloader",



        // Even though app_process doesn't call into libsigchain, we need to

        // make sure it's in the DT list of app_process, as we want all code

        // in app_process and the libraries it loads to find libsigchain

        // symbols before libc symbols.

        "libsigchain",



        "libutils",

        "libutils",





        // This is a list of libraries that need to be included in order to avoid

        // This is a list of libraries that need to be included in order to avoid
@@ -52,8 +55,6 @@ cc_binary { 
        "libwilhelm",

        "libwilhelm",

    ],

    ],





    whole_static_libs: ["libsigchain"],



    compile_multilib: "both",

    compile_multilib: "both",





    cflags: [

    cflags: [

cmds/app_process/version-script32.txt

deleted100644 → 0
+0 −15
Original line number Original line Diff line number Diff line 
{

global:

  EnsureFrontOfChain;

  AddSpecialSignalHandlerFn;

  RemoveSpecialSignalHandlerFn;

  SkipAddSignalHandler;

  bsd_signal;

  sigaction;

  sigaction64;

  signal;

  sigprocmask;

  sigprocmask64;

local:

  *;

};

cmds/app_process/version-script64.txt

deleted100644 → 0
+0 −14
Original line number Original line Diff line number Diff line 
{

global:

  EnsureFrontOfChain;

  AddSpecialSignalHandlerFn;

  RemoveSpecialSignalHandlerFn;

  SkipAddSignalHandler;

  sigaction;

  sigaction64;

  signal;

  sigprocmask;

  sigprocmask64;

local:

  *;

};