tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove unnecessary USE_CLANG_PLATFORM_BUILD."

Browse source 
am: 504bd79e86

Change-Id: I063e6632b256eb8361cc63251398d30d63a08c58
This commit is contained in:
Stephen Hines 2018-01-12 18:27:21 +00:00 committed by android-build-merger
commit dfc0111700
5 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Changes.md
View file

@ -92,6 +92,11 @@ Specify Framework Compatibility Matrix Version in device manifest by adding a `t
attribute to the root element `<manifest>`. If `PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE`
is 26 or 27, you can add `"target-level"="1"` to your device manifest instead.
### Stop using USE_CLANG_PLATFORM_BUILD {#USE_CLANG_PLATFORM_BUILD}
Clang is the default and only supported Android compiler, so there is no reason
for this option to exist.
### Other envsetup.sh variables {#other_envsetup_variables}
* ANDROID_TOOLCHAIN

5
core/binary.mk
View file

@ -354,11 +354,6 @@ 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)
ifeq ($(my_clang),)
my_clang := false
endif
else ifeq ($(my_clang),)
my_clang := true
endif

1
core/config.mk
View file

@ -76,6 +76,7 @@ $(KATI_obsolete_var \
ANDROID_PRE_BUILD_PATHS \
,See $(CHANGES_URL)#other_envsetup_variables)
$(KATI_obsolete_var PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE,Set FCM Version in device manifest instead. See $(CHANGES_URL)#PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE)
$(KATI_obsolete_var USE_CLANG_PLATFORM_BUILD,Clang is the only supported Android compiler. See $(CHANGES_URL)#USE_CLANG_PLATFORM_BUILD)
CHANGES_URL :=

10
core/envsetup.mk
View file

@ -657,13 +657,3 @@ endif
ifeq ($(CALLED_FROM_SETUP),true)
PRINT_BUILD_CONFIG ?= true
endif
ifeq ($(USE_CLANG_PLATFORM_BUILD),)
USE_CLANG_PLATFORM_BUILD := true
endif
ifneq ($(USE_CLANG_PLATFORM_BUILD),true)
ifneq ($(USE_CLANG_PLATFORM_BUILD),false)
$(error USE_CLANG_PLATFORM_BUILD must be true or false)
endif
endif

1
core/soong_config.mk
View file

@ -110,7 +110,6 @@ $(call add_json_str, BtConfigIncludeDir, $(BOARD_BLUETOOTH_BDROI
$(call add_json_bool, Device_uses_hwc2, $(filter true,$(TARGET_USES_HWC2)))
$(call add_json_list, DeviceKernelHeaders, $(TARGET_PROJECT_SYSTEM_INCLUDES))
$(call add_json_bool, DevicePrefer32BitExecutables, $(filter true,$(TARGET_PREFER_32_BIT_EXECUTABLES)))
$(call add_json_val, DeviceUsesClang, $(if $(USE_CLANG_PLATFORM_BUILD),$(USE_CLANG_PLATFORM_BUILD),false))
$(call add_json_str, DeviceVndkVersion, $(BOARD_VNDK_VERSION))
$(call add_json_str, Platform_vndk_version, $(PLATFORM_VNDK_VERSION))
$(call add_json_list, ExtraVndkVersions, $(PRODUCT_EXTRA_VNDK_VERSIONS))