p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Revert "Change USE_CLANG_PLATFORM_BUILD default to true."" am: eca3206abb 

am: 67b6cc2201

* commit '67b6cc2201f41508ea36bd0943aef545a68a679f':
  Revert "Change USE_CLANG_PLATFORM_BUILD default to true."
This commit is contained in:
Stephen Hines 2015-12-13 15:13:26 -08:00 committed by android-build-merger
parent bcdc1070d4 67b6cc2201
commit 2967be8a2b
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/binary.mk
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