From 6b13430074159fffe4b359808f28312b8a428ae4 Mon Sep 17 00:00:00 2001 From: ittat Date: Mon, 22 Feb 2021 10:01:55 +0800 Subject: [PATCH 01/21] Update template_b2g_build.yml --- .github/workflows/template_b2g_build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/template_b2g_build.yml b/.github/workflows/template_b2g_build.yml index bf621d1..088fe5b 100644 --- a/.github/workflows/template_b2g_build.yml +++ b/.github/workflows/template_b2g_build.yml @@ -329,6 +329,9 @@ jobs: export GONK_DIR=~/.mozbuild/api-sysroot export GONK_PRODUCT=${device_name} cd ~/api-daemon + ### temp + mkdir -p ./target/aarch64-linux-android/release/symbols + ### ./update-prebuilts.sh - name: zip Artifact From 8cbebf349f3cbb3db89fbe7527c3f810aff1c286 Mon Sep 17 00:00:00 2001 From: ittat Date: Tue, 23 Feb 2021 09:08:29 +0800 Subject: [PATCH 02/21] Update build_with_gecko.sh --- b2g/build/build_with_gecko.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/b2g/build/build_with_gecko.sh b/b2g/build/build_with_gecko.sh index 58fb93e..13f60d0 100755 --- a/b2g/build/build_with_gecko.sh +++ b/b2g/build/build_with_gecko.sh @@ -18,6 +18,9 @@ set -e export USE_PREBUILT_B2G=1 #export OUT_DIR_COMMON_BASE=${out_work} export PREFERRED_B2G="${work}/pre-gecko/${gecko_version}" - export SKIP_ABI_CHECKS=true - gtimeout 245m ./build-gsi.sh ${build_device_tag} systemimage + + #export SKIP_ABI_CHECKS=true + #TODO fix ABI issue + + gtimeout 245m ./build-gsi.sh ${build_device_tag} systemimage SKIP_ABI_CHECKS=false ./build-gsi.sh ${build_device_tag} vndk-test-sepolicy From a2e567af4c27c1251b23af1e816472a580da713c Mon Sep 17 00:00:00 2001 From: ittat Date: Tue, 23 Feb 2021 11:41:29 +0800 Subject: [PATCH 03/21] Update template_b2g_config.yml --- .github/workflows/template_b2g_config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/template_b2g_config.yml b/.github/workflows/template_b2g_config.yml index 6de35ce..61cf71d 100644 --- a/.github/workflows/template_b2g_config.yml +++ b/.github/workflows/template_b2g_config.yml @@ -22,6 +22,8 @@ env: b2g_branch: "b2g-gsi" build_device_tag: gsi_arm64_ab device_arch: aarch64-linux-android + #TODO + gecko_version: b2g-87.0a1.en-US.linux-android-aarch64.tar.bz2 #onyx #phhgsi_arm64_a #phhgsi_arm64_ab @@ -38,5 +40,5 @@ jobs: - name: Action run: | - ./b2g/init/webhook.sh b2g_repack + ./b2g/init/webhook.sh b2g_b2g_build #b2g_repack b2g_aosp_build b2g_gecko_build b2g_api_daemon_build From a02105ede17ad2e1951dd93c01d429be2f679e72 Mon Sep 17 00:00:00 2001 From: ittat Date: Tue, 23 Feb 2021 11:45:17 +0800 Subject: [PATCH 04/21] Update template_b2g_build.yml --- .github/workflows/template_b2g_build.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/template_b2g_build.yml b/.github/workflows/template_b2g_build.yml index 088fe5b..abe672c 100644 --- a/.github/workflows/template_b2g_build.yml +++ b/.github/workflows/template_b2g_build.yml @@ -134,6 +134,8 @@ jobs: - name: B2G Build - Build Source include Gecko + #TODO + continue-on-error: true if: github.event.action == 'b2g_b2g_build' run: | df -h @@ -141,7 +143,19 @@ jobs: #### build ./b2g/build/build_with_gecko.sh - + + - name: TODO + if: github.event.action == 'b2g_b2g_build' + run: | + cd ${work} + echo 1 + cat out/soong/.intermediates/system/libhidl/libhidlbase/android_arm64_armv8-a_vendor_shared/libhidlbase.so.abidiff + echo new + cat out/soong/.intermediates/system/libhidl/libhidlbase/android_arm64_armv8-a_vendor_shared/libhidlbase.so.lsdump + echo old + cat prebuilts/abi-dumps/vndk/29/64/arm64_armv8-a/source-based/libhidlbase.so.lsdump + exit 1 + - name: Check Current ”error.log“ Status id: check run: | From 0cc7a89d74e3ca66ea6e887d9dc9f90fbf8adc94 Mon Sep 17 00:00:00 2001 From: ittat Date: Tue, 23 Feb 2021 14:40:31 +0800 Subject: [PATCH 05/21] Update template_b2g_build.yml --- .github/workflows/template_b2g_build.yml | 62 ++++++++++++++++++++---- 1 file changed, 53 insertions(+), 9 deletions(-) diff --git a/.github/workflows/template_b2g_build.yml b/.github/workflows/template_b2g_build.yml index abe672c..69cc188 100644 --- a/.github/workflows/template_b2g_build.yml +++ b/.github/workflows/template_b2g_build.yml @@ -112,15 +112,15 @@ jobs: - name: Check The Previous “error.log” run: | - if [ -d "${work}/out/error.log" ];then + if [ -d "${work}/B2G/out/error.log" ];then ls ${work}/out fi - if [ -d "${work}/out/error.log" ];then - ls -al ${work}/out/error* + if [ -d "${work}/B2G/out/error.log" ];then + ls -al ${work}/B2G/out/error* echo "old error.log:" - cat ${work}/out/error.log - sudo rm ${work}/out/error.log - touch ${work}/out/error.log + cat ${work}/B2G/out/error.log + sudo rm ${work}/B2G/out/error.log + touch ${work}/B2G/out/error.log fi - name: Build Source Without Gecko @@ -147,15 +147,59 @@ jobs: - name: TODO if: github.event.action == 'b2g_b2g_build' run: | - cd ${work} + cd ${work}/B2G echo 1 cat out/soong/.intermediates/system/libhidl/libhidlbase/android_arm64_armv8-a_vendor_shared/libhidlbase.so.abidiff echo new cat out/soong/.intermediates/system/libhidl/libhidlbase/android_arm64_armv8-a_vendor_shared/libhidlbase.so.lsdump echo old cat prebuilts/abi-dumps/vndk/29/64/arm64_armv8-a/source-based/libhidlbase.so.lsdump - exit 1 - + + - name: TODO + if: github.event.action == 'b2g_b2g_build' + run: | + # Install tmate on macOS or Ubuntu + echo Setting up tmate... + if [ -x "$(command -v brew)" ]; then + brew install tmate > /tmp/brew.log + fi + if [ -x "$(command -v apt-get)" ]; then + curl -fsSL git.io/tmate.sh | bash + fi + [ -e ~/.ssh/id_rsa ] || ssh-keygen -t rsa -f ~/.ssh/id_rsa -q -N "" + echo Running tmate... + tmate -S /tmp/tmate.sock new-session -d + tmate -S /tmp/tmate.sock wait tmate-ready + # Print connection info + DISPLAY=1 + while [ $DISPLAY -le 30 ]; do + echo ________________________________________________________________________________ + echo To connect to this session copy-n-paste the following into a terminal or browser: + tmate -S /tmp/tmate.sock display -p '#{tmate_ssh}' + tmate -S /tmp/tmate.sock display -p '#{tmate_web}' + [ ! -f /tmp/keepalive ] && echo -e "After connecting you can run 'touch /tmp/keepalive' to disable the 30m timeout" + DISPLAY=$(($DISPLAY+1)) + sleep 30 + done + if [[ ! -z "$SLACK_WEBHOOK_URL" ]]; then + MSG=$(tmate -S /tmp/tmate.sock display -p '#{tmate_ssh}') + curl -X POST -H 'Content-type: application/json' --data "{\"text\":\"\`$MSG\`\"}" $SLACK_WEBHOOK_URL + fi + # Wait for connection to close or timeout in 15 min + timeout=$((30*60)) + while [ -S /tmp/tmate.sock ]; do + sleep 1 + timeout=$(($timeout-1)) + if [ ! -f /tmp/keepalive ]; then + if (( timeout < 0 )); then + echo Waiting on tmate connection timed out! + sudo init 0 + exit 0 + fi + fi + done + + - name: Check Current ”error.log“ Status id: check run: | From fd5043a2d950a28082b33565a4a7caba3beabc6b Mon Sep 17 00:00:00 2001 From: ittat Date: Tue, 23 Feb 2021 17:09:10 +0800 Subject: [PATCH 06/21] Update template_b2g_build.yml --- .github/workflows/template_b2g_build.yml | 51 ++---------------------- 1 file changed, 3 insertions(+), 48 deletions(-) diff --git a/.github/workflows/template_b2g_build.yml b/.github/workflows/template_b2g_build.yml index 69cc188..a4e7720 100644 --- a/.github/workflows/template_b2g_build.yml +++ b/.github/workflows/template_b2g_build.yml @@ -148,57 +148,12 @@ jobs: if: github.event.action == 'b2g_b2g_build' run: | cd ${work}/B2G - echo 1 - cat out/soong/.intermediates/system/libhidl/libhidlbase/android_arm64_armv8-a_vendor_shared/libhidlbase.so.abidiff - echo new - cat out/soong/.intermediates/system/libhidl/libhidlbase/android_arm64_armv8-a_vendor_shared/libhidlbase.so.lsdump - echo old - cat prebuilts/abi-dumps/vndk/29/64/arm64_armv8-a/source-based/libhidlbase.so.lsdump - + ./development/vndk/tools/header-checker/utils/create_reference_dumps.py -l libhidlbase -product ${device_name} - name: TODO if: github.event.action == 'b2g_b2g_build' run: | - # Install tmate on macOS or Ubuntu - echo Setting up tmate... - if [ -x "$(command -v brew)" ]; then - brew install tmate > /tmp/brew.log - fi - if [ -x "$(command -v apt-get)" ]; then - curl -fsSL git.io/tmate.sh | bash - fi - [ -e ~/.ssh/id_rsa ] || ssh-keygen -t rsa -f ~/.ssh/id_rsa -q -N "" - echo Running tmate... - tmate -S /tmp/tmate.sock new-session -d - tmate -S /tmp/tmate.sock wait tmate-ready - # Print connection info - DISPLAY=1 - while [ $DISPLAY -le 30 ]; do - echo ________________________________________________________________________________ - echo To connect to this session copy-n-paste the following into a terminal or browser: - tmate -S /tmp/tmate.sock display -p '#{tmate_ssh}' - tmate -S /tmp/tmate.sock display -p '#{tmate_web}' - [ ! -f /tmp/keepalive ] && echo -e "After connecting you can run 'touch /tmp/keepalive' to disable the 30m timeout" - DISPLAY=$(($DISPLAY+1)) - sleep 30 - done - if [[ ! -z "$SLACK_WEBHOOK_URL" ]]; then - MSG=$(tmate -S /tmp/tmate.sock display -p '#{tmate_ssh}') - curl -X POST -H 'Content-type: application/json' --data "{\"text\":\"\`$MSG\`\"}" $SLACK_WEBHOOK_URL - fi - # Wait for connection to close or timeout in 15 min - timeout=$((30*60)) - while [ -S /tmp/tmate.sock ]; do - sleep 1 - timeout=$(($timeout-1)) - if [ ! -f /tmp/keepalive ]; then - if (( timeout < 0 )); then - echo Waiting on tmate connection timed out! - sudo init 0 - exit 0 - fi - fi - done - + #### build + ./b2g/build/build_with_gecko.sh - name: Check Current ”error.log“ Status id: check From 328b20d57c0cd4dbbf28e3f063580d97e2eeba29 Mon Sep 17 00:00:00 2001 From: ittat Date: Tue, 23 Feb 2021 23:40:43 +0800 Subject: [PATCH 07/21] Update template_b2g_config.yml --- .github/workflows/template_b2g_config.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/template_b2g_config.yml b/.github/workflows/template_b2g_config.yml index 61cf71d..77eccfd 100644 --- a/.github/workflows/template_b2g_config.yml +++ b/.github/workflows/template_b2g_config.yml @@ -16,14 +16,12 @@ on: # for example: env: GIT_ACCESS_TOKEN: ${{secrets.GIT_ACCESS_TOKEN}} - device_name: phhgsi_arm64_ab + device_name: aosp_arm64 repo_dispatches: "https://api.github.com/repos/b2g-gsi/build-actions/dispatches" b2g_source: "https://github.com/b2g-gsi/B2G" - b2g_branch: "b2g-gsi" - build_device_tag: gsi_arm64_ab + b2g_branch: "gsi_q" + build_device_tag: aosp_arm64 device_arch: aarch64-linux-android - #TODO - gecko_version: b2g-87.0a1.en-US.linux-android-aarch64.tar.bz2 #onyx #phhgsi_arm64_a #phhgsi_arm64_ab @@ -40,5 +38,5 @@ jobs: - name: Action run: | - ./b2g/init/webhook.sh b2g_b2g_build + ./b2g/init/webhook.sh b2g_repack #b2g_repack b2g_aosp_build b2g_gecko_build b2g_api_daemon_build From 439260b74d59c8c20603cc50c2094a207c5cb675 Mon Sep 17 00:00:00 2001 From: ittat Date: Tue, 23 Feb 2021 23:41:37 +0800 Subject: [PATCH 08/21] Update repo_source.sh --- b2g/source/repo_source.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/source/repo_source.sh b/b2g/source/repo_source.sh index c0f6a89..109b459 100755 --- a/b2g/source/repo_source.sh +++ b/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 REPO_INIT_FLAGS="--depth=1" REPO_SYNC_FLAGS=" -j128 --force-sync --current-branch --no-tags --no-clone-bundle --optimized-fetch --prune" ./config.sh b2g_gsi + GITREPO=https://github.com/b2g-gsi/manifests BRANCH=gsi_q REPO_INIT_FLAGS="--depth=1" REPO_SYNC_FLAGS=" -j128 --force-sync --current-branch --no-tags --no-clone-bundle --optimized-fetch --prune" ./config.sh aosp_arm64 df -h From e5c4539054e024957a06b5c7afaac96d18ee4cd3 Mon Sep 17 00:00:00 2001 From: ittat Date: Tue, 23 Feb 2021 23:43:44 +0800 Subject: [PATCH 09/21] Update build_with_gecko.sh --- b2g/build/build_with_gecko.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/b2g/build/build_with_gecko.sh b/b2g/build/build_with_gecko.sh index 13f60d0..1a05920 100755 --- a/b2g/build/build_with_gecko.sh +++ b/b2g/build/build_with_gecko.sh @@ -22,5 +22,4 @@ set -e #export SKIP_ABI_CHECKS=true #TODO fix ABI issue - gtimeout 245m ./build-gsi.sh ${build_device_tag} systemimage SKIP_ABI_CHECKS=false - ./build-gsi.sh ${build_device_tag} vndk-test-sepolicy + gtimeout 245m ./build.sh From e226320b29d73c66f441fe31f805bdadb2f09849 Mon Sep 17 00:00:00 2001 From: ittat Date: Tue, 23 Feb 2021 23:44:29 +0800 Subject: [PATCH 10/21] Update build_with_gecko.sh --- b2g/build/build_with_gecko.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/build/build_with_gecko.sh b/b2g/build/build_with_gecko.sh index 1a05920..7910748 100755 --- a/b2g/build/build_with_gecko.sh +++ b/b2g/build/build_with_gecko.sh @@ -22,4 +22,4 @@ set -e #export SKIP_ABI_CHECKS=true #TODO fix ABI issue - gtimeout 245m ./build.sh + gtimeout 245m ./build.sh -j16 From f0b902fef4e8dfc2f83c605ed9ce13ffd3e4dbaa Mon Sep 17 00:00:00 2001 From: ittat Date: Tue, 23 Feb 2021 23:45:09 +0800 Subject: [PATCH 11/21] Update build_with_gecko.sh --- b2g/build/build_with_gecko.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/build/build_with_gecko.sh b/b2g/build/build_with_gecko.sh index 7910748..2179dc1 100755 --- a/b2g/build/build_with_gecko.sh +++ b/b2g/build/build_with_gecko.sh @@ -22,4 +22,4 @@ set -e #export SKIP_ABI_CHECKS=true #TODO fix ABI issue - gtimeout 245m ./build.sh -j16 + gtimeout 245m ./build.sh -j16 systemimage From cbc2d7b0cda1e2fddbd9750a446974977500eb1f Mon Sep 17 00:00:00 2001 From: ittat Date: Tue, 23 Feb 2021 23:45:12 +0800 Subject: [PATCH 12/21] Update build_without_gecko.sh --- b2g/build/build_without_gecko.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/b2g/build/build_without_gecko.sh b/b2g/build/build_without_gecko.sh index 9a4136f..c643346 100755 --- a/b2g/build/build_without_gecko.sh +++ b/b2g/build/build_without_gecko.sh @@ -12,7 +12,7 @@ set -e #export OUT_DIR_COMMON_BASE=${out_work} export PREFERRED_B2G=${work}/b2g-dummy.tar.bz2 export USE_PREBUILT_B2G=1 - #gtimeout 245m ./build.sh -j16 systemimage - export SKIP_ABI_CHECKS=true - gtimeout 245m ./build-gsi.sh ${build_device_tag} systemimage + gtimeout 245m ./build.sh -j16 systemimage + #export SKIP_ABI_CHECKS=true + #gtimeout 245m ./build-gsi.sh ${build_device_tag} systemimage df -h From f210101920dfd6a6140647f92dcff5e2070ecbc0 Mon Sep 17 00:00:00 2001 From: ittat Date: Tue, 23 Feb 2021 23:47:03 +0800 Subject: [PATCH 13/21] Update template_b2g_build.yml --- .github/workflows/template_b2g_build.yml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/template_b2g_build.yml b/.github/workflows/template_b2g_build.yml index a4e7720..e4291a6 100644 --- a/.github/workflows/template_b2g_build.yml +++ b/.github/workflows/template_b2g_build.yml @@ -134,8 +134,6 @@ jobs: - name: B2G Build - Build Source include Gecko - #TODO - continue-on-error: true if: github.event.action == 'b2g_b2g_build' run: | df -h @@ -144,23 +142,13 @@ jobs: #### build ./b2g/build/build_with_gecko.sh - - name: TODO - if: github.event.action == 'b2g_b2g_build' - run: | - cd ${work}/B2G - ./development/vndk/tools/header-checker/utils/create_reference_dumps.py -l libhidlbase -product ${device_name} - - name: TODO - if: github.event.action == 'b2g_b2g_build' - run: | - #### build - ./b2g/build/build_with_gecko.sh - name: Check Current ”error.log“ Status id: check run: | - if [ -s ${work}/out/error.log ]; then + if [ -s ${work}/B2G/out/error.log ]; then echo Error! - cat ${work}/out/error.log + cat ${work}/B2G/out/error.log ./init/all_unmount_darwin.sh exit 2 else From deb0f7d112cdcc808e42c02cb3ef2df3ae87116c Mon Sep 17 00:00:00 2001 From: ittat Date: Wed, 24 Feb 2021 10:37:54 +0800 Subject: [PATCH 14/21] Update template_b2g_build.yml --- .github/workflows/template_b2g_build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/template_b2g_build.yml b/.github/workflows/template_b2g_build.yml index e4291a6..7cf228f 100644 --- a/.github/workflows/template_b2g_build.yml +++ b/.github/workflows/template_b2g_build.yml @@ -109,6 +109,11 @@ jobs: cd ${work}/B2G/gonk-misc sudo rm -r api-daemon git clone https://github.com/b2g-gsi/api-daemon -b without-api-daemon + #TODO + cd ~ + git clone https://github.com/b2g-gsi/platform_build -b gsi_q --depth=1 + rm ${work}/B2G/build/make/target/product/aosp_arm64.mk + cp ~/target/product/aosp_arm64.mk ${work}/B2G/build/make/target/product/ - name: Check The Previous “error.log” run: | From 4dec3f7d9e7c8132daf427fc46184ecd2073be19 Mon Sep 17 00:00:00 2001 From: ittat Date: Wed, 24 Feb 2021 10:38:16 +0800 Subject: [PATCH 15/21] Update template_b2g_config.yml --- .github/workflows/template_b2g_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/template_b2g_config.yml b/.github/workflows/template_b2g_config.yml index 77eccfd..b49fc5d 100644 --- a/.github/workflows/template_b2g_config.yml +++ b/.github/workflows/template_b2g_config.yml @@ -38,5 +38,5 @@ jobs: - name: Action run: | - ./b2g/init/webhook.sh b2g_repack + ./b2g/init/webhook.sh b2g_aosp_build #b2g_repack b2g_aosp_build b2g_gecko_build b2g_api_daemon_build From f49148a297b60e520f3685160aa3d4c17a4e0530 Mon Sep 17 00:00:00 2001 From: ittat Date: Wed, 24 Feb 2021 12:45:57 +0800 Subject: [PATCH 16/21] Update template_b2g_build.yml --- .github/workflows/template_b2g_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/template_b2g_build.yml b/.github/workflows/template_b2g_build.yml index 7cf228f..15e42d7 100644 --- a/.github/workflows/template_b2g_build.yml +++ b/.github/workflows/template_b2g_build.yml @@ -113,7 +113,7 @@ jobs: cd ~ git clone https://github.com/b2g-gsi/platform_build -b gsi_q --depth=1 rm ${work}/B2G/build/make/target/product/aosp_arm64.mk - cp ~/target/product/aosp_arm64.mk ${work}/B2G/build/make/target/product/ + cp ~/platform_build/target/product/aosp_arm64.mk ${work}/B2G/build/make/target/product/ - name: Check The Previous “error.log” run: | From a094f4a8f3e510c890510fa08ad5d1a49a8473b8 Mon Sep 17 00:00:00 2001 From: ittat Date: Wed, 24 Feb 2021 13:42:03 +0800 Subject: [PATCH 17/21] Update template_b2g_config.yml --- .github/workflows/template_b2g_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/template_b2g_config.yml b/.github/workflows/template_b2g_config.yml index b49fc5d..77eccfd 100644 --- a/.github/workflows/template_b2g_config.yml +++ b/.github/workflows/template_b2g_config.yml @@ -38,5 +38,5 @@ jobs: - name: Action run: | - ./b2g/init/webhook.sh b2g_aosp_build + ./b2g/init/webhook.sh b2g_repack #b2g_repack b2g_aosp_build b2g_gecko_build b2g_api_daemon_build From dd6238921c0ad48dd533581d9af630b54342a886 Mon Sep 17 00:00:00 2001 From: ittat Date: Thu, 25 Feb 2021 07:31:40 +0800 Subject: [PATCH 18/21] Update build_without_gecko.sh --- b2g/build/build_without_gecko.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/b2g/build/build_without_gecko.sh b/b2g/build/build_without_gecko.sh index c643346..7f8a382 100755 --- a/b2g/build/build_without_gecko.sh +++ b/b2g/build/build_without_gecko.sh @@ -12,6 +12,7 @@ set -e #export OUT_DIR_COMMON_BASE=${out_work} export PREFERRED_B2G=${work}/b2g-dummy.tar.bz2 export USE_PREBUILT_B2G=1 + export SKIP_ABI_CHECKS=true gtimeout 245m ./build.sh -j16 systemimage #export SKIP_ABI_CHECKS=true #gtimeout 245m ./build-gsi.sh ${build_device_tag} systemimage From b4a6dafd67670b688e9f694ac1fd4cffb3d689e8 Mon Sep 17 00:00:00 2001 From: ittat Date: Thu, 25 Feb 2021 07:32:20 +0800 Subject: [PATCH 19/21] Update build_with_gecko.sh --- b2g/build/build_with_gecko.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/b2g/build/build_with_gecko.sh b/b2g/build/build_with_gecko.sh index 2179dc1..b8a2b6f 100755 --- a/b2g/build/build_with_gecko.sh +++ b/b2g/build/build_with_gecko.sh @@ -19,7 +19,6 @@ set -e #export OUT_DIR_COMMON_BASE=${out_work} export PREFERRED_B2G="${work}/pre-gecko/${gecko_version}" - #export SKIP_ABI_CHECKS=true - #TODO fix ABI issue + export SKIP_ABI_CHECKS=true gtimeout 245m ./build.sh -j16 systemimage From 8222dd0550b83c0cebbf24d6c2ae9456f7837bdc Mon Sep 17 00:00:00 2001 From: ittat Date: Thu, 25 Feb 2021 10:26:47 +0800 Subject: [PATCH 20/21] Update create-b2g-sysroot.sh --- b2g/build/create-b2g-sysroot.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/b2g/build/create-b2g-sysroot.sh b/b2g/build/create-b2g-sysroot.sh index ff411d6..7b0b966 100644 --- a/b2g/build/create-b2g-sysroot.sh +++ b/b2g/build/create-b2g-sysroot.sh @@ -89,6 +89,7 @@ out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/android.hardware. out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/android.hardware.wifi.supplicant@1.1.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/android.hardware.wifi.supplicant@1.2.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/android.system.wifi.keystore@1.0.so +out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/binder_b2g_stub.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/binder_b2g_connectivity_interface-cpp.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/binder_b2g_system_interface-cpp.so out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/binder_b2g_telephony_interface-cpp.so @@ -145,6 +146,7 @@ frameworks/native/libs/nativebase/include frameworks/native/libs/nativewindow/include frameworks/native/libs/ui/include frameworks/native/opengl/include +gonk-misc/gonk-binder/binder_b2g_stub/include/ hardware/interfaces/graphics/composer/2.1/utils/command-buffer/include hardware/interfaces/graphics/composer/2.2/utils/command-buffer/include hardware/interfaces/graphics/composer/2.3/utils/command-buffer/include From c5d3c328e6f2a3ef7a7febb0b350892624404329 Mon Sep 17 00:00:00 2001 From: ittat Date: Sat, 6 Mar 2021 10:09:55 +0800 Subject: [PATCH 21/21] Update template_b2g_config.yml --- .github/workflows/template_b2g_config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/template_b2g_config.yml b/.github/workflows/template_b2g_config.yml index 77eccfd..d2cb8c0 100644 --- a/.github/workflows/template_b2g_config.yml +++ b/.github/workflows/template_b2g_config.yml @@ -16,11 +16,11 @@ on: # for example: env: GIT_ACCESS_TOKEN: ${{secrets.GIT_ACCESS_TOKEN}} - device_name: aosp_arm64 + device_name: phhgsi_arm64_ab repo_dispatches: "https://api.github.com/repos/b2g-gsi/build-actions/dispatches" b2g_source: "https://github.com/b2g-gsi/B2G" - b2g_branch: "gsi_q" - build_device_tag: aosp_arm64 + b2g_branch: "ittat-patch-gsi" + build_device_tag: gsi_arm64_ab device_arch: aarch64-linux-android #onyx #phhgsi_arm64_a