From 7a0c88ec3e54314bb1df2b7da32c0a7a3fcf045e Mon Sep 17 00:00:00 2001
From: Stephen Hines <srhines@google.com>
Date: Sun, 13 Dec 2015 22:58:22 +0000
Subject: [PATCH] Revert "Change USE_CLANG_PLATFORM_BUILD default to true."

This reverts commit 3c8036da538bbbf259ae4d56cc808943398cc45b.

Change-Id: I930bbebce8396d7c0abd847530640a696d3418e7
---
 core/binary.mk | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/binary.mk b/core/binary.mk
index ddc4a1b07..9ac609c2c 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -209,13 +209,11 @@ ifdef LOCAL_IS_HOST_MODULE
         my_clang := true
     endif
     endif
-# Add option to make gcc the default for device build
-else ifeq ($(USE_CLANG_PLATFORM_BUILD),false)
+# Add option to make clang the default for device build
+else ifeq ($(USE_CLANG_PLATFORM_BUILD),true)
     ifeq ($(my_clang),)
-        my_clang := false
+        my_clang := true
     endif
-else ifeq ($(my_clang),)
-    my_clang := true
 endif
 
 my_cpp_std_version := -std=gnu++14