Initial unified commit for Android 13, with TrebleDroid GSI target, syncing up to 20221111

patches_treble_td/platform_system_bpf/0001-Support-no-bpf-usecase.patch

@@ -0,0 +1,28 @@
+From 0e585594a973b9b93ae4ea6bf19df42263c73079 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Wed, 13 Oct 2021 10:56:52 -0400
+Subject: [PATCH 1/2] Support no-bpf usecase
+
+Change-Id: I75a427a2a41aa4ab1104ad88a891bef0dc2d9c91
+---
+ bpfloader/BpfLoader.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/bpfloader/BpfLoader.cpp b/bpfloader/BpfLoader.cpp
+index 5cd80b7..bbfa7a8 100644
+--- a/bpfloader/BpfLoader.cpp
++++ b/bpfloader/BpfLoader.cpp
+@@ -194,8 +194,8 @@ int main(int argc, char** argv) {
+             ALOGE("If this triggers randomly, you might be hitting some memory allocation "
+                   "problems or startup script race.");
+             ALOGE("--- DO NOT EXPECT SYSTEM TO BOOT SUCCESSFULLY ---");
+-            sleep(20);
+-            return 2;
++	    android::base::SetProperty("bpf.progs_loaded", "1");
++	    return 0;
+         }
+     }
+ 
+-- 
+2.25.1
+

patches_treble_td/platform_system_bpf/0002-Revert-detect-inability-to-write-to-index-0-of-bpf-m.patch

@@ -0,0 +1,34 @@
+From 7083e9ecf6b296d9490ac12b124b91d48772f046 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Wed, 19 Oct 2022 02:20:05 +0000
+Subject: [PATCH 2/2] Revert "detect inability to write to index != 0 of bpf
+ map array"
+
+This reverts commit ead9d83423877458023056f6ccf9390950d6726f.
+---
+ bpfloader/BpfLoader.cpp | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/bpfloader/BpfLoader.cpp b/bpfloader/BpfLoader.cpp
+index bbfa7a8..9ace0fa 100644
+--- a/bpfloader/BpfLoader.cpp
++++ b/bpfloader/BpfLoader.cpp
+@@ -199,15 +199,6 @@ int main(int argc, char** argv) {
+         }
+     }
+ 
+-    int key = 1;
+-    int value = 123;
+-    android::base::unique_fd map(
+-            android::bpf::createMap(BPF_MAP_TYPE_ARRAY, sizeof(key), sizeof(value), 2, 0));
+-    if (android::bpf::writeToMapEntry(map, &key, &value, BPF_ANY)) {
+-        ALOGE("Critical kernel bug - failure to write into index 1 of 2 element bpf map array.");
+-        return 1;
+-    }
+-
+     if (android::base::SetProperty("bpf.progs_loaded", "1") == false) {
+         ALOGE("Failed to set bpf.progs_loaded property");
+         return 1;
+-- 
+2.25.1
+