diff --git a/.github/workflows/android_tflite_oneshot_build.yml b/.github/workflows/android_tflite_oneshot_build.yml deleted file mode 100644 index 5db45db2e4bd..000000000000 --- a/.github/workflows/android_tflite_oneshot_build.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Builds the TFLite Java Bindings Android Library using the gradle-android -# Docker image. -name: Build TFLite Android Library - -on: - workflow_dispatch: - -jobs: - build_android_with_docker: - runs-on: ubuntu-20.04 - env: - ANDROID_CONTAINER: "gcr.io/iree-oss/gradle-android@sha256:cf7bf0392d5125f2babb4b9de4b43b583220506ecebd6b6201b23b2575f671c0" - steps: - - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0 - with: - submodules: true - - name: Execute Android Build - run: | - docker run --rm \ - -w=/work \ - -v $PWD:/work \ - "${ANDROID_CONTAINER}" \ - bash -c build_tools/gradle/build_tflite_android_library.sh - - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 - with: - path: ./runtime/bindings/tflite/java/build/outputs/aar/*.aar - retention-days: 1 diff --git a/build_tools/docker/dockerfiles/gradle-android.Dockerfile b/build_tools/docker/dockerfiles/gradle-android.Dockerfile deleted file mode 100644 index 9e3185546024..000000000000 --- a/build_tools/docker/dockerfiles/gradle-android.Dockerfile +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 2021 The IREE Authors -# -# Licensed under the Apache License v2.0 with LLVM Exceptions. -# See https://llvm.org/LICENSE.txt for license information. -# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - -# An image for cross-compiling IREE's TFLite Java Bindings with Gradle and -# CMake. - -FROM gcr.io/iree-oss/base@sha256:796fb81a11ff7e7d057c93de468b74e48b6a9641aa19b7f7673c2772e8ea3b33 - -### Java ### -WORKDIR /install-jdk -# Download and install openjdk-11 -ARG JDK_VERSION=11 -RUN apt-get update && apt-get install -y openjdk-11-jdk - -### Gradle ### -WORKDIR /install-gradle - -ARG GRADLE_VERSION=7.1.1 -ARG GRADLE_DIST=bin - -# Download and install Gradle -RUN wget -q https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-${GRADLE_DIST}.zip && \ - unzip -q gradle*.zip -d /opt/ && \ - ln -s /opt/gradle-${GRADLE_VERSION}/bin/gradle /usr/bin/gradle \ - rm -rf /install-gradle - -### Android ### -WORKDIR /install-android - -# Download and install Android SDK -# Note: Uses the latest SDK version from https://developer.android.com/studio, -# however Gradle will automatically download any additional SDK/tooling versions -# as necessary. -ARG ANDROID_SDK_VERSION=7583922 -ARG ANDROID_NDK_VERSION=21.4.7075529 - -ENV ANDROID_SDK_ROOT /opt/android-sdk -ENV ANDROID_HOME ${ANDROID_SDK_ROOT} -ENV ANDROID_NDK /opt/android-sdk/ndk/${ANDROID_NDK_VERSION} - -RUN mkdir -p "${ANDROID_SDK_ROOT}/cmdline-tools" \ - && curl --silent --fail --show-error --location \ - "https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_VERSION}_latest.zip" \ - --output android_tools.zip \ - && unzip -q android_tools.zip -d "${ANDROID_SDK_ROOT}/cmdline-tools" \ - && mv "${ANDROID_SDK_ROOT}/cmdline-tools/cmdline-tools" "${ANDROID_SDK_ROOT}/cmdline-tools/tools" \ - # yes will give a non-zero exit code in non-interactive settings (broken pipe?) - # with -o pipefail this leads to an error. - && { yes || true; } | "${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin/sdkmanager" --licenses \ - && /opt/android-sdk/cmdline-tools/tools/bin/sdkmanager --install "ndk;${ANDROID_NDK_VERSION}" \ - && rm -rf /install-android - -WORKDIR / diff --git a/build_tools/docker/manage_images.py b/build_tools/docker/manage_images.py index 9192ae26ce33..23b66fc01b30 100755 --- a/build_tools/docker/manage_images.py +++ b/build_tools/docker/manage_images.py @@ -50,7 +50,6 @@ "nvidia": ["base"], "riscv": ["base"], "riscv-toolchain-builder": [], - "gradle-android": ["base"], "frontends": ["android"], "shark": [], "swiftshader": ["base"], diff --git a/build_tools/docker/prod_digests.txt b/build_tools/docker/prod_digests.txt index e9a09e07be6b..441088d398c9 100644 --- a/build_tools/docker/prod_digests.txt +++ b/build_tools/docker/prod_digests.txt @@ -4,7 +4,6 @@ gcr.io/iree-oss/samples@sha256:1b9b82002b990e3e7f4f3c65c3d5c1e6d5ee27258e6c7ff1b gcr.io/iree-oss/frontends@sha256:b654dffe5b69d35f3182ffe1a41be98e3f32bc7843b6f10829a8eb2aa6a345ee gcr.io/iree-oss/frontends-nvidia@sha256:c3d590c6f1a6369cd34ccf0fc6f9ca2fbf8ee06abdc58a2827fc847718c308b8 gcr.io/iree-oss/frontends-swiftshader@sha256:1d2424dc512545a32b68e3f6b839541832fa24b5fce78cb253b3a4cd4592d9b2 -gcr.io/iree-oss/gradle-android@sha256:cf7bf0392d5125f2babb4b9de4b43b583220506ecebd6b6201b23b2575f671c0 gcr.io/iree-oss/riscv@sha256:61af5fee01800033826d851cbcf946a548c76f09306578f8cedb48438328f464 gcr.io/iree-oss/nvidia@sha256:4bc8f74e6f8dece34184eedfafede9c28ba3af1674e6774f5cd867802beffc9b gcr.io/iree-oss/emscripten@sha256:6e412f7ca51439ffce051a8a2e8fcbd7398743f461930a5f51c089441ffc3588