Pull request for issue #150

[gengcixi]

This pull request is for issue150 Glodroid will plan to update os to android12? #150

we use a android-ci compile ok version in aosp-master, but when add the glodroid,it compiled fail. please help to fix

[rsglobal]

Hi, could you attach your build log?

make 2>&1 | tee build.txt

[rsglobal]

apex fork must be removed as well:

diff --git a/glodroid.xml b/glodroid.xml
index d1d8aa1..6a46d7e 100644
--- a/glodroid.xml
+++ b/glodroid.xml
@@ -6,9 +6,6 @@
   <remote  name="glodroid" fetch="https://github.com/glodroid/" />
   <remote  name="megous"   fetch="https://megous.com/git/" />

-  <remove-project name="platform/system/apex" />
-  <project path="system/apex" remote="glodroid" name="glodroid_forks.git" revision="refs/tags/aosp/system/apex-v0.6.0" />
-
   <extend-project name="platform/external/arm-trusted-firmware" revision="de9d0d7c7ffc592e34f9c8c38c1971556d4d4de8" />
   <remove-project name="platform/external/mesa3d" />
   <remove-project name="platform/external/u-boot" />

[rsglobal]

Also this needs to be rebased onto the next branch to avoid conflicts between libgbm and libgbm_mesa modules.

[rsglobal]

minigbm project require removing of 2 patches:
https://github.com/GloDroid/glodroid_forks/commits/minigbm-next

Patch 1: ("DO NOT MERGE: Remove sections incompatible with Android-R") Patch 2: ("DO NOT MERGE: Rename libgbm to avoid conflicts on Android-R")

[rsglobal]

Hi, I've managed to build and run latest AOSP master (Tiramisu) . All required should be in the next branch. You can try it out by cloning repo init ... -b next

It is very buggy, But UI appears.

[gengcixi]

Hi rsglobal: Sorry to reply so late due to take over my colleague work. I repo sync the next branch and build opi3.it still some error on my machine

1. the rkbin git revision is invalid Fetching projects: 87% (925/1063) error: Cannot fetch rockchip-linux/rkbin.git (GitError: rockchip-linux/rkbin.git update-ref: fatal: 0bb1c512492386a72a3a0b5a0e18e49c636577b9^0: not a valid SHA1 ) I replace the newest review from github: Author: Cixi Geng cixi.geng1@unisoc.com Date: Mon Sep 13 21:38:45 2021 +0800

   Update repository rkbin for rockchip

   Change-Id: Ic43e429a04e1ad0a4cc614d854f718c4171d4866

diff --git a/glodroid.xml b/glodroid.xml index 84af33f..f5c886a 100644 --- a/glodroid.xml +++ b/glodroid.xml @@ -47,6 +47,6 @@

2. After repo sync , it occur the follow error on my Ubuntu, does I need install some other package before builld?

[ 87% 102814/117084] build out/target/product/opi3/obj/MESON_LIBCAMERA/.build.timestamp FAILED: out/target/product/opi3/obj/MESON_LIBCAMERA/.build.timestamp /bin/bash -c "(rm -rf out/target/product/opi3/obj/MESON_LIBCAMERA/ ) && (mkdir -p out/target/product/opi3/obj/MESON_LIBCAMERA/ ) && (mkdir -p out/target/product/opi3/obj/MESON_LIBCAMERA//build ) && (cp -r external/libcamera//* out/target/product/opi3/obj/MESON_LIBCAMERA/ ) && (cd out/target/product/opi3/obj/MESON_LIBCAMERA && PATH=/usr/bin:/usr/local/bin:\$PATH meson ./build --cross-file /home/cixi.geng1/glodroid/out/target/product/opi3/obj/MESON_LIBCAMERA_GEN/aosp_cross --buildtype=release -Dandroid=enabled -Dipas= -Dpipelines=simple -Dsysconfdir=/vendor/etc -Dtest=false ) && (PATH=/usr/bin:/bin:/sbin:\$PATH ninja -C out/target/product/opi3/obj/MESON_LIBCAMERA/build ) && (touch out/target/product/opi3/obj/MESON_LIBCAMERA/.build.timestamp )" The Meson build system Version: 0.45.1 Source dir: /home/cixi.geng1/glodroid/out/target/product/opi3/obj/MESON_LIBCAMERA Build dir: /home/cixi.geng1/glodroid/out/target/product/opi3/obj/MESON_LIBCAMERA/build Build type: cross build

meson.build:127:33: ERROR: Expecting eol got not. if get_option('test') and 'vimc' not in pipelines ^

A full log can be found at /home/cixi.geng1/glodroid/out/target/product/opi3/obj/MESON_LIBCAMERA/build/meson-logs/meson-log.txt [ 87% 102817/117084] build out/target/product/opi3/obj_arm/MESON_LIBCAMERA/.build.timestamp FAILED: out/target/product/opi3/obj_arm/MESON_LIBCAMERA/.build.timestamp /bin/bash -c "(rm -rf out/target/product/opi3/obj_arm/MESON_LIBCAMERA/ ) && (mkdir -p out/target/product/opi3/obj_arm/MESON_LIBCAMERA/ ) && (mkdir -p out/target/product/opi3/obj_arm/MESON_LIBCAMERA//build ) && (cp -r external/libcamera//* out/target/product/opi3/obj_arm/MESON_LIBCAMERA/ ) && (cd out/target/product/opi3/obj_arm/MESON_LIBCAMERA && PATH=/usr/bin:/usr/local/bin:\$PATH meson ./build --cross-file /home/cixi.geng1/glodroid/out/target/product/opi3/obj_arm/MESON_LIBCAMERA_GEN/aosp_cross --buildtype=release -Dandroid=enabled -Dipas= -Dpipelines=simple -Dsysconfdir=/vendor/etc -Dtest=false ) && (PATH=/usr/bin:/bin:/sbin:\$PATH ninja -C out/target/product/opi3/obj_arm/MESON_LIBCAMERA/build ) && (touch out/target/product/opi3/obj_arm/MESON_LIBCAMERA/.build.timestamp )" The Meson build system Version: 0.45.1 Source dir: /home/cixi.geng1/glodroid/out/target/product/opi3/obj_arm/MESON_LIBCAMERA Build dir: /home/cixi.geng1/glodroid/out/target/product/opi3/obj_arm/MESON_LIBCAMERA/build Build type: cross build

meson.build:127:33: ERROR: Expecting eol got not. if get_option('test') and 'vimc' not in pipelines ^

A full log can be found at /home/cixi.geng1/glodroid/out/target/product/opi3/obj_arm/MESON_LIBCAMERA/build/meson-logs/meson-log.txt 10:43:05 ninja failed with: exit status 1

[rsglobal]

This was an attempt to bring-up Android-12 preview/beta. Since Android-12 is released and available in next branch this PR can be closed.