Merge "Revert "Change USE_CLANG_PLATFORM_BUILD default to true.""

am: eca3206abb

* commit 'eca3206abbf2223d6bc6c1c4337c911077fc2897':
  Revert "Change USE_CLANG_PLATFORM_BUILD default to true."
This commit is contained in:
Stephen Hines 2015-12-13 15:10:18 -08:00 committed by android-build-merger
commit 67b6cc2201
1 changed files with 3 additions and 5 deletions

View File

@ -217,13 +217,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