Navid Qaragozlou

This commit **resolves a reliability issue** in the **Rust `buck2` client's installer logic** by ensuring it properly respects the `--install-timeout` argument. Previously, the client's gRPC `send_timeout` was fixed, leading to premature disconnects for long-running installs that exceeded this internal timeout, despite the Java installer specifying a longer duration. The change involves **parsing the `--install-timeout` value** from the installer's arguments and using it to configure the gRPC `send_timeout` within `app/buck2_server_commands/src/install.rs`. This **enhancement prevents unexpected disconnections** during extended installation processes, making the installer more robust and configurable.

This commit **improves the debugging experience** for `buck2 install` failures by **capturing and surfacing installer stderr** when a TCP connection cannot be established. Previously, silent failures occurred because the installer's standard error was redirected to `/dev/null`, leading to cryptic "Failed after X attempts" messages. Now, the **`buck2_server_commands`** module, specifically within the `install.rs` logic, will redirect installer stderr to a temporary log file. If the TCP connection fails, the contents of this log file are appended to the error message, providing crucial context for diagnosing issues like JVM crashes or dependency mismatches. This **bug fix** significantly enhances the diagnosability of installer startup problems without altering the existing `--installer-debug` behavior.

This commit **improves build reproducibility** by making the **Android APK build process deterministic**. It modifies the `ApkBuilderUtils.java` component, specifically within the `buildApk` method, to ensure that native libraries, assets, zip files, and resources from JARs are added in a **sorted order** when constructing the final APK. This **maintenance fix** addresses non-deterministic iteration over sets, preventing variations in APK content order across builds and enhancing the reliability of the `buck` build system for Android applications.

This commit performs a **refactoring** of the **Android build rules** by extracting common attribute definitions shared between `android_binary` and `android_bundle`. It moves these duplicated attribute sets into new constants within `prelude/android/android.bzl` and `prelude/decls/android_rules.bzl`, thereby **eliminating code duplication** and improving maintainability. This change is a **no-op** functionally, as it only reorganizes existing code without altering behavior. It serves as a preparatory step for future work, specifically enabling the creation of a `meta_android_binary` User-Defined Rule.

This commit **standardizes the Kotlin compiler version used by `kotlincd` (Kotlin compiler daemon)** and its bootstrap, hardcoding it to version 2.1.0 and preventing user overrides. To accommodate non-standard use cases, it introduces a **new `kotlin classic` build path** that continues to honor the `kotlin.kotlin_version` configuration. This **maintenance and configuration change** ensures that `kotlincd` consistently operates with a specific, tested compiler version, while providing a dedicated alternative for projects requiring different Kotlin compiler versions.

This commit performs **maintenance** by **removing an unused `kotlin_version` variable** from the **KSP (Kotlin Symbol Processing)** module. The variable was no longer referenced, making its removal a **code cleanup** effort within the build configuration. This change improves the clarity and maintainability of the KSP setup without impacting any functionality or downstream consumers.

This commit **fixes** the non-deterministic output of the `ManifestMerger` report, ensuring `merge-report.txt` is consistent across different build environments. It modifies the **Android manifest generation** process, specifically within `GenerateManifest.java`, to utilize `BUCK_SCRATCH_PATH` for temporary directories instead of system-dependent locations. A new post-processing step is introduced to **relativize absolute paths** within the merge report, alongside explicit UTF-8 encoding, to guarantee **reproducible build outputs** and improve build system reliability. This **maintenance** work prevents discrepancies in reports generated on different machines.

This commit **re-applies a critical validation check** within the **Buck Android toolchain's Java compilation process**. Specifically, it modifies `Jsr199JavacInvocation.java` to ensure that the `javacd` invocation fails if any non-`.java`, `.src.zip`, or `.src.jar` files are passed as Java source paths. This **maintenance update** enforces stricter input hygiene for Java compilation, preventing incorrect compiler inputs. The change, which was previously reverted due to an unrelated issue, is now reinstated as the underlying problem has been resolved, and it may expose pre-existing issues in other parts of the build system.

This commit introduces a **critical validation check** within the **Buck2 Java compilation daemon (`javacd`)** to prevent silent failures. Previously, the `Jsr199JavacInvocation` component would silently ignore non-Java source files, such as `.kt` files, when passed as Java source paths, leading to potentially incomplete or incorrect build artifacts. This **bug fix** now explicitly throws a `RuntimeException` if any file other than `.java`, `.src.zip`, or `.src.jar` is encountered in the `createCompilationUnits` method. This change improves **build robustness** by ensuring that misconfigured builds fail early and loudly, providing clear diagnostic messages to developers and preventing unexpected behavior in downstream consumers.

This commit **fixes a bug** in the **`android_prebuilt_aar` rule** by explicitly adding the `classic_java_content_based_paths` attribute to its definition within `prelude/decls/android_rules.bzl`. Previously, the `_create_jar_artifact` function in `prelude/java/java_library.bzl` attempted to access this attribute from `ctx.attrs`, but it was not declared, leading to an error. This **maintenance fix** ensures the `android_prebuilt_aar` rule correctly supports content-based paths for classic Java, resolving a build-time issue and improving the stability of the Android build system.

This commit **fixes a compilation bug** affecting **Java classic targets** within `buck2`. Previously, accessing the `uses_content_based_paths_for_classic_java` attribute on `ctx.attrs` could lead to a runtime error if the attribute was not explicitly defined, causing compilation failures for modules like `android_prebuilt_aar`. The **maintenance change** introduces a **default value of `False`** when retrieving this attribute within the `_create_jar_artifact` function in `prelude/java/java_library.bzl`. This ensures **robustness** and prevents crashes during the Java compilation process.

This commit **corrects the processing order** for Android library manifests within the build system. It modifies the `generate_android_manifest` function in `prelude/android/android_manifest.bzl` to apply a **topological sort** when adding manifests to the merger list, replacing the previous BFS approach. This change ensures that the **Android manifest merging** process aligns with **Gradle's `CONSUMER_FIRST` behavior**, where consuming components' artifacts are processed before their dependencies. The fix prevents potential issues arising from incorrect manifest priority during the build.

This commit provides a **bug fix** for the **Buck2 Android installer** to gracefully handle offline devices. Previously, the installer would fail with an `AdbCommandFailedException` if an offline device was detected, even when targeting a specific online device. The `getState()` method in `AndroidDeviceImpl.kt` now catches this exception and returns "offline", preventing installation failures and allowing users to successfully install apps to online devices without needing to disconnect non-relevant offline devices. This improves the robustness and user experience of the **Android device detection and installation process**.

This commit **reinstates the modernization** of the **Android manifest merger**, replacing the outdated AOSP-coupled implementation with `com.android.tools.build:manifest-merger:31.7.3`. This **critical dependency upgrade** affects the **Android build toolchain** by updating build dependencies in `prelude/toolchains/android` and adjusting the `GenerateManifest` API usage. The change is a significant **refactoring** aimed at resolving issues caused by the previous 10-year-old merger. It ensures the build system's compatibility with modern Android development and may expose pre-existing manifest-related problems in various projects, which are expected to be fixed forward.

This commit performs a critical **dependency upgrade** and **refactoring** of the **Android manifest merging logic**, decoupling it from AOSP and upgrading to `com.android.tools.build:manifest-merger:31.7.3`. This change directly impacts the **Android build toolchain** by replacing an outdated, decade-old component responsible for combining `AndroidManifest.xml` files. The **refactoring** involves updating build dependencies, adapting the `GenerateManifest.java` logic to the new library's API, and updating various import statements. This **maintenance** effort resolves long-standing build issues caused by the old merger, improving the reliability and compatibility of Android application builds.

This commit **refactors** the **Android manifest generation logic** within `prelude/android/android_manifest.bzl`. Specifically, it **updates the projection ordering for library manifests** from a breadth-first search (BFS) approach to a **topological sort**. This change ensures that library manifests are added to the merger list in a correct dependency order, which is crucial for accurate manifest merging. This **improves the reliability and correctness** of the `generate_android_manifest` function, addressing a specific need for complex dependency graphs.

This commit introduces a **new preprocessing capability** within the **Android manifest generation system** to automatically inject `minSdkVersion` and `targetSdkVersion` into library manifests when these attributes are missing. This **maintenance change** ensures that all library manifests explicitly declare SDK versions, inheriting values from the main application manifest. The `GenerateManifest` tool and `android_manifest.bzl` rule are updated to support this new logic and a dedicated `PreprocessLogger`. This crucial update **prevents potential build failures and the addition of unallowlisted permissions** that would arise from an upcoming upgrade to the manifest merger, which would otherwise default missing `targetSdkVersion` to 1.

This commit **adds a metadata handler** to the `kotlincd` and `javacd` **Thrift servers**, enabling their inspection and testing using `thriftdbg`. This **new capability** is part of a broader **refactoring** effort within the `buck/jvm/remote_worker` subsystem. The work also includes **dependency optimization** by removing unused build dependencies from `BUCK` targets. This significantly reduces the build graph size and JAR footprint for tools like `kotlincd_therift_worker_tool`, leading to a substantial improvement in build efficiency and resource usage.

This commit **disables** the `--fastdeploy` option within the **Android installer** to address a critical bug where `INSTALL_FAILED_UPDATE_INCOMPATIBLE` errors were silently suppressed, causing failed updates to appear successful. The conditional logic for `fastdeploy` in `prelude/toolchains/android/src/com/facebook/buck/android/exopackage/AndroidDeviceImpl.kt` was also **refactored** into a new private function `shouldUseFastDeploy`. This **bug fix** prevents misleading installation feedback and significantly improves the reliability of **Android application deployment**. Consequently, related tests in `prelude/toolchains/android/test/com/facebook/buck/android/exopackage/AndroidDeviceImplTest.kt` are now **ignored** as part of this maintenance.

This commit performs a **build system refactoring** to correctly separate the `kotlincd` standalone and gRPC worker targets, which were previously incorrectly intertwined in the build configuration. It adjusts dependencies within the `prelude/toolchains/android/src/com/facebook/buck/jvm/kotlin/cd/workertool/BUCK` file, specifically adding `gson` to a `buck_java_library` and removing `main_lib` from a `buck_java_binary`. Furthermore, the visibility of a **third-party JAR** is extended to support the `main_lib` within the `kotlincd/workertool` package. This ensures proper isolation and dependency management for the **Kotlin compiler daemon's** worker tools, enhancing the correctness and maintainability of the build.