Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fef5ca53 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Revert "Default BuildBrokenClangCFlags & BuildBrokenClangAsFlag...""

parents f07d5210 65f28793

Changes.md

+0 −21
Original line number Diff line number Diff line
@@ -827,27 +827,6 @@ go run bpmodify.go -w -m=module_name -remove-property=true -property=clang filep 
```



`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}



* ANDROID_TOOLCHAIN

core/board_config.mk

+0 −2
Original line number Diff line number Diff line
@@ -175,8 +175,6 @@ _board_strip_list += ODM_MANIFEST_SKUS 


_build_broken_var_list := \

  BUILD_BROKEN_CLANG_PROPERTY \

  BUILD_BROKEN_CLANG_ASFLAGS \

  BUILD_BROKEN_CLANG_CFLAGS \

  BUILD_BROKEN_DEPFILE \

  BUILD_BROKEN_DUP_RULES \

  BUILD_BROKEN_DUP_SYSPROP \

core/soong_config.mk

+0 −2
Original line number Diff line number Diff line
@@ -276,8 +276,6 @@ $(call add_json_str, PrebuiltHiddenApiDir, $(BOARD_PREBUILT_HIDDENAPI_DIR)) 
$(call add_json_str,  ShippingApiLevel, $(PRODUCT_SHIPPING_API_LEVEL))



$(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, BuildBrokenEnforceSyspropOwner,     $(filter true,$(BUILD_BROKEN_ENFORCE_SYSPROP_OWNER)))

$(call add_json_bool, BuildBrokenTrebleSyspropNeverallow, $(filter true,$(BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW)))