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

Commit 87bac1a4 authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

Revert "bionic_libc_platform_headers is only available when buil..." 

Reason for revert: Breaks rvc-d1-dev-plus-aosp: http://ab/6443190
Reverted Changes:
Ide447b89a:bionic_libc_platform_headers is only available whe...
Ia93cd3ec8:bionic_libc_platform_headers is only available whe...
Icdc495588:Make bionic_platform_headers available only for Bi...
Idfd7c87dc:bionic_libc_platform_headers is only available whe...

Bug: 152255951
Bug: 155269399
Change-Id: I4e6beba5565e604fde3a51cdce5cc4041caffa4e
parent 03082e69

libunwindstack/Android.bp

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



    target: {

        host: {

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

        host: {

            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: {
@@ -118,6 +102,16 @@ cc_defaults { 
        "liblog",

        "liblzma",

    ],



    header_libs: [

        "bionic_libc_platform_headers",

    ],



    product_variables: {

        experimental_mte: {

            cflags: ["-DANDROID_EXPERIMENTAL_MTE"],

        },

    },

}



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

    ],



    target: {

        android: {

            header_libs: ["bionic_libc_platform_headers"],

            product_variables: {

                experimental_mte: {

                    cflags: ["-DANDROID_EXPERIMENTAL_MTE"],

                },

            },

        },

        linux_bionic: {

            header_libs: ["bionic_libc_platform_headers"],

    header_libs: [

        "bionic_libc_platform_headers",

    ],



    product_variables: {

        experimental_mte: {

            cflags: ["-DANDROID_EXPERIMENTAL_MTE"],

        },

    },

        },

    },

}



cc_test {

libunwindstack/tests/MemoryRemoteTest.cpp

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


#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"