Merge "Change USE_CLANG_PLATFORM_BUILD default to true." am: eb486309d8

am: a3fbb3b0e4

* commit 'a3fbb3b0e49bfbec697f73d4c4e77bb12f8e348e':
  Change USE_CLANG_PLATFORM_BUILD default to true.
This commit is contained in:
Chih-hung Hsieh 2015-12-11 10:25:29 -08:00 committed by android-build-merger
commit c0b23c4780
1 changed files with 5 additions and 3 deletions

View File

@ -209,11 +209,13 @@ ifdef LOCAL_IS_HOST_MODULE
my_clang := true
endif
endif
# Add option to make clang the default for device build
else ifeq ($(USE_CLANG_PLATFORM_BUILD),true)
# Add option to make gcc the default for device build
else ifeq ($(USE_CLANG_PLATFORM_BUILD),false)
ifeq ($(my_clang),)
my_clang := true
my_clang := false
endif
else ifeq ($(my_clang),)
my_clang := true
endif
my_cpp_std_version := -std=gnu++14