Shoaib Meenai

This commit **corrects the type definition** for the `native_library_merge_sequence` attribute across several **Android build rules**. Specifically, it refines the type in `prelude/decls/android_rules.bzl` for `android_aar`, `android_binary`, and `android_bundle` rules. This **type correction** is a **bug fix** that enables `select` expressions to function properly within the `native_library_merge_sequence` attribute. The change ensures greater flexibility and correctness when configuring **Android native library merging**.

This commit **implements full dominator merging**, introducing a **new capability** to optimize the linking process by consolidating shared components. This advanced merging logic now has the potential to include **JNI entry points**, with a follow-up planned to allow their exclusion. To support this, a `force_static` field has been added to the `_LinkableSharedNode` record in `android_binary_native_library_rules.bzl` and the `LinkableGraphNode` in `merge_sequence.py`. This field is populated during **linkable graph encoding** via `encode_linkable_graph_for_mergemap` to correctly inform the merging sequence, integrating the new dominator merging into the existing infrastructure.

This commit **replicates the Android native library merge sequence algorithm** in C++, providing a **new capability** to replace the existing Python-based `merge_sequence.py` implementation. It introduces conditional logic within the `get_android_binary_native_library_info` function in `prelude/android/android_binary_native_library_rules.bzl` to select this new C++-based merging process. This work involves **refactoring** and **improvements** to the underlying `MergeLibrariesPass` component, ensuring identical results to the Python version. The immediate impact is to enable an **A/B test** for this new, more integrated merging approach within the **Android build system**.

This commit **refactors** the `prelude/android/tools/merge_sequence.py` script to ensure all generated JSON output files have their keys consistently sorted. By adding `sort_keys=True` to `json.dump` calls, this **maintenance** change improves the **consistency** of the output. This update makes it significantly easier to compare different versions of these output files, aligning their structure with existing standards and improving overall data readability and debugging.

This commit **removes the `passthrough` option** from the `GatoradeMode` enumeration within the `prelude/decls/android_rules.bzl` file. This is a **maintenance cleanup** that eliminates an obsolete testing-specific mode from the **Android build rules**. By removing this unnecessary dimension, the change simplifies the configuration and future development for supporting both early and late Gatorade implementations. The overall impact is a streamlined and more focused definition of Gatorade modes within the build system.

This commit performs a **refactoring** of the **Android build system's Gatorade integration** to support multiple phases. It **renames the existing "full" Gatorade mode to "late" Gatorade** across relevant build rules and enablement logic, including within `android_binary_native_library_rules.bzl` and its associated functions like `get_android_binary_native_library_info`. The `GatoradeMode` enum is updated to `GatoradePhase`, and the `enable_gatorade` attribute in `android_aar`, `android_binary`, and `android_bundle` rule definitions is replaced with a more flexible `gatorade_phases` attribute. This change is **preparatory work** to allow for the future introduction of additional Gatorade phases, such as "early" Gatorade, providing more granular control over the build process.

This commit introduces the **scaffolding** for an "early Gatorade" mode, a **new capability** designed to optimize library merges. It extends the `GatoradePhase` list in `prelude/decls/android_rules.bzl` to include this new 'early' phase. Concurrently, `prelude/android/android_binary_native_library_rules.bzl` is updated to support `early_gatorade_libraries`, laying the groundwork for Gatorade to access library contents and symbol relations sooner. This foundational work will enable Gatorade to make more intelligent merging decisions for **Android native libraries**.

This commit **adds support for `extra_linker_outputs`** within the **C++ toolchain**, enabling the declaration of additional files produced by the linker. It introduces an `extra_linker_outputs` attribute to the `cxx_toolchain` rule and **extends the `LinkerInfo` provider** to carry these outputs. The new `extra_outputs` parameter is propagated through the **C++ library generation pipeline**, including `cxx_library_generate`, `_form_library_outputs`, and various shared library creation functions in `shared_libraries.bzl`. This **new capability** enhances the flexibility of the C++ build system by allowing more comprehensive management of linker-generated artifacts.

This commit **fixes a bug** in the **prebuilt shared library validation** logic for **Android native libraries** within `prelude/android/android_binary_native_library_rules.bzl`. Previously, the `_transitive_has_linkable` function incorrectly checked only the dependencies of a target's dependencies, missing direct first-level linkable dependencies. This **bug fix** ensures that the system now correctly identifies all necessary transitive linkable dependencies, preventing potential build issues or incorrect dependency resolution for prebuilt Android libraries. The function has also been **renamed** to `_transitive_has_linkable_deps` for improved clarity and accuracy.

This commit **enhances the Android build system** by **allowing prebuilt shared libraries to declare dependencies on other prebuilt shared libraries**. It modifies the transitive dependency check within `prelude/android/android_binary_native_library_rules.bzl`, specifically adjusting the logic around `_transitive_has_non_prebuilt_linkable_deps`, to permit this previously restricted configuration. This **new capability** provides greater flexibility for integrating complex prebuilt native components, streamlining the build process for Android applications that rely on multiple precompiled libraries. The change addresses a limitation where such dependencies were not accounted for during merging and re-linking, but are now safely permitted when both the library and its dependencies are prebuilt.

This commit introduces a **new capability** to the **Android build system**, specifically within the `apk_genrule_impl` function defined in `prelude/android/apk_genrule.bzl`. It now **forwards unstripped native library subtargets** when generating **Android App Bundles (AABs)**. This enhancement is crucial for **improving native code debugging**, as these unstripped libraries provide essential symbols for effective troubleshooting. The change directly impacts developers working with native code in Android projects, enabling more robust debugging workflows for AABs.

This commit introduces a **new capability** to the **Android build system**, enabling the inclusion of asset libraries directly within the `[native_libs]` subtarget. This **enhancement** significantly improves the **debugging experience** for native libraries by constructing a combined asset library directory on demand, making these assets readily available. The core logic resides in `prelude/android/android_binary_native_library_rules.bzl`, specifically modifying `get_android_binary_native_library_info` to combine and expose these libraries. To support this, the `prelude/android/tools/combine_native_library_dirs.py` script was updated with a new `--subdir` argument for more flexible directory combination. This change streamlines the debugging workflow for **Android native library development**.

This commit introduces an **`executable_name` parameter** to the **`command_alias` rule**, allowing users to specify a custom name for the generated trampoline script. This **new capability** resolves compatibility issues where external tools, such as LLVM's `lit` test runner, expect wrapped binaries to have specific names (e.g., `clang`, `ld.lld`). The change modifies the `command_alias_impl` function in `prelude/command_alias.bzl` and updates the rule definition in `prelude/decls/core_rules.bzl` to expose this new attribute. This enhancement significantly improves **tooling compatibility** by ensuring `command_alias` can wrap executables without disrupting downstream systems reliant on precise binary naming. New tests have been added to validate the correct behavior of this parameter.

This commit delivers a **bug fix** for the **Python bootstrap toolchain**, specifically targeting issues encountered on **Windows environments**. It updates the Python interpreter name within `prelude/toolchains/python.bzl` from `python` to `python.exe`. This change is necessary because the process creation API on Windows was unable to resolve the generic `python` executable, leading to failures in the bootstrap process. By specifying `python.exe`, the toolchain can now correctly locate and execute the Python interpreter, ensuring reliable operation of Python-dependent builds on Windows.

This commit **refactors** the **Python build system** by simplifying the `python_bootstrap_binary` mechanism. It eliminates explicit `PYTHONPATH` manipulation, instead copying the main binary to a location relative to its libraries for implicit path resolution. This change, primarily within `python_bootstrap_binary_impl` in `prelude/python_bootstrap/python_bootstrap.bzl`, also removes `win_python_wrapper` logic. A significant **fix** is introduced to prevent binaries and libraries from defining the same source file, which previously led to incorrect behavior and required adjustments in `BUCK` files like `prelude/java/tools/BUCK`. This streamlines the build process and enforces clearer module separation.

This commit provides a **bug fix** for **relinker version script generation on Windows**. It updates the **Android native library rules** in `prelude/android/android_binary_native_library_rules.bzl`, specifically within the `create_relinker_version_script` and `union_needed_symbols` functions. The change replaces manual string splitting by `\n` with `splitlines()`, which robustly handles various line endings, including those specific to Windows, and also simplifies the code by removing the need for explicit stripping of trailing newlines. This ensures that symbol processing for **Android native binaries** functions correctly and reliably across different operating systems.

This commit **refactors** the **Android native library build rules** by reordering the relinker version script argument within the `relink_libraries` function in `prelude/android/android_binary_native_library_rules.bzl`. This change semantically **enables the removal or modification of the relinker version script** through subsequent post-processing steps. The primary impact is on the **Android build system**, providing greater flexibility and control over the linking process for native libraries. This **maintenance** work facilitates future optimizations or custom handling of relinker arguments.

This commit introduces a **new feature** by adding the `gatorade_extra_args` attribute to the definitions of the **Android build rules** `android_aar`, `android_binary`, and `android_bundle` in `prelude/decls/android_rules.bzl`. This enhancement allows developers to specify additional, custom arguments for the Gatorade build system when compiling Android AARs, binaries, and bundles. The change provides increased flexibility and control over the build process for these critical Android artifact types, enabling more tailored build configurations.

This commit **refactors** the **Android native library build process** by extracting post-finalization steps into a new function within `prelude/android/android_binary_native_library_rules.bzl`. This **maintenance** change prepares the build graph to be modified *after* initial merging, enabling more flexible native library processing in the future. It also exposes an `unstripped_native_libs_files` subtarget, which will **simplify future testing** by allowing easy examination of the final set of unstripped native libraries.

This commit **refactors** the **Android native library build rules** to implement stricter identification of JNI symbols. The logic within the `create_relinker_version_script` function in `prelude/android/android_binary_native_library_rules.bzl` is refined to ensure `JNI_OnLoad` is an exact match and `Java_` is a prefix match for JNI-related symbols. This **enhancement** prevents the build system from mistakenly preserving non-JNI symbols that merely contain these strings, which could otherwise be stripped. The change ensures that only truly special JNI entry points are retained, allowing for **more effective stripping of unreferenced symbols** and potentially optimizing native library sizes.