diff --git a/.github/workflows/vvl.yml b/.github/workflows/vvl.yml index faaf9f77fb2..e74fca36a60 100644 --- a/.github/workflows/vvl.yml +++ b/.github/workflows/vvl.yml @@ -212,16 +212,6 @@ jobs: working-directory: ./build run: ctest --output-on-failure -C Debug - android_mk: - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: '3.10' - - name: Build - run: python3 scripts/github_ci_android.py --abi arm64-v8a - macos: runs-on: macos-latest strategy: diff --git a/scripts/github_ci_android.py b/scripts/github_ci_android.py deleted file mode 100644 index 4433ab4945f..00000000000 --- a/scripts/github_ci_android.py +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env python3 -# Copyright (c) 2020-2023 Valve Corporation -# Copyright (c) 2020-2023 LunarG, Inc. - -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import os -import argparse -import subprocess -import sys -import common_ci - -SUPPORTED_ABIS = [ 'arm64-v8a', 'armeabi-v7a'] -DEFAULT_ABI = SUPPORTED_ABIS[0] - -# -# Fetch Android components, build Android VVL -def BuildAndroid(target_abi): - # GitHub actions already comes with NDK pre-installed. We should avoid downloading unless we have to. - # https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md#environment-variables-2 - if "ANDROID_NDK_HOME" not in os.environ: - print("Fetching NDK\n") - wget_cmd = 'wget http://dl.google.com/android/repository/android-ndk-r21d-linux-x86_64.zip' - common_ci.RunShellCmd(wget_cmd) - - print("Extracting NDK components\n") - unzip_cmd = 'unzip -u -q android-ndk-r21d-linux-x86_64.zip' - common_ci.RunShellCmd(unzip_cmd) - - os.environ['ANDROID_NDK_HOME'] = common_ci.RepoRelative('android-ndk-r21d') - - os.environ['PATH'] = os.environ.get('ANDROID_NDK_HOME') + os.pathsep + os.environ.get('PATH') - - print("Preparing Android Dependencies\n") - update_sources_cmd = './update_external_sources_android.sh --abi %s --no-build' % target_abi - common_ci.RunShellCmd(update_sources_cmd, "build-android") - - print("Building Android Layers and Tests\n") - ndk_build_cmd = 'ndk-build APP_ABI=%s -j%s' % (target_abi, os.cpu_count()) - common_ci.RunShellCmd(ndk_build_cmd, "build-android") - -# -# Module Entrypoint -def main(): - parser = argparse.ArgumentParser() - parser.add_argument( - '-a', '--abi', dest='target_abi', - metavar='ABI', action='store', - choices=SUPPORTED_ABIS, default=DEFAULT_ABI, - help='Build target ABI. Can be one of: {0}'.format( - ', '.join(SUPPORTED_ABIS))) - args = parser.parse_args() - - try: - BuildAndroid(args.target_abi) - - except subprocess.CalledProcessError as proc_error: - print('Command "%s" failed with return code %s' % (' '.join(proc_error.cmd), proc_error.returncode)) - sys.exit(proc_error.returncode) - except Exception as unknown_error: - print('An unkown error occured: %s', unknown_error) - sys.exit(1) - - sys.exit(0) - -if __name__ == '__main__': - main()