tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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
This commit is contained in:
Martin Stjernholm 2020-04-29 12:14:09 +00:00
parent 03082e6952
commit 87bac1a411
2 changed files with 20 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
libunwindstack/Android.bp
View file

@ -75,29 +75,13 @@ 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: {
@ -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,22 +281,13 @@ 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"],
product_variables: {
experimental_mte: {
cflags: ["-DANDROID_EXPERIMENTAL_MTE"],
},
},
header_libs: [
"bionic_libc_platform_headers",
],
product_variables: {
experimental_mte: {
cflags: ["-DANDROID_EXPERIMENTAL_MTE"],
},
},
}

2
libunwindstack/tests/MemoryRemoteTest.cpp
View file

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