summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorLogan Chien <loganchien@google.com>2019-11-27 07:24:42 -0800
committerLogan Chien <loganchien@google.com>2019-12-23 07:14:05 -0800
commita6bf7f2ee355559ec95378c7290702290aafb73c (patch)
tree46e5291f90223f14ac9333a66e192b202b9038d3 /tools
parentd98dac41df84e3f99d9a2e2bf158dc29ca7edf53 (diff)
versioner: Add a built-in macro for conditional compilation
This commit adds a built-in macro for conditional compilation because __attribute__((annotate(...))) may pull unused static inline functions into object files. We must not generate those functions in object files because it can result in undefined references to __strchr_chk on linux_glibc. Bug: 118991081 Test: source development/vndk/tools/header-checker/android/envsetup.sh && \ source build/envsetup.sh && \ lunch aosp_arm64-userdebug && \ m versioner && \ ./bionic/tools/versioner/run_tests.py Change-Id: I0c9d967413ec8e8655e91316973a79b81e2129b1
Diffstat (limited to 'tools')
-rw-r--r--tools/versioner/src/Driver.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/versioner/src/Driver.cpp b/tools/versioner/src/Driver.cpp
index 927a0f5e1..184c3d4e5 100644
--- a/tools/versioner/src/Driver.cpp
+++ b/tools/versioner/src/Driver.cpp
@@ -125,6 +125,7 @@ static void generateTargetCC1Flags(llvm::IntrusiveRefCntPtr<llvm::vfs::FileSyste
cmd.push_back(arch_targets[type.arch]);
cmd.push_back("-DANDROID");
+ cmd.push_back("-D__BIONIC_VERSIONER=1");
cmd.push_back("-D__ANDROID_API__="s + std::to_string(type.api_level));
cmd.push_back("-D_FORTIFY_SOURCE=2");
cmd.push_back("-D_GNU_SOURCE");