openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Martin Stjernholm 2020-04-30 14:11:50 +00:00 committed by Gerrit Code Review
parent a5fa1ae859 4a27a81e4e
commit 2e3af867d9
2 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
libunwindstack/Android.bp
View File

@ -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,13 +287,22 @@ cc_defaults {
"tests/files/offline/straddle_arm64/*",
],
header_libs: [
"bionic_libc_platform_headers",
],
product_variables: {
experimental_mte: {
cflags: ["-DANDROID_EXPERIMENTAL_MTE"],
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"],
},
},
},
},
}

2
libunwindstack/tests/MemoryRemoteTest.cpp
View File

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