StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Revert "Default BuildBrokenClangCFlags & BuildBrokenCla..."" am: 358fe88bf1 am: 2e82617428

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2216928

Change-Id: I5ce1dff5f62745315fab1d08182842df1c22eb08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alix Espino
2022-09-21 22:37:43 +00:00
committed by Automerger Merge Worker
parent f1f019c307 2e82617428
commit 23a5a512a9
3 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Changes.md
View File

@@ -827,6 +827,27 @@ go run bpmodify.go -w -m=module_name -remove-property=true -property=clang filep
``` ```
`BUILD_BROKEN_CLANG_PROPERTY` can be used as temporarily workaround `BUILD_BROKEN_CLANG_PROPERTY` can be used as temporarily workaround
### Stop using clang_cflags and clang_asflags
clang_cflags and clang_asflags are deprecated.
To fix any build errors, use bpmodify to either
- move the contents of clang_asflags/clang_cflags into asflags/cflags or
- delete clang_cflags/as_flags as necessary
To Move the contents:
``` make
go run bpmodify.go -w -m=module_name -move-property=true -property=clang_cflags -new-location=cflags filepath
```
To Delete:
``` make
go run bpmodify.go -w -m=module_name -remove-property=true -property=clang_cflags filepath
```
`BUILD_BROKEN_CLANG_ASFLAGS` and `BUILD_BROKEN_CLANG_CFLAGS` can be used as temporarily workarounds
### Other envsetup.sh variables {#other_envsetup_variables} ### Other envsetup.sh variables {#other_envsetup_variables}
* ANDROID_TOOLCHAIN * ANDROID_TOOLCHAIN

2
core/board_config.mk
View File

@@ -175,6 +175,8 @@ _board_strip_list += ODM_MANIFEST_SKUS
_build_broken_var_list := \ _build_broken_var_list := \
BUILD_BROKEN_CLANG_PROPERTY \ BUILD_BROKEN_CLANG_PROPERTY \
BUILD_BROKEN_CLANG_ASFLAGS \
BUILD_BROKEN_CLANG_CFLAGS \
BUILD_BROKEN_DEPFILE \ BUILD_BROKEN_DEPFILE \
BUILD_BROKEN_DUP_RULES \ BUILD_BROKEN_DUP_RULES \
BUILD_BROKEN_DUP_SYSPROP \ BUILD_BROKEN_DUP_SYSPROP \

4
core/soong_config.mk
View File

@@ -275,7 +275,9 @@ $(call add_json_str, PrebuiltHiddenApiDir, $(BOARD_PREBUILT_HIDDENAPI_DIR))
$(call add_json_str, ShippingApiLevel, $(PRODUCT_SHIPPING_API_LEVEL)) $(call add_json_str, ShippingApiLevel, $(PRODUCT_SHIPPING_API_LEVEL))
$(call add_json_bool, BuildBrokenClangProperty, $(filter true,$(BUILD_BROKEN_CLANG_PROPERTY))) $(call add_json_bool, BuildBrokenClangProperty, $(filter true,$(BUILD_BROKEN_CLANG_PROPERTY)))
$(call add_json_bool, BuildBrokenClangAsFlags, $(filter true,$(BUILD_BROKEN_CLANG_ASFLAGS)))
$(call add_json_bool, BuildBrokenClangCFlags, $(filter true,$(BUILD_BROKEN_CLANG_CFLAGS)))
$(call add_json_bool, BuildBrokenDepfile, $(filter true,$(BUILD_BROKEN_DEPFILE))) $(call add_json_bool, BuildBrokenDepfile, $(filter true,$(BUILD_BROKEN_DEPFILE)))
$(call add_json_bool, BuildBrokenEnforceSyspropOwner, $(filter true,$(BUILD_BROKEN_ENFORCE_SYSPROP_OWNER))) $(call add_json_bool, BuildBrokenEnforceSyspropOwner, $(filter true,$(BUILD_BROKEN_ENFORCE_SYSPROP_OWNER)))
$(call add_json_bool, BuildBrokenTrebleSyspropNeverallow, $(filter true,$(BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW))) $(call add_json_bool, BuildBrokenTrebleSyspropNeverallow, $(filter true,$(BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW)))