[PATCH] D66123: [scudo][standalone] Clean-up of Android specific compilation.

[Christopher Ferris via Phabricator via llvm-commits]

cferris created this revision.
cferris added reviewers: cryptoad, eugenis, vitalybuka, hctim, morehouse.
cferris added projects: LLVM, Sanitizers.
Herald added a subscriber: srhines.

It is possible to build with ANDROID defined, but without
bionic. However, all of the code under the SCUDO_ANDROID
assumes that it is being compiled for android with bionic.
Make this explicit by changing SCUDO_ANDROID to SCUDO_ANDROID_BIONIC
and set it only if it is really building for bionic.

In addition, use bionic headers for some values rather than redefining
them.

Verified that this builds properly on aosp master.


Repository:
  rCRT Compiler Runtime

https://reviews.llvm.org/D66123

Files:
  compiler-rt/lib/scudo/standalone/allocator_config.h
  compiler-rt/lib/scudo/standalone/common.h
  compiler-rt/lib/scudo/standalone/linux.cpp
  compiler-rt/lib/scudo/standalone/linux.h
  compiler-rt/lib/scudo/standalone/platform.h
  compiler-rt/lib/scudo/standalone/tsd_shared.h
  compiler-rt/lib/scudo/standalone/wrappers_c.cpp
  compiler-rt/lib/scudo/standalone/wrappers_c.h
  compiler-rt/lib/scudo/standalone/wrappers_c.inc
  compiler-rt/lib/scudo/standalone/wrappers_c_bionic.cpp
  compiler-rt/lib/scudo/standalone/wrappers_cpp.cpp

-------------- next part --------------
A non-text attachment was scrubbed...
Name: D66123.214713.patch
Type: text/x-patch
Size: 7907 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190813/e72322b3/attachment.bin>