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

Merge "Add BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES" am: cd70c8d107 am: 474f5f2742 am: 21f795206c

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

Change-Id: Id3ea7da13d7353a3c451aba770cdb583ae2a70a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust
2023-03-10 07:48:31 +00:00
committed by Automerger Merge Worker
parent e74e2aed2a 21f795206c
commit f6476d2794
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Changes.md
View File

@@ -1,5 +1,21 @@
# 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
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
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.

1
core/board_config.mk
View File

@@ -188,6 +188,7 @@ _build_broken_var_list := \
BUILD_BROKEN_PREBUILT_ELF_FILES \
BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW \
BUILD_BROKEN_USES_NETWORK \
BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES \
BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE \
BUILD_BROKEN_VINTF_PRODUCT_COPY_FILES \

1
core/soong_config.mk
View File

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