diff --git a/environ.py b/environ.py index f5a092a..4f8687e 100755 --- a/environ.py +++ b/environ.py @@ -381,7 +381,6 @@ def main(): print("Android Build Environment Setup") print(f"Source directory: {source_dir}") - print(f"Patch directories: {', '.join(patch_dirs) if patch_dirs else '(from config or default)'}") print(f"Patch level: -p{patch_level}") print(f"Sync jobs: {sync_jobs}") if ignore_patches: @@ -443,11 +442,14 @@ def main(): patch_config = config.get('patches', {}) if config else {} if patch_dirs is not None: effective_patch_dirs = patch_dirs + patch_dirs_source = "CLI" elif 'dirs' in patch_config: effective_patch_dirs = patch_config['dirs'] - print(f"Using patch directories from repo.yml: {effective_patch_dirs}") + patch_dirs_source = "repo.yml" else: effective_patch_dirs = ['patches'] + patch_dirs_source = "default" + print(f"Patch directories ({patch_dirs_source}): {', '.join(effective_patch_dirs)}") # Load directory mappings from repo.yml (e.g. "android/36" -> "frameworks/base") mappings = patch_config.get('mappings', {})