ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Revert "bionic_libc_platform_headers is only available when buil..."" am: 9e1cabdfc7

Browse source 
Change-Id: Ib3849d3eb2cc2534aa439ea4e9561debc8f1bfb9
This commit is contained in:
Martin Stjernholm 2020-04-29 12:44:54 +00:00 • committed by Automerger Merge Worker
commit 3f87a4f412
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"