diff options
| -rw-r--r-- | Changes.md | 11 | ||||
| -rw-r--r-- | core/config.mk | 4 | ||||
| -rw-r--r-- | core/main.mk | 3 | ||||
| -rw-r--r-- | core/soong_config.mk | 1 | ||||
| -rw-r--r-- | core/tasks/meta-lic.mk | 3 | ||||
| -rw-r--r-- | tools/releasetools/Android.bp | 3 | ||||
| -rw-r--r-- | tools/releasetools/add_img_to_target_files.py | 1 | ||||
| -rwxr-xr-x | tools/releasetools/sign_target_files_apks.py | 1 |
8 files changed, 16 insertions, 11 deletions
diff --git a/Changes.md b/Changes.md index fc15e601b6..9f2449c2c3 100644 --- a/Changes.md +++ b/Changes.md @@ -43,14 +43,9 @@ within a product configuration .mk file, board config .mk file, or buildspec.mk. 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`. +scripts run directly from makefiles, or from soong genrules. + +In addition, `python_*` soong modules no longer allow python 2. Python 2 is slated for complete removal in V. diff --git a/core/config.mk b/core/config.mk index 9cefd2cd85..192c8b28c8 100644 --- a/core/config.mk +++ b/core/config.mk @@ -173,6 +173,7 @@ $(KATI_obsolete_var BOARD_PREBUILT_PVMFWIMAGE,pvmfw.bin is now built in AOSP and $(KATI_obsolete_var BUILDING_PVMFW_IMAGE,BUILDING_PVMFW_IMAGE is no longer used) $(KATI_obsolete_var BOARD_BUILD_SYSTEM_ROOT_IMAGE) $(KATI_obsolete_var FS_GET_STATS) +$(KATI_obsolete_var BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES) # Used to force goals to build. Only use for conditionally defined goals. .PHONY: FORCE @@ -363,8 +364,7 @@ endif # configs, generally for cross-cutting features. # Build broken variables that should be treated as booleans -_build_broken_bool_vars := \ - BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES \ +_build_broken_bool_vars := # Build broken variables that should be treated as lists _build_broken_list_vars := \ diff --git a/core/main.mk b/core/main.mk index 5c280da1a2..8d0b465e0a 100644 --- a/core/main.mk +++ b/core/main.mk @@ -305,6 +305,9 @@ endif $(info [$(call inc_and_print,subdir_makefiles_inc)/$(subdir_makefiles_total)] finishing legacy Make module parsing ...) +# Create necessary directories and symlinks in the root filesystem +include system/core/rootdir/create_root_structure.mk + # ------------------------------------------------------------------- # All module makefiles have been included at this point. # ------------------------------------------------------------------- diff --git a/core/soong_config.mk b/core/soong_config.mk index a018c9b52f..fddb500058 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -286,7 +286,6 @@ $(call add_json_bool, BuildBrokenClangCFlags, $(filter true,$(BUILD $(call add_json_bool, GenruleSandboxing, $(if $(GENRULE_SANDBOXING),$(filter true,$(GENRULE_SANDBOXING)),$(if $(filter true,$(BUILD_BROKEN_GENRULE_SANDBOXING)),,true))) $(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_bool, BuildBrokenIncorrectPartitionImages, $(filter true,$(BUILD_BROKEN_INCORRECT_PARTITION_IMAGES))) $(call add_json_list, BuildBrokenInputDirModules, $(BUILD_BROKEN_INPUT_DIR_MODULES)) diff --git a/core/tasks/meta-lic.mk b/core/tasks/meta-lic.mk index 24adfc827f..620b1e29ae 100644 --- a/core/tasks/meta-lic.mk +++ b/core/tasks/meta-lic.mk @@ -225,3 +225,6 @@ $(eval $(call declare-1p-copy-files,packages/services/Car,)) # Moved here from hardware/libhardware_legacy/Android.mk $(eval $(call declare-1p-copy-files,hardware/libhardware_legacy,)) + +# Moved here from system/core/rootdir/Android.mk +$(eval $(call declare-1p-copy-files,system/core/rootdir,)) diff --git a/tools/releasetools/Android.bp b/tools/releasetools/Android.bp index 806e19238f..8c710449f9 100644 --- a/tools/releasetools/Android.bp +++ b/tools/releasetools/Android.bp @@ -368,6 +368,9 @@ python_binary_host { libs: [ "ota_utils_lib", ], + required: [ + "signapk", + ], } python_binary_host { diff --git a/tools/releasetools/add_img_to_target_files.py b/tools/releasetools/add_img_to_target_files.py index b39a82cf45..c25ff2718c 100644 --- a/tools/releasetools/add_img_to_target_files.py +++ b/tools/releasetools/add_img_to_target_files.py @@ -464,6 +464,7 @@ def AddDtbo(output_zip): dtbo_prebuilt_path = os.path.join( OPTIONS.input_tmp, "PREBUILT_IMAGES", "dtbo.img") assert os.path.exists(dtbo_prebuilt_path) + os.makedirs(os.path.dirname(img.name), exist_ok=True) shutil.copy(dtbo_prebuilt_path, img.name) # AVB-sign the image as needed. diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py index 8e89c872d7..a72342f2d7 100755 --- a/tools/releasetools/sign_target_files_apks.py +++ b/tools/releasetools/sign_target_files_apks.py @@ -591,6 +591,7 @@ def RegenerateKernelPartitions(input_tf_zip: zipfile.ZipFile, output_tf_zip: zip else: common.UnzipToDir(input_tf_zip.filename, OPTIONS.input_tmp, files_to_unzip) unzip_dir = OPTIONS.input_tmp + os.makedirs(os.path.join(unzip_dir, "IMAGES"), exist_ok=True) boot_image = common.GetBootableImage( "IMAGES/boot.img", "boot.img", unzip_dir, "BOOT", misc_info) |