setup android ci

.github/actions/build/action.yml

@@ -24,6 +24,14 @@ inputs:
       - true
       - false
 
+  build_android_controller:
+    description: "Build Android Controller"
+    type: choice
+    default: "false"
+    options:
+      - true
+      - false
+
 runs:
   using: "composite"
   steps:
@@ -40,6 +48,15 @@ runs:
       shell: bash
       if: runner.os == 'macOS' || runner.os == 'Linux'
 
+    # Android
+    - name: Build Android
+      working-directory: ${{ inputs.working_directory }}
+      run: |
+        cd test/android/controller
+        ./gradlew build
+      shell: bash
+      if: inputs.build_android_controller == 'true'
+
     # Windows
     - name: Build C++ and Python
       run: |

.github/actions/setup-dependencies/action.yml

@@ -112,6 +112,51 @@ runs:
       uses: ./.github/actions/setup-matlab
       if: inputs.use_matlab == 'true'
 
+    #
+    # Android
+    # See https://developer.android.com/studio#command-tools for the latest version
+    #
+
+    # See https://github.com/marketplace/actions/android-emulator-runner
+    - name: Enable KVM group perms
+      shell: bash
+      run: |
+        echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+        sudo udevadm control --reload-rules
+        sudo udevadm trigger --name-match=kvm
+      if: matrix.config == 'android'
+
+    - name: Install Android SDK
+      shell: bash
+      run: |
+        wget https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -O /tmp/android-sdk.zip
+        mkdir -p /opt/android-sdk/cmdline-tools
+        unzip -q /tmp/android-sdk.zip -d /opt/android-sdk/cmdline-tools
+        rm /tmp/android-sdk.zip
+        mv /opt/android-sdk/cmdline-tools/cmdline-tools /opt/android-sdk/cmdline-tools/latest
+        export ANDROID_HOME=/opt/android-sdk/
+        echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV
+        echo "ANDROID_SDK_ROOT=$ANDROID_HOME" >> $GITHUB_ENV
+        echo "$ANDROID_HOME/cmdline-tools/latest/bin" >> $GITHUB_PATH
+        echo "$ANDROID_HOME/emulator" >> $GITHUB_PATH
+        echo "$ANDROID_HOME/platform-tools" >> $GITHUB_PATH
+
+        # For some reason avdmanager is placing the avd into $HOME/.config/.android/avd instead of $HOME/.android/avd
+        echo "ANDROID_AVD_HOME=$HOME/.config/.android" >> $GITHUB_ENV
+      if: matrix.config == 'android'
+
+    - name: Configure Android SDK
+      shell: bash
+      run: |
+        bash -c 'yes 2>/dev/null | sdkmanager --licenses'
+        sdkmanager "platform-tools" "build-tools;33.0.2" "platforms;android-33"
+        # sdkmanager "extras;intel;Hardware_Accelerated_Execution_Manager"
+        sdkmanager "system-images;android-33;google_apis;x86_64"
+        sdkmanager emulator
+        sdkmanager --update
+
+      if: matrix.config == 'android'
+
     #
     # Cache
     #

.github/workflows/ci.yml

@@ -20,53 +20,53 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # Release builds
-          - os: macos-15
-            config: "release"
-          - os: ubuntu-24.04
-            config: "release"
-          - os: windows-2022
-            config: "release"
-            build_flags: "/p:Platform=x64"
-            test_flags: "--platform=x64"
-          - os: windows-2022
-            config: "cpp-win32-release"
-            working_directory: "cpp"
-            build_flags: "/p:Platform=Win32"
-            msbuild_project: "msbuild/ice.proj"
-            test_flags: "--platform=Win32"
-
-          # Debug builds
-          - os: macos-15
-            config: "debug"
-            build_flags: "OPTIMIZE=no"
-            test_flags: "--swift-config=debug"
-          - os: ubuntu-24.04
-            config: "debug"
-            build_flags: "OPTIMIZE=no"
-          # TODO - figure out how to properly install debug Python
-          - os: windows-2022
-            config: "debug"
-            working_directory: "cpp"
-            build_flags: "/p:Platform=x64 /p:Configuration=Debug"
-            test_flags: "--platform=x64 --config=Debug"
-            msbuild_project: "msbuild/ice.proj"
-
-          # Swift iOS
-          - os: macos-15
-            config: "swift-ios"
-            working_directory: "swift"
-            build_flags: "PLATFORMS='macosx iphonesimulator'"
-            test_flags: "--platform=iphonesimulator --controller-app --rfilter=Ice/operations" # Remove rfilter once #3286 is fixed
-            build_cpp_and_python: true
-
-          # Static builds
-          - os: ubuntu-24.04
-            config: "static"
-            build_flags: "CONFIGS=static"
-            test_flags: "--config=static --filter=Ice/ --filter=IceDiscovery/"
-            working_directory: "cpp"
-
+          # # Release builds
+          # - os: macos-15
+          #   config: "release"
+          # - os: ubuntu-24.04
+          #   config: "release"
+          # - os: windows-2022
+          #   config: "release"
+          #   build_flags: "/p:Platform=x64"
+          #   test_flags: "--platform=x64"
+          # - os: windows-2022
+          #   config: "cpp-win32-release"
+          #   working_directory: "cpp"
+          #   build_flags: "/p:Platform=Win32"
+          #   msbuild_project: "msbuild/ice.proj"
+          #   test_flags: "--platform=Win32"
+
+          # # Debug builds
+          # - os: macos-15
+          #   config: "debug"
+          #   build_flags: "OPTIMIZE=no"
+          #   test_flags: "--swift-config=debug"
+          # - os: ubuntu-24.04
+          #   config: "debug"
+          #   build_flags: "OPTIMIZE=no"
+          # # TODO - figure out how to properly install debug Python
+          # - os: windows-2022
+          #   config: "debug"
+          #   working_directory: "cpp"
+          #   build_flags: "/p:Platform=x64 /p:Configuration=Debug"
+          #   test_flags: "--platform=x64 --config=Debug"
+          #   msbuild_project: "msbuild/ice.proj"
+
+          # # Swift iOS
+          # - os: macos-15
+          #   config: "swift-ios"
+          #   working_directory: "swift"
+          #   build_flags: "PLATFORMS='macosx iphonesimulator'"
+          #   test_flags: "--platform=iphonesimulator --controller-app --rfilter=Ice/operations" # Remove rfilter once #3286 is fixed
+          #   build_cpp_and_python: true
+
+          # # Static builds
+          # - os: ubuntu-24.04
+          #   config: "static"
+          #   build_flags: "CONFIGS=static"
+          #   test_flags: "--config=static --filter=Ice/ --filter=IceDiscovery/"
+          #   working_directory: "cpp"
+          #
           # # Xcode SDK builds
           #  # TODO - Should we also test the debug config here as well?
           #  - macos-15
@@ -75,28 +75,23 @@ jobs:
           #    build_flags: "CONFIGS=xcodesdk PLATFORMS=iphonesimulator"
           #    test_flags: "--config=xcodesdk --platform=iphonesimulator --controller-app"
           #    build_cpp_and_python: true
-
-          # MATLAB
+          #
+          # # Cross tests
+          # - os: ubuntu-24.04
+          #   config: "cross"
+          #   test_flags: "--all-cross"
+          # - os: macos-15
+          #   config: "cross"
+          #   # We want to test C++ and Swift only (in each direction)
+          #   test_flags: "--all-cross --filter cpp --filter swift"
+
+          # Android
           - os: ubuntu-24.04
-            config: "matlab"
-            working_directory: "matlab"
-            build_cpp_and_python: true
-          - os: windows-2022
-            config: "matlab"
-            working_directory: "matlab"
-            build_flags: "/p:Platform=x64"
-            msbuild_project: "msbuild/ice.proj"
-            test_flags: "--platform=x64"
+            config: "android"
+            working_directory: "java"
+            test_flags: "--android --controller-app"
             build_cpp_and_python: true
-
-          # Cross tests
-          - os: ubuntu-24.04
-            config: "cross"
-            test_flags: "--all-cross"
-          - os: macos-15
-            config: "cross"
-            # We want to test C++ and Swift only (in each direction)
-            test_flags: "--all-cross --filter cpp --filter swift"
+            build_android_controller: true
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -123,6 +118,7 @@ jobs:
         with:
           working_directory: ${{ matrix.working_directory || '.' }}
           build_cpp_and_python: ${{ matrix.build_cpp_and_python || false }}
+          build_android_controller: ${{ matrix.build_android_controller || false }}
           build_flags: ${{ matrix.build_flags || '' }}
           msbuild_project: ${{ matrix.msbuild_project || 'ice.proj' }}
 

java/BUILDING.md

@@ -3,20 +3,24 @@
 This page describes how to build and install Ice for Java from source. If
 you prefer, you can also download a [binary distribution].
 
-* [Build Requirements](#build-requirements)
-  * [Operating Systems](#operating-systems)
-  * [Slice to Java Compiler](#slice-to-java-compiler)
-  * [JDK Version](#jdk-version)
-  * [Gradle](#gradle)
-  * [Bzip2 Compression](#bzip2-compression)
-  * [JGoodies](#jgoodies)
-  * [ProGuard](#proguard)
-  * [Java Application Bundler](#java-application-bundler)
-* [Building Ice for Java](#building-ice-for-java)
-* [Installing Ice for Java](#installing-ice-for-java)
-* [Running the Java Tests](#running-the-java-tests)
-* [Building the Ice for Android Tests](#building-the-ice-for-android-tests)
-* [IceGrid GUI Tool](#icegrid-gui-tool)
+- [Ice for Java build instructions](#ice-for-java-build-instructions)
+  - [Build Requirements](#build-requirements)
+    - [Operating Systems](#operating-systems)
+    - [Slice to Java Compiler](#slice-to-java-compiler)
+    - [JDK Version](#jdk-version)
+    - [Gradle](#gradle)
+    - [Bzip2 Compression](#bzip2-compression)
+    - [JGoodies](#jgoodies)
+    - [ProGuard](#proguard)
+    - [Java Application Bundler](#java-application-bundler)
+  - [Building Ice for Java](#building-ice-for-java)
+  - [Installing Ice for Java](#installing-ice-for-java)
+  - [Running the Java Tests](#running-the-java-tests)
+  - [Building the Ice for Android Tests](#building-the-ice-for-android-tests)
+    - [Android Build Requirements](#android-build-requirements)
+    - [Building the Android Test Controller](#building-the-android-test-controller)
+    - [Running the Android Test Suite](#running-the-android-test-suite)
+  - [IceGrid GUI Tool](#icegrid-gui-tool)
 
 ## Build Requirements
 
@@ -210,7 +214,7 @@ python allTests.py
 
 If everything worked out, you should see lots of `ok` messages. In case of a
 failure, the tests abort with `failed`.
-
+****
 ## Building the Ice for Android Tests
 
 The `test/android/controller` directory contains an Android Studio project for

java/test/android/controller/gradle.properties

@@ -1,7 +1,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 
 # Version used in JAR files
-iceVersion = 3.8.0-alpha0
+iceVersion = 3.8.0-alpha.0
 
 # Set iceHome to location of Ice installation if Ice was installed in a
 # non-standard location. You must use forward slashes in the path, even on

java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java

@@ -282,21 +282,22 @@ public ControllerHelperI(TestSuiteBundle bundle, String[] args) {
         }
 
         public void communicatorInitialized(Communicator communicator) {
-            com.zeroc.Ice.Properties properties = communicator.getProperties();
-            if (properties
-                    .getIceProperty("Ice.Plugin.IceSSL")
-                    .equals("com.zeroc.IceSSL.PluginFactory")) {
-                com.zeroc.Ice.SSL.Plugin plugin =
-                        (com.zeroc.Ice.SSL.Plugin)
-                                communicator.getPluginManager().getPlugin("IceSSL");
-                String keystore = communicator.getProperties().getIceProperty("IceSSL.Keystore");
-                properties.setProperty("IceSSL.Keystore", "");
-                int resource = keystore.equals("client.bks") ? R.raw.client : R.raw.server;
-                java.io.InputStream certs = getResources().openRawResource(resource);
-                plugin.setKeystoreStream(certs);
-                plugin.setTruststoreStream(certs);
-                communicator.getPluginManager().initializePlugins();
-            }
+            // TODO: fix this to use native Java API
+            // com.zeroc.Ice.Properties properties = communicator.getProperties();
+            // if (properties
+            //         .getIceProperty("Ice.Plugin.IceSSL")
+            //         .equals("com.zeroc.IceSSL.PluginFactory")) {
+            //     com.zeroc.Ice.SSL.Plugin plugin =
+            //             (com.zeroc.Ice.SSL.Plugin)
+            //                     communicator.getPluginManager().getPlugin("IceSSL");
+            //     String keystore = communicator.getProperties().getIceProperty("IceSSL.Keystore");
+            //     properties.setProperty("IceSSL.Keystore", "");
+            //     int resource = keystore.equals("client.bks") ? R.raw.client : R.raw.server;
+            //     java.io.InputStream certs = getResources().openRawResource(resource);
+            //     plugin.setKeystoreStream(certs);
+            //     plugin.setTruststoreStream(certs);
+            //     communicator.getPluginManager().initializePlugins();
+            // }
         }
 
         public void run() {

scripts/Util.py

@@ -2731,6 +2731,7 @@ def startEmulator(self, avd):
         #
         print("starting the emulator... ")
         out = run("emulator -list-avds")
+        print(out)
         if avd not in out:
             raise RuntimeError("couldn't find AVD `{}'".format(avd))
 
@@ -2749,7 +2750,7 @@ def startEmulator(self, avd):
             )
 
         self.device = "emulator-{}".format(port)
-        cmd = "emulator -avd {0} -port {1} -no-audio -partition-size 768 -no-snapshot -gpu auto -no-boot-anim -no-window".format(
+        cmd = "emulator -avd {0} -port {1} -no-audio -partition-size 768 -no-snapshot -gpu auto -accel on -no-boot-anim -no-window".format(
             avd, port
         )
         self.emulator = subprocess.Popen(cmd, shell=True)

swift/test-report.xml

@@ -0,0 +1,3 @@
+<?xml version="1.1" encoding="UTF-8"?>
+<testsuites tests="0" failures="9.5367431640625e-07" time="0.000000000">
+</testsuites>