Move bionic_macros.h from private to platform.
Test: treehugger
Change-Id: Ie473914f4c8924c7240b3ac22093a9daf42fc948
diff --git a/libc/bionic/bionic_allocator.cpp b/libc/bionic/bionic_allocator.cpp
index 7fd7067..b6d6ba7 100644
--- a/libc/bionic/bionic_allocator.cpp
+++ b/libc/bionic/bionic_allocator.cpp
@@ -41,7 +41,7 @@
#include <async_safe/CHECK.h>
#include "platform/bionic/page.h"
-#include "private/bionic_macros.h"
+#include "platform/bionic/macros.h"
//
// BionicAllocator is a general purpose allocator designed to provide the same
diff --git a/libc/bionic/bionic_elf_tls.cpp b/libc/bionic/bionic_elf_tls.cpp
index 3fa5182..61d826c 100644
--- a/libc/bionic/bionic_elf_tls.cpp
+++ b/libc/bionic/bionic_elf_tls.cpp
@@ -36,7 +36,7 @@
#include "private/ScopedRWLock.h"
#include "private/ScopedSignalBlocker.h"
#include "private/bionic_globals.h"
-#include "private/bionic_macros.h"
+#include "platform/bionic/macros.h"
#include "private/bionic_tls.h"
#include "pthread_internal.h"
diff --git a/libc/bionic/clone.cpp b/libc/bionic/clone.cpp
index 2a6ab41..622ca26 100644
--- a/libc/bionic/clone.cpp
+++ b/libc/bionic/clone.cpp
@@ -35,7 +35,7 @@
#include "pthread_internal.h"
#include "private/bionic_defs.h"
-#include "private/bionic_macros.h"
+#include "platform/bionic/macros.h"
extern "C" pid_t __bionic_clone(uint32_t flags, void* child_stack, int* parent_tid, void* tls, int* child_tid, int (*fn)(void*), void* arg);
extern "C" __noreturn void __exit(int status);
diff --git a/libc/bionic/grp_pwd.cpp b/libc/bionic/grp_pwd.cpp
index 6f8c07e..dd8df95 100644
--- a/libc/bionic/grp_pwd.cpp
+++ b/libc/bionic/grp_pwd.cpp
@@ -44,7 +44,7 @@
#include "private/ErrnoRestorer.h"
#include "private/android_filesystem_config.h"
-#include "private/bionic_macros.h"
+#include "platform/bionic/macros.h"
// Generated android_ids array
#include "generated_android_ids.h"
diff --git a/libc/bionic/grp_pwd_file.h b/libc/bionic/grp_pwd_file.h
index 9004c4e..69c771b 100644
--- a/libc/bionic/grp_pwd_file.h
+++ b/libc/bionic/grp_pwd_file.h
@@ -32,7 +32,7 @@
#include <pwd.h>
#include "private/bionic_lock.h"
-#include "private/bionic_macros.h"
+#include "platform/bionic/macros.h"
#include "private/grp_pwd.h"
class MmapFile {
diff --git a/libc/bionic/libc_init_dynamic.cpp b/libc/bionic/libc_init_dynamic.cpp
index ca94652..aafefab 100644
--- a/libc/bionic/libc_init_dynamic.cpp
+++ b/libc/bionic/libc_init_dynamic.cpp
@@ -53,7 +53,7 @@
#include "private/bionic_elf_tls.h"
#include "private/bionic_globals.h"
-#include "private/bionic_macros.h"
+#include "platform/bionic/macros.h"
#include "private/bionic_ssp.h"
#include "private/bionic_tls.h"
#include "private/KernelArgumentBlock.h"
diff --git a/libc/bionic/libc_init_static.cpp b/libc/bionic/libc_init_static.cpp
index d2a5334..1ac4750 100644
--- a/libc/bionic/libc_init_static.cpp
+++ b/libc/bionic/libc_init_static.cpp
@@ -43,7 +43,7 @@
#include "private/bionic_call_ifunc_resolver.h"
#include "private/bionic_elf_tls.h"
#include "private/bionic_globals.h"
-#include "private/bionic_macros.h"
+#include "platform/bionic/macros.h"
#include "private/bionic_tls.h"
#include "private/KernelArgumentBlock.h"
diff --git a/libc/bionic/locale.cpp b/libc/bionic/locale.cpp
index 8358fb0..0b7037a 100644
--- a/libc/bionic/locale.cpp
+++ b/libc/bionic/locale.cpp
@@ -35,7 +35,7 @@
#include <time.h>
#include <wchar.h>
-#include "private/bionic_macros.h"
+#include "platform/bionic/macros.h"
#if defined(__BIONIC_BUILD_FOR_ANDROID_SUPPORT)
#define USE_TLS_SLOT 0
diff --git a/libc/bionic/mmap.cpp b/libc/bionic/mmap.cpp
index 3503319..9aad0b3 100644
--- a/libc/bionic/mmap.cpp
+++ b/libc/bionic/mmap.cpp
@@ -31,7 +31,7 @@
#include <sys/mman.h>
#include <unistd.h>
-#include "private/bionic_macros.h"
+#include "platform/bionic/macros.h"
#include "private/ErrnoRestorer.h"
// mmap2(2) is like mmap(2), but the offset is in 4096-byte blocks, not bytes.
diff --git a/libc/bionic/mremap.cpp b/libc/bionic/mremap.cpp
index a4e5323..d7c9353 100644
--- a/libc/bionic/mremap.cpp
+++ b/libc/bionic/mremap.cpp
@@ -32,7 +32,7 @@
#include <stdint.h>
#include <unistd.h>
-#include "private/bionic_macros.h"
+#include "platform/bionic/macros.h"
extern "C" void* __mremap(void*, size_t, size_t, int, void*);
diff --git a/libc/bionic/ndk_cruft.cpp b/libc/bionic/ndk_cruft.cpp
index c816830..e9a5b5b 100644
--- a/libc/bionic/ndk_cruft.cpp
+++ b/libc/bionic/ndk_cruft.cpp
@@ -45,7 +45,7 @@
#include <unistd.h>
#include <wchar.h>
-#include "private/bionic_macros.h"
+#include "platform/bionic/macros.h"
extern "C" {
diff --git a/libc/bionic/pthread_atfork.cpp b/libc/bionic/pthread_atfork.cpp
index fb12a3b..0dcabdf 100644
--- a/libc/bionic/pthread_atfork.cpp
+++ b/libc/bionic/pthread_atfork.cpp
@@ -30,7 +30,7 @@
#include <pthread.h>
#include <stdlib.h>
-#include "private/bionic_macros.h"
+#include "platform/bionic/macros.h"
struct atfork_t {
atfork_t* next;
diff --git a/libc/bionic/pthread_create.cpp b/libc/bionic/pthread_create.cpp
index 03af2d9..4f7ac2b 100644
--- a/libc/bionic/pthread_create.cpp
+++ b/libc/bionic/pthread_create.cpp
@@ -42,7 +42,7 @@
#include "private/bionic_constants.h"
#include "private/bionic_defs.h"
#include "private/bionic_globals.h"
-#include "private/bionic_macros.h"
+#include "platform/bionic/macros.h"
#include "private/bionic_ssp.h"
#include "private/bionic_systrace.h"
#include "private/bionic_tls.h"
diff --git a/libc/bionic/scandir.cpp b/libc/bionic/scandir.cpp
index 0b39049..6a7e368 100644
--- a/libc/bionic/scandir.cpp
+++ b/libc/bionic/scandir.cpp
@@ -22,7 +22,7 @@
#include <string.h>
#include <unistd.h>
-#include "private/bionic_macros.h"
+#include "platform/bionic/macros.h"
#include "private/ScopedReaddir.h"
// A smart pointer to the scandir dirent**.
diff --git a/libc/bionic/scudo/scudo.cpp b/libc/bionic/scudo/scudo.cpp
index fb09b92..2cd36b1 100644
--- a/libc/bionic/scudo/scudo.cpp
+++ b/libc/bionic/scudo/scudo.cpp
@@ -33,7 +33,7 @@
#include <sys/param.h>
#include <sys/prctl.h>
-#include "private/bionic_macros.h"
+#include "platform/bionic/macros.h"
#include "scudo.h"
diff --git a/libc/bionic/system_property_set.cpp b/libc/bionic/system_property_set.cpp
index e981a58..56822ac 100644
--- a/libc/bionic/system_property_set.cpp
+++ b/libc/bionic/system_property_set.cpp
@@ -45,7 +45,7 @@
#include <async_safe/CHECK.h>
#include "private/bionic_defs.h"
-#include "private/bionic_macros.h"
+#include "platform/bionic/macros.h"
#include "private/ScopedFd.h"
static const char property_service_socket[] = "/dev/socket/" PROP_SERVICE_NAME;