use __ANDROID__ and remove GCE_ANDROID
Change-Id: Ia50c6a71afebfb67113999e8bf81fa32a6cb7536
diff --git a/Android.mk b/Android.mk
index 589194d..7b259d7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -125,9 +125,6 @@
LOCAL_CFLAGS+=-O3 -Wno-unused-parameter
LOCAL_CFLAGS += -DGCE_PLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
-ifneq ($(filter gce_x86 calypso, $(TARGET_DEVICE)),)
-LOCAL_CFLAGS += -DANDROID_GCE -DSSHDIR=\"/var/run/ssh\"
-endif
include $(BUILD_SHARED_LIBRARY)
diff --git a/auth.c b/auth.c
index 65f3d0d..636308c 100644
--- a/auth.c
+++ b/auth.c
@@ -629,7 +629,7 @@
aix_setauthdb(user);
#endif
-#ifdef ANDROID_GCE
+#ifdef __ANDROID__
// Android has a fixed set of users. Any incoming user that we can't
// identify should be authenticated as the shell user.
if (strcmp(user, "root") && strcmp(user, "shell")) {
