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

Commit 4a27a81e authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

Reland "bionic_libc_platform_headers is only available when building with Bionic". 

Relanding unchanged - the build problem was due to a split topic.

Test: m checkbuild
Test: atest libunwindstack_unit_test
Test: lunch fvp-userdebug && mmm system/core/libunwindstack
Bug: 152255951
Change-Id: Ifd1ced65b840ef216630906eec1ec31233e0c5f1
parent 9e1cabdf

libunwindstack/Android.bp

+33 −18
Original line number Diff line number Diff line
@@ -75,13 +75,29 @@ cc_defaults { 
    ],



    target: {

        // Always disable optimizations for host to make it easier to debug.

        host: {

            // Always disable optimizations for host to make it easier to debug.

            cflags: [

                "-O0",

                "-g",

            ],

        },

        android: {

            header_libs: ["bionic_libc_platform_headers"],

            product_variables: {

                experimental_mte: {

                    cflags: ["-DANDROID_EXPERIMENTAL_MTE"],

                },

            },

        },

        linux_bionic: {

            header_libs: ["bionic_libc_platform_headers"],

            product_variables: {

                experimental_mte: {

                    cflags: ["-DANDROID_EXPERIMENTAL_MTE"],

                },

            },

        },

    },



    arch: {
@@ -102,16 +118,6 @@ cc_defaults { 
        "liblog",

        "liblzma",

    ],



    header_libs: [

        "bionic_libc_platform_headers",

    ],



    product_variables: {

        experimental_mte: {

            cflags: ["-DANDROID_EXPERIMENTAL_MTE"],

        },

    },

}



cc_library {
@@ -281,15 +287,24 @@ cc_defaults { 
        "tests/files/offline/straddle_arm64/*",

    ],



    header_libs: [

        "bionic_libc_platform_headers",

    ],



    target: {

        android: {

            header_libs: ["bionic_libc_platform_headers"],

            product_variables: {

                experimental_mte: {

                    cflags: ["-DANDROID_EXPERIMENTAL_MTE"],

                },

            },

        },

        linux_bionic: {

            header_libs: ["bionic_libc_platform_headers"],

            product_variables: {

                experimental_mte: {

                    cflags: ["-DANDROID_EXPERIMENTAL_MTE"],

                },

            },

        },

    },

}



cc_test {

libunwindstack/tests/MemoryRemoteTest.cpp

+0 −2
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ 


#include <android-base/file.h>

#include <android-base/test_utils.h>

#include <bionic/mte.h>

#include <bionic/mte_kernel.h>

#include <gtest/gtest.h>



#include "MemoryRemote.h"