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

Merge "Revert "Make bionic_platform_headers available only for Bionic t...""

Browse source
This commit is contained in:
Martin Stjernholm 2020-04-29 12:27:37 +00:00 committed by Gerrit Code Review
commit d20571efe1
4 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libc/Android.bp
View file

@ -1751,7 +1751,6 @@ genrule {
// Headers that only other parts of the platform can include. // Headers that only other parts of the platform can include.
cc_library_headers { cc_library_headers {
name: "bionic_libc_platform_headers", name: "bionic_libc_platform_headers",
defaults: ["linux_bionic_supported"],
visibility: [ visibility: [
"//art:__subpackages__", "//art:__subpackages__",
"//bionic:__subpackages__", "//bionic:__subpackages__",
@ -1763,6 +1762,7 @@ cc_library_headers {
"//system/core/libunwindstack:__subpackages__", "//system/core/libunwindstack:__subpackages__",
"//system/memory/libmemunreachable:__subpackages__", "//system/memory/libmemunreachable:__subpackages__",
], ],
host_supported: true,
vendor_available: true, vendor_available: true,
ramdisk_available: true, ramdisk_available: true,
recovery_available: true, recovery_available: true,

7
tests/Android.bp
View file

@ -22,12 +22,6 @@ cc_defaults {
darwin: { darwin: {
enabled: false, enabled: false,
}, },
android: {
header_libs: ["bionic_libc_platform_headers"],
},
linux_bionic: {
header_libs: ["bionic_libc_platform_headers"],
},
}, },
cflags: [ cflags: [
"-fstack-protector-all", "-fstack-protector-all",
@ -44,6 +38,7 @@ cc_defaults {
// For glibc. // For glibc.
"-D__STDC_LIMIT_MACROS", "-D__STDC_LIMIT_MACROS",
], ],
header_libs: ["bionic_libc_platform_headers"],
// Ensure that the tests exercise shadow call stack support and // Ensure that the tests exercise shadow call stack support and
// the hint space PAC/BTI instructions. // the hint space PAC/BTI instructions.
arch: { arch: {

6
tests/mte_test.cpp
View file

@ -14,10 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
#include <sys/cdefs.h>
#if defined(__BIONIC__)
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <android-base/macros.h> #include <android-base/macros.h>
@ -50,5 +46,3 @@ static void test_tag_mismatch() {
TEST(mte_test, ScopedDisableMTE) { TEST(mte_test, ScopedDisableMTE) {
test_tag_mismatch(); test_tag_mismatch();
} }
#endif // __BIONIC__

4
tests/utils.h
View file

@ -25,11 +25,7 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
#if defined(__BIONIC__)
#include <bionic/macros.h> #include <bionic/macros.h>
#else
#define untag_address(p) p
#endif
#include <atomic> #include <atomic>
#include <string> #include <string>