diff options
| author | Pavel Labath <labath@google.com> | 2016-12-02 11:15:15 +0000 |
|---|---|---|
| committer | Pavel Labath <labath@google.com> | 2016-12-02 11:15:15 +0000 |
| commit | e705c8b5e606de939f34adccd493aabb219f944f (patch) | |
| tree | 91d99b89ba34ad108936207bb175d814443eec49 /lldb/cmake | |
| parent | 964782adbb1dc17413707e173f323a19ff479c7d (diff) | |
| download | bcm5719-llvm-e705c8b5e606de939f34adccd493aabb219f944f.tar.gz bcm5719-llvm-e705c8b5e606de939f34adccd493aabb219f944f.zip | |
Replace __ANDROID_NDK__ with __ANDROID__
Summary:
This replaces all the uses of the __ANDROID_NDK__ define with __ANDROID__. This
is a preparatory step to remove our custom android toolchain file and rely on
the standard android NDK one instead, which does not provide this define.
Instead I rely, on __ANDROID__, which is set by the compiler.
I haven't yet removed the cmake variable with the same name, as we will need to
do something completely different there -- NDK toolchain defines
CMAKE_SYSTEM_NAME to Android, while our current one pretends it's linux.
Reviewers: tberghammer, zturner
Subscribers: danalbert, srhines, mgorny, lldb-commits
Differential Revision: https://reviews.llvm.org/D27305
llvm-svn: 288494
Diffstat (limited to 'lldb/cmake')
| -rw-r--r-- | lldb/cmake/platforms/Android.cmake | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lldb/cmake/platforms/Android.cmake b/lldb/cmake/platforms/Android.cmake index 04c73af9fea..b977b1ed364 100644 --- a/lldb/cmake/platforms/Android.cmake +++ b/lldb/cmake/platforms/Android.cmake @@ -33,8 +33,7 @@ set( CMAKE_SYSTEM_NAME Linux ) include( CMakeForceCompiler ) # flags and definitions -remove_definitions( -DANDROID -D__ANDROID__ ) -add_definitions( -DANDROID -D__ANDROID_NDK__ -DLLDB_DISABLE_LIBEDIT ) +add_definitions( -DANDROID -DLLDB_DISABLE_LIBEDIT ) set( ANDROID True ) set( __ANDROID_NDK__ True ) set( LLDB_DEFAULT_DISABLE_LIBEDIT True ) |
