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

Commit cd70c8d1 authored by Cole Faust's avatar Cole Faust Committed by Gerrit Code Review
Browse files

Merge "Add BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES"

parents c3eb995e 189905be

Changes.md

+17 −1
Original line number Original line Diff line number Diff line 
# Build System Changes for Android.mk Writers

# Build System Changes for Android.mk Writers





## Python 2 to 3 migration



The path set when running builds now makes the `python` executable point to python 3,

whereas on previous versions it pointed to python 2. If you still have python 2 scripts,

you can change the shebang line to use `python2` explicitly. This only applies for

scripts run directly from makefiles, or from soong genrules. This behavior can be

temporarily overridden by setting the `BUILD_BROKEN_PYTHON_IS_PYTHON2` environment

variable to `true`. It's only an environment variable and not a product config variable

because product config sometimes calls python code.



In addition, `python_*` soong modules no longer allow python 2. This can be temporarily

overridden by setting the `BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES` product configuration

variable to `true`.



Python 2 is slated for complete removal in V.



## Stop referencing sysprop_library directly from cc modules

## Stop referencing sysprop_library directly from cc modules





For the migration to Bazel, we are no longer mapping sysprop_library targets

For the migration to Bazel, we are no longer mapping sysprop_library targets
@@ -818,7 +834,7 @@ for this option to exist. 




### Stop using clang property

### Stop using clang property





Clang has been deleted from Soong. To fix any build errors, remove the clang

The clang property has been deleted from Soong. To fix any build errors, remove the clang

property from affected Android.bp files using bpmodify.

property from affected Android.bp files using bpmodify.

core/board_config.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -188,6 +188,7 @@ _build_broken_var_list := \ 
  BUILD_BROKEN_PREBUILT_ELF_FILES \

  BUILD_BROKEN_PREBUILT_ELF_FILES \

  BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW \

  BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW \

  BUILD_BROKEN_USES_NETWORK \

  BUILD_BROKEN_USES_NETWORK \

  BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES \

  BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE \

  BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE \

  BUILD_BROKEN_VINTF_PRODUCT_COPY_FILES \

  BUILD_BROKEN_VINTF_PRODUCT_COPY_FILES \

core/soong_config.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -286,6 +286,7 @@ $(call add_json_bool, BuildBrokenClangCFlags, $(filter true,$(BUILD_ 
$(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)))

$(call add_json_bool, BuildBrokenUsesSoongPython2Modules, $(filter true,$(BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES)))

$(call add_json_bool, BuildBrokenVendorPropertyNamespace, $(filter true,$(BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE)))

$(call add_json_bool, BuildBrokenVendorPropertyNamespace, $(filter true,$(BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE)))

$(call add_json_list, BuildBrokenInputDirModules, $(BUILD_BROKEN_INPUT_DIR_MODULES))

$(call add_json_list, BuildBrokenInputDirModules, $(BUILD_BROKEN_INPUT_DIR_MODULES))