Skip to content

Commit 7145ac7

Browse files
committed
Migrate to AOSPv14
Enough to build successfully. Signed-off-by: Roman Stratiienko <[email protected]>
1 parent a8fde30 commit 7145ac7

19 files changed

+1137
-115
lines changed

aosptree/vendor/devices-community/gd_rpi4/device.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ PRODUCT_VENDOR_PROPERTIES += \
6565
ro.hardware.vulkan=broadcom \
6666

6767
# Enable Vulkan backend for SKIA/HWUI
68-
TARGET_USES_VULKAN = true
68+
# TARGET_USES_VULKAN = true
6969

7070
# Bluetooth
7171
PRODUCT_VENDOR_PROPERTIES += \

manifests/glodroid.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<!-- gpu+display components (vendor) -->
2121
<project path="glodroid/vendor/minigbm" remote="aosp" name="platform/external/minigbm" groups="glodroid" revision="84b3a09ef0e620c1b2ec19c7626c327e68a847bc" />
2222
<project path="glodroid/vendor/drm_hwcomposer" remote="aosp" name="platform/external/drm_hwcomposer" groups="glodroid" revision="5de61b5e4fbf43b78b605dab68465aa6722930c4" />
23-
<project path="glodroid/vendor/mesa3d" remote="aosp" name="platform/external/mesa3d" groups="glodroid" revision="f88338f80127d8bbbb49269e2399fd9e7e460c5c" />
23+
<project path="glodroid/vendor/mesa3d" remote="aosp" name="platform/external/mesa3d" groups="glodroid" revision="9b0960cfe39414815b1dc5a786e6312639f49352" />
2424

2525
<!-- camera components (vendor) -->
2626
<project path="glodroid/vendor/libcamera" remote="libcamera" name="libcamera.git" groups="glodroid" revision="960d0c1e19feaf310321c906e14bd5410c6be629" />

patches-aosp/build/soong/0001-GLODROID-Don-t-use-clang-tidy.patch

Lines changed: 0 additions & 29 deletions
This file was deleted.
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
From 2be0dae3f8fb3c912edb49dba2f2cd434b8d9401 Mon Sep 17 00:00:00 2001
2+
From: Roman Stratiienko <[email protected]>
3+
Date: Thu, 19 Oct 2023 03:37:01 +0300
4+
Subject: [PATCH] HWUI: Fix deadlock in graphics pipeline
5+
6+
Mutex lock() causes deadlock when the queue is empty.
7+
Regression is caused by b013c8dee3b3e897b3557206f2d6c75b8c9f2f84
8+
For some unknown reason, it is reproduced only on GloDroid :)
9+
So probably some other part of GD is to blame.
10+
Or, it is just a coincidence.
11+
12+
TODO: Do one more investigation attempt.
13+
14+
Change-Id: Ic981947babe62b83032e9ba1630cc0458c228f44
15+
Signed-off-by: Roman Stratiienko <[email protected]>
16+
---
17+
libs/hwui/renderthread/CanvasContext.cpp | 6 +++++-
18+
1 file changed, 5 insertions(+), 1 deletion(-)
19+
20+
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
21+
index 16b35ffcabac..a9dde31e83e7 100644
22+
--- a/libs/hwui/renderthread/CanvasContext.cpp
23+
+++ b/libs/hwui/renderthread/CanvasContext.cpp
24+
@@ -586,7 +586,11 @@ void CanvasContext::draw(bool solelyTextureViewUpdates) {
25+
// not visible to IRenderPipeline much less FrameInfoVisualizer. And since this is
26+
// the thread we're primarily concerned about being responsive, this being too broad
27+
// shouldn't pose a performance issue.
28+
- std::scoped_lock lock(mFrameMetricsReporterMutex);
29+
+
30+
+// Causes deadlock when the queue is empty. Regression is caused by b013c8dee3b3e897b3557206f2d6c75b8c9f2f84
31+
+// For some unknown reason, it is reproduced only on GloDroid :) So probably some other part of GD is to blame. Or, it is just a coincidence.
32+
+// std::scoped_lock lock(mFrameMetricsReporterMutex);
33+
+
34+
drawResult = mRenderPipeline->draw(frame, windowDirty, dirty, mLightGeometry,
35+
&mLayerUpdateQueue, mContentDrawBounds, mOpaque,
36+
mLightInfo, mRenderNodes, &(profiler()), mBufferParams);
37+
--
38+
2.39.2
39+

patches-aosp/frameworks/base/0001-Revert-Fix-crash-from-asynchronous-GPU-metrics.patch

Lines changed: 0 additions & 82 deletions
This file was deleted.

patches-aosp/glodroid/bootloader/u-boot/0004-GLODROID-Speed-up-boot.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ index f03b56ad6a..4ab246315a 100644
1616
CONFIG_CONSOLE_SCROLL_LINES=10
1717
CONFIG_PHYS_TO_BUS=y
1818
CONFIG_OF_LIBFDT_OVERLAY=y
19-
+CONFIG_BOOTDELAY=0
19+
+CONFIG_BOOTDELAY=1
2020
--
2121
2.37.2
2222

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From 08bf277bb68ef649949a83eb908a35666dc7fccf Mon Sep 17 00:00:00 2001
2+
From: Roman Stratiienko <[email protected]>
3+
Date: Fri, 6 Oct 2023 22:20:52 +0300
4+
Subject: [PATCH 08/12] base: Remove deprecated BOARD_BUILD_SYSTEM_ROOT_IMAGE
5+
definition
6+
7+
Signed-off-by: Roman Stratiienko <[email protected]>
8+
---
9+
common/base/board.mk | 1 -
10+
1 file changed, 1 deletion(-)
11+
12+
diff --git a/common/base/board.mk b/common/base/board.mk
13+
index 82c4292..73158c5 100644
14+
--- a/common/base/board.mk
15+
+++ b/common/base/board.mk
16+
@@ -97,7 +97,6 @@ TARGET_COPY_OUT_VENDOR_DLKM := vendor_dlkm
17+
18+
# Root image
19+
TARGET_COPY_OUT_ROOT := root
20+
-BOARD_BUILD_SYSTEM_ROOT_IMAGE := false
21+
22+
BOARD_EXT4_SHARE_DUP_BLOCKS := true
23+
24+
--
25+
2.39.2
26+

0 commit comments

Comments
 (0)