From 8f796e6ec1f3c83891dabfc57b1f9faa9100cdb0 Mon Sep 17 00:00:00 2001
From: Pan Block <pablo@microsoft.com>
Date: Thu, 28 May 2026 01:48:46 -0700
Subject: [PATCH 1/3] copilot

---
 .github/workflows/build-android.yml | 76 +++++++++++++++++++++++++++--
 1 file changed, 71 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
index 2d50517d8..813248a06 100644
--- a/.github/workflows/build-android.yml
+++ b/.github/workflows/build-android.yml
@@ -17,11 +17,11 @@ on:
     - main
     - dev
 
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 jobs:
   build:
     runs-on: windows-latest
@@ -80,3 +80,69 @@ jobs:
       with:
         name: reports
         path: lib\android_build\maesdk\build\reports
+
+  build-soong:
+    runs-on: ubuntu-latest
+    name: Build via Soong
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        submodules: false
+        path: vendor/microsoft/cpp_client_telemetry
+    - name: Update submodules
+      working-directory: vendor/microsoft/cpp_client_telemetry
+      run: |
+        git submodule sync
+        git config --global submodule.lib/modules.update none
+        git -c protocol.version=2 submodule update --init --force --depth=1
+    - name: Install build prerequisites
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y \
+          bc bison build-essential curl flex git \
+          lib32ncurses5-dev lib32z1-dev libc6-dev-i386 \
+          libncurses5-dev libssl-dev libx11-dev \
+          libxml2-utils unzip zip zlib1g-dev
+    - name: Set up repo tool
+      run: |
+        mkdir -p ~/bin
+        curl -o ~/bin/repo https://storage.googleapis.com/git-repo-downloads/repo
+        chmod a+x ~/bin/repo
+        echo "$HOME/bin" >> $GITHUB_PATH
+    - name: Cache AOSP build tools
+      id: aosp-cache
+      uses: actions/cache@v4
+      with:
+        path: aosp
+        key: aosp-soong-android14-${{ runner.os }}
+    - name: Sync minimal AOSP build tools
+      if: steps.aosp-cache.outputs.cache-hit != 'true'
+      run: |
+        mkdir -p aosp
+        cd aosp
+        repo init \
+          -u https://android.googlesource.com/platform/manifest \
+          -b android-14.0.0_r1 \
+          --depth=1 \
+          --no-tags \
+          --no-clone-bundle
+        repo sync -j$(nproc) --current-branch --no-clone-bundle \
+          build/soong \
+          build/blueprint \
+          build/make \
+          prebuilts/build-tools \
+          prebuilts/go/linux-x86 \
+          prebuilts/clang/host/linux-x86
+    - name: Place vendor module in AOSP tree
+      run: |
+        mkdir -p aosp/vendor/microsoft
+        ln -sfn "$(pwd)/vendor/microsoft/cpp_client_telemetry" \
+          aosp/vendor/microsoft/cpp_client_telemetry
+    - name: Build libmaesdk via Soong
+      run: |
+        cd aosp
+        source build/envsetup.sh
+        lunch aosp_arm64-eng
+        SOONG_ALLOW_MISSING_DEPENDENCIES=true \
+          m libmaesdk -j$(nproc)

From 77df6c2c6b03a805b636fb9ccb42281c2eba2947 Mon Sep 17 00:00:00 2001
From: Pan Block <pablo@microsoft.com>
Date: Thu, 28 May 2026 01:54:47 -0700
Subject: [PATCH 2/3] +

---
 .github/workflows/build-android.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
index 813248a06..114f2ba84 100644
--- a/.github/workflows/build-android.yml
+++ b/.github/workflows/build-android.yml
@@ -101,7 +101,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y \
           bc bison build-essential curl flex git \
-          lib32ncurses5-dev lib32z1-dev libc6-dev-i386 \
+          lib32z1-dev libc6-dev-i386 \
           libncurses5-dev libssl-dev libx11-dev \
           libxml2-utils unzip zip zlib1g-dev
     - name: Set up repo tool

From c6bef60894b705fa960e13fd91c2512b462c314f Mon Sep 17 00:00:00 2001
From: Pan Block <pablo@microsoft.com>
Date: Thu, 28 May 2026 02:04:22 -0700
Subject: [PATCH 3/3] .

---
 .github/workflows/build-android.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
index 114f2ba84..557830d31 100644
--- a/.github/workflows/build-android.yml
+++ b/.github/workflows/build-android.yml
@@ -115,7 +115,7 @@ jobs:
       uses: actions/cache@v4
       with:
         path: aosp
-        key: aosp-soong-android14-${{ runner.os }}
+        key: aosp-soong-android14-bazel-${{ runner.os }}
     - name: Sync minimal AOSP build tools
       if: steps.aosp-cache.outputs.cache-hit != 'true'
       run: |
@@ -131,6 +131,7 @@ jobs:
           build/soong \
           build/blueprint \
           build/make \
+          prebuilts/bazel/common \
           prebuilts/build-tools \
           prebuilts/go/linux-x86 \
           prebuilts/clang/host/linux-x86