From e705c8b5e606de939f34adccd493aabb219f944f Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Fri, 2 Dec 2016 11:15:15 +0000 Subject: 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 --- lldb/cmake/platforms/Android.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lldb/cmake') 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 ) -- cgit v1.2.1