milestone

Author: litert-public-test

.tf_configure.bazelrc

@@ -11,4 +11,3 @@ build --action_env ANDROID_SDK_API_LEVEL="30"
 build --action_env ANDROID_NDK_API_LEVEL="21"
 build --action_env ANDROID_NDK_VERSION="25"
 build --action_env TF_CONFIGURE_IOS="0"
-build --distinct_host_configuration=false

hermetic_build.Dockerfile

@@ -18,18 +18,20 @@ RUN apt-get update && apt-get install -y \
     && apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-# Install Bazel
-ARG BAZEL_VERSION=5.3.0
-RUN wget https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh && \
-    chmod +x bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh && \
-    ./bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh && \
-    rm bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh
-
-# Install Bazelisk as fallback for any version requirements
-RUN wget https://github.com/bazelbuild/bazelisk/releases/download/v1.18.0/bazelisk-linux-amd64 && \
-    chmod +x bazelisk-linux-amd64 && \
-    mv bazelisk-linux-amd64 /usr/local/bin/bazelisk && \
-    ln -sf /usr/local/bin/bazelisk /usr/local/bin/bazel.real
+# Install Bazelisk to handle automatic Bazel version management
+RUN ARCH=$(uname -m) && \
+    if [ "$ARCH" = "x86_64" ]; then \
+        wget https://github.com/bazelbuild/bazelisk/releases/download/v1.18.0/bazelisk-linux-amd64 -O bazelisk; \
+    elif [ "$ARCH" = "aarch64" ]; then \
+        wget https://github.com/bazelbuild/bazelisk/releases/download/v1.18.0/bazelisk-linux-arm64 -O bazelisk; \
+    else \
+        echo "Unsupported architecture: $ARCH"; \
+        exit 1; \
+    fi && \
+    chmod +x bazelisk && \
+    mv bazelisk /usr/local/bin/bazel && \
+    # Set USE_BAZEL_VERSION to ensure bazelisk downloads the right version
+    echo "export USE_BAZEL_VERSION=7.4.1" >> /etc/bash.bashrc
 
 # Set up Android SDK and NDK
 ENV ANDROID_DEV_HOME=/android
@@ -89,6 +91,7 @@ ENV TF_NEED_ROCM=0
 ENV TF_DOWNLOAD_CLANG=0
 ENV TF_SET_ANDROID_WORKSPACE=1
 ENV TF_CONFIGURE_IOS=0
+ENV USE_BAZEL_VERSION=7.4.1
 
 # Set NDK version for configuration
 ENV ANDROID_NDK_VERSION=25
@@ -134,7 +137,6 @@ build --action_env ANDROID_SDK_API_LEVEL="${ANDROID_SDK_API_LEVEL}"\n\
 build --action_env ANDROID_NDK_API_LEVEL="${ANDROID_NDK_API_LEVEL}"\n\
 build --action_env ANDROID_NDK_VERSION="${ANDROID_NDK_VERSION}"\n\
 build --action_env TF_CONFIGURE_IOS="${TF_CONFIGURE_IOS}"\n\
-build --distinct_host_configuration=false\n\
 EOL\n\
 \n\
 echo "Configuration complete. .tf_configure.bazelrc has been generated at /litert_build/.tf_configure.bazelrc"\n\
@@ -151,4 +153,4 @@ COPY verify_android_env.sh /verify_android_env.sh
 RUN chmod +x /verify_android_env.sh
 
 # Default command
-CMD ["bash", "-c", "./verify_android_env.sh && bazel build //litert/runtime:metrics"]
+CMD ["bash", "-c", "./verify_android_env.sh && USE_BAZEL_VERSION=7.4.1 bazel build //litert/runtime:metrics"]