Android prefixed build (#17)

davidliu · web-flow · commit f7689c269f45 · 2023-12-19T15:28:07.000-08:00
* android prefixed build * Add to github actions * turn off windows/mac builds for testing * More turn off windows/mac testing * Fix up patches for m114 * Put back windows/mac builds * Revert "Put back windows/mac builds" This reverts commit c3ea942.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,63 +20,63 @@ on:
       - '*'
 
 jobs:
-  build-windows:
-    defaults:
-      run:
-        working-directory: .\\build
-    strategy:
-      fail-fast: false
-      matrix:
-        name:
-          - windows_x86_64
-          - windows_arm64
-    runs-on: windows-2019
-    steps:
-    - uses: actions/checkout@v2
-    - name: Disk Cleanup
-      run: |
-        Get-PSDrive
-        # Cache 済み Docker Image の削除
-        # Clean unused docker images
-        docker rmi $(docker images -q -a)
-        # Android SDK の削除
-        # Delete Android SDK
-        Remove-Item -Recurse -Force $Env:ANDROID_HOME -ErrorAction Ignore
-        Remove-Item -Recurse -Force $Env:ANDROID_NDK_HOME -ErrorAction Ignore
-        # JVM の削除
-        # Delete JVM
-        Remove-Item -Recurse -Force $Env:JAVA_HOME_11_X64 -ErrorAction Ignore
-        Remove-Item -Recurse -Force $Env:JAVA_HOME_8_X64 -ErrorAction Ignore
-        Get-PSDrive
-    - run: "& .\\build.${{ matrix.name }}.ps1 \"${{ github.event.inputs.commitHash }}\""
-    - name: Upload Artifact
-      uses: actions/upload-artifact@v1
-      with:
-        name: webrtc.${{ matrix.name }}.zip
-        path: build\_package\${{ matrix.name }}\webrtc.zip
-  build-macos:
-    defaults:
-      run:
-        working-directory: ./build
-    strategy:
-      fail-fast: false
-      matrix:
-        name:
-          - macos_arm64
-          - macos_x86_64
-          - ios
-    runs-on: macos-11
-    steps:
-    - uses: actions/checkout@v2
-    - name: Select Xcode 13.0
-      run: sudo xcode-select --switch /Applications/Xcode_13.0.app/Contents/Developer
-    - run: brew install ninja
-    - run: ./build.${{ matrix.name }}.sh "${{ github.event.inputs.commitHash }}"
-    - name: Upload Artifact
-      uses: actions/upload-artifact@v1
-      with:
-        name: webrtc.${{ matrix.name }}.tar.gz
-        path: build/_package/${{ matrix.name }}/webrtc.tar.gz
+  # build-windows:
+  #   defaults:
+  #     run:
+  #       working-directory: .\\build
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       name:
+  #         - windows_x86_64
+  #         - windows_arm64
+  #   runs-on: windows-2019
+  #   steps:
+  #   - uses: actions/checkout@v2
+  #   - name: Disk Cleanup
+  #     run: |
+  #       Get-PSDrive
+  #       # Cache 済み Docker Image の削除
+  #       # Clean unused docker images
+  #       docker rmi $(docker images -q -a)
+  #       # Android SDK の削除
+  #       # Delete Android SDK
+  #       Remove-Item -Recurse -Force $Env:ANDROID_HOME -ErrorAction Ignore
+  #       Remove-Item -Recurse -Force $Env:ANDROID_NDK_HOME -ErrorAction Ignore
+  #       # JVM の削除
+  #       # Delete JVM
+  #       Remove-Item -Recurse -Force $Env:JAVA_HOME_11_X64 -ErrorAction Ignore
+  #       Remove-Item -Recurse -Force $Env:JAVA_HOME_8_X64 -ErrorAction Ignore
+  #       Get-PSDrive
+  #   - run: "& .\\build.${{ matrix.name }}.ps1 \"${{ github.event.inputs.commitHash }}\""
+  #   - name: Upload Artifact
+  #     uses: actions/upload-artifact@v1
+  #     with:
+  #       name: webrtc.${{ matrix.name }}.zip
+  #       path: build\_package\${{ matrix.name }}\webrtc.zip
+  # build-macos:
+  #   defaults:
+  #     run:
+  #       working-directory: ./build
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       name:
+  #         - macos_arm64
+  #         - macos_x86_64
+  #         - ios
+  #   runs-on: macos-11
+  #   steps:
+  #   - uses: actions/checkout@v2
+  #   - name: Select Xcode 13.0
+  #     run: sudo xcode-select --switch /Applications/Xcode_13.0.app/Contents/Developer
+  #   - run: brew install ninja
+  #   - run: ./build.${{ matrix.name }}.sh "${{ github.event.inputs.commitHash }}"
+  #   - name: Upload Artifact
+  #     uses: actions/upload-artifact@v1
+  #     with:
+  #       name: webrtc.${{ matrix.name }}.tar.gz
+  #       path: build/_package/${{ matrix.name }}/webrtc.tar.gz
   build-linux:
     defaults:
       run:
@@ -94,6 +94,7 @@ jobs:
           # - ubuntu-20.04_x86_64
           # - ubuntu-22.04_x86_64
           - android
+          - android_prefixed
     runs-on: buildjet-4vcpu-ubuntu-2204
     steps:
     - uses: actions/checkout@v2
@@ -117,8 +118,8 @@ jobs:
     name: Create Release
     if: contains(github.ref, 'tags/m')
     needs:
-      - build-windows
-      - build-macos
+      # - build-windows
+      # - build-macos
       - build-linux
     runs-on: ubuntu-20.04
     steps:
diff --git a/build/VERSION b/build/VERSION
@@ -1,4 +1,4 @@
-WEBRTC_BUILD_VERSION=104.5112.09.0
-WEBRTC_VERSION=104.5112.09
-WEBRTC_READABLE_VERSION=M104.5112@{#9}
-WEBRTC_COMMIT=beb04712c467fb36b48a682ce3afc304920bd062
+WEBRTC_BUILD_VERSION=114.5735.06.0
+WEBRTC_VERSION=114.5735.06
+WEBRTC_READABLE_VERSION=M114.5735@{#6}
+WEBRTC_COMMIT=d5afc4b7be7caffbcc213c2a6486dbf3b9492763
diff --git a/build/android_prefixed/Dockerfile b/build/android_prefixed/Dockerfile
@@ -0,0 +1,25 @@
+# syntax = docker/dockerfile:experimental
+FROM ubuntu:20.04 AS builder
+
+ARG PACKAGE_NAME=android_prefixed
+ARG COMMIT_HASH=""
+
+ENV PACKAGE_DIR "/root/_package/$PACKAGE_NAME"
+
+COPY run.py /root/
+COPY VERSION /root/
+COPY .gclient /root/
+COPY patches/ /root/patches/
+COPY scripts/ /root/scripts/
+COPY $PACKAGE_NAME/ /root/$PACKAGE_NAME/
+RUN /root/scripts/apt_install_x86_64.sh \
+  && sudo apt-get install -y openjdk-11-jdk \
+  && sudo apt-get install -y build-essential
+ENV LC_ALL=C.UTF-8
+RUN cd /root && python3 run.py build $PACKAGE_NAME --commit "${COMMIT_HASH}"
+RUN cd /root && python3 run.py package $PACKAGE_NAME
+RUN mv $PACKAGE_DIR/webrtc.tar.gz /
+
+FROM ubuntu:20.04
+
+COPY --from=builder /webrtc.tar.gz /
diff --git a/build/build.android_prefixed.sh b/build/build.android_prefixed.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+cd `dirname $0`
+source VERSION
+SCRIPT_DIR="`pwd`"
+
+PACKAGE_NAME=android_prefixed
+PACKAGE_DIR="`pwd`/_package/$PACKAGE_NAME"
+
+set -ex
+
+IMAGE_NAME=webrtc/$PACKAGE_NAME:m${WEBRTC_VERSION}
+DOCKER_BUILDKIT=1 docker build \
+  -t $IMAGE_NAME \
+  -f $PACKAGE_NAME/Dockerfile \
+  --build-arg COMMIT_HASH="$1" \
+  .
+
+mkdir -p $PACKAGE_DIR
+CONTAINER_ID=`docker container create $IMAGE_NAME`
+docker container cp $CONTAINER_ID:/webrtc.tar.gz $PACKAGE_DIR/webrtc.tar.gz
+docker container rm $CONTAINER_ID
diff --git a/build/patches/add_license_dav1d.patch b/build/patches/add_license_dav1d.patch
@@ -1,17 +1,17 @@
 diff --git a/tools_webrtc/libs/generate_licenses.py b/tools_webrtc/libs/generate_licenses.py
-index 86b4cd01f0..cf927670ee 100755
+index d945b43cca..f09ed3702b 100755
 --- a/tools_webrtc/libs/generate_licenses.py
 +++ b/tools_webrtc/libs/generate_licenses.py
-@@ -91,6 +91,12 @@ LIB_TO_LICENSES_DICT = {
-     'yasm': [],
+@@ -86,6 +86,11 @@ LIB_TO_LICENSES_DICT = {
+     # Compile time dependencies, no license needed:
      'ow2_asm': [],
      'jdk': [],
 +
-+    'dav1d': ['third_party/dav1d/LICENSE'],
 +    'catapult': [],
 +    'google_benchmark': [],
 +    'googletest': [],
 +    'vinn': [],
  }
  
  # Third_party library _regex_ to licences mapping. Keys are regular expression
+ 
diff --git a/build/patches/fix_mocks.patch b/build/patches/fix_mocks.patch
@@ -11,15 +11,15 @@ index 8483aa3da8..f66cdca0ba 100644
  }  // namespace test
  }  // namespace webrtc
 diff --git a/pc/test/fake_audio_capture_module.h b/pc/test/fake_audio_capture_module.h
-index fd13a85f89..81bdbf9f8c 100644
+index c04373cdfd..ab6ff3492a 100644
 --- a/pc/test/fake_audio_capture_module.h
 +++ b/pc/test/fake_audio_capture_module.h
-@@ -140,6 +140,8 @@ class FakeAudioCaptureModule : public webrtc::AudioDeviceModule,
-   int32_t EnableBuiltInNS(bool enable) override { return -1; }
+@@ -137,6 +137,8 @@ class FakeAudioCaptureModule : public webrtc::AudioDeviceModule {
  
    int32_t GetPlayoutUnderrunCount() const override { return -1; }
-+
+ 
 +  int32_t SetAudioDeviceSink(webrtc::AudioDeviceSink* sink) const override { return 0; }
- #if defined(WEBRTC_IOS)
-   int GetPlayoutAudioParameters(
-       webrtc::AudioParameters* params) const override {
++
+   absl::optional<webrtc::AudioDeviceModule::Stats> GetStats() const override {
+     return webrtc::AudioDeviceModule::Stats();
+   }
diff --git a/build/patches/jni_prefix.patch b/build/patches/jni_prefix.patch
diff --git a/build/run.py b/build/run.py
