update to back

.github/workflows/onyx_b2g_build.yml

@@ -40,7 +40,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
       with:
-        ref: onyx-b2g-build
+        ref: onyx_b2g-build
 
     - name: Clean system environment
       continue-on-error: true
@@ -83,7 +83,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
       with:
-        ref: onyx-b2g-build
+        ref: onyx_b2g-build
 
     - name: Initialization system environment
       run: |
@@ -158,18 +158,23 @@ jobs:
       id: sysroot
       if: github.event.action == 'b2g_aosp_build' && steps.check.conclusion == 'success' &&  steps.build.outcome == 'success' && steps.build.conclusion == 'success'
       run: |
+        pip3 install zstandard
+        pip install zstandard
+
+        if [ -s ${work}/B2G/create-b2g-sysroot.sh ]; then
+            echo clear api_sysroot.sh　and create-b2g-sysroot.sh
+            rm ${work}/B2G/create-b2g-sysroot.sh
+            rm ${work}/B2G/api_sysroot.sh
+        fi
+        echo ##############################################
+        cat ./b2g/build/create-b2g-sysroot.sh
+        echo ##############################################
         chmod +x ./b2g/build/create-b2g-sysroot.sh
         chmod +x ./b2g/build/api_sysroot.sh
         cp ./b2g/build/create-b2g-sysroot.sh ${work}/B2G
         cp ./b2g/build/api_sysroot.sh ${work}/B2G
-        pip3 install zstandard
-        pip install zstandard
-
-        echo repack_b2g-sysroot
         ./b2g/build/repack_b2g-sysroot.sh
-        echo repack_api-sysroot
         ./b2g/build/repack_api-sysroot.sh
-        echo Upload b2g-sysroot and api-sysroot
         ./b2g/source/upload_sysroot.sh
 
     - name: Updoal systemimage
@@ -212,7 +217,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
       with:
-        ref: onyx-b2g-build
+        ref: onyx_b2g-build
 
     - name: Initialization system environment
       run: |
@@ -239,7 +244,8 @@ jobs:
         cd ~
         #git clone https://github.com/kaiostech/gecko-b2g -b gonk --depth=1
         #for onyx
-        git clone https://github.com/ittat-store/gecko-b2g -b gonk --depth=1
+        git clone https://github.com/OnePlus-onyx/gecko-b2g-onyx -b onyx --depth=1
+        mv gecko-b2g-onyx gecko-b2g
         df -h
 
     - name: Bootstrap Gecko
@@ -249,7 +255,7 @@ jobs:
         export SHELL=/bin/bash
         sudo apt update
         export LOCAL_NDK_BASE_URL='ftp://ftp.kaiostech.com/ndk/android-ndk'
-        ./mach bootstrap --no-interactive --application-choice 'GeckoView/Firefox for Android'
+        ./mach bootstrap --application-choice 'GeckoView/Firefox for Android'
         df -h
 
     - name: Build Gecko
@@ -298,7 +304,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
       with:
-        ref: onyx-b2g-build
+        ref: onyx_b2g-build
 
     - name: Initialization system environment
       run: |

b2g/build/build_gecko.sh

@@ -11,7 +11,7 @@ set -e
         export SHELL=/bin/bash
         sudo apt update
         export LOCAL_NDK_BASE_URL='ftp://ftp.kaiostech.com/ndk/android-ndk'
-        ./mach bootstrap --no-interactive --application-choice 'GeckoView/Firefox for Android'
+        ./mach bootstrap --application-choice 'GeckoView/Firefox for Android'
         df -h
 
         df -h

b2g/build/create-b2g-sysroot.sh

@@ -112,6 +112,7 @@ out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libhwbinder.so
 out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libmedia_omx.so
 out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libmedia.so
 out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libmtp.so
+out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libnetdbpf.so
 out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libstagefright_foundation.so
 out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libstagefright_omx.so
 out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/libstagefright.so
@@ -152,6 +153,7 @@ hardware/interfaces/graphics/composer/2.2/utils/command-buffer/include
 hardware/interfaces/graphics/composer/2.3/utils/command-buffer/include
 hardware/libhardware/include
 hardware/libhardware_legacy/include
+system/bpf/libbpf_android/include
 system/connectivity
 system/core/base/include
 system/core/libcutils/include
@@ -167,7 +169,9 @@ system/libhidl/base/include
 system/libhidl/transport/include
 system/libhidl/transport/token/1.0/utils/include
 system/media/audio/include
-system/media/camera/include"
+system/media/camera/include
+system/netd/libnetdbpf/include
+system/netd/libnetdutils/include"
 
 copy_to_sysroot "${INCLUDE_FOLDERS}" "include"
 

b2g/source/repo_source.sh

@@ -6,5 +6,5 @@ set -e
         cd ./B2G
         echo Download ...
         #TODO
-        GITREPO=https://github.com/b2g-gsi/manifests BRANCH=full-gsi-onyx  REPO_INIT_FLAGS="--depth=1" REPO_SYNC_FLAGS=" -j128 --force-sync --current-branch --no-tags --no-clone-bundle --optimized-fetch --prune" ./config.sh ${device_name}\
+        GITREPO=https://github.com/b2g-gsi/manifests BRANCH=full-gsi-onyx  REPO_INIT_FLAGS="--depth=1" REPO_SYNC_FLAGS=" -j128 --force-sync --current-branch --no-tags --no-clone-bundle --optimized-fetch --prune" ./config.sh ${device_name}
         df -h