Initial unified commit for Android 12, syncing up to v400.a

2021-10-20 14:54:55 +00:00
commit 796726eb09
166 changed files with 20826 additions and 0 deletions
--- a/patches_treble_phh/platform_system_bpf/0001-Support-no-bpf-usecase.patch
+++ b/patches_treble_phh/platform_system_bpf/0001-Support-no-bpf-usecase.patch
@@ -0,0 +1,28 @@
+From c65f007e838f3143b097e4e3e93623d2e64e328c 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] 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 7a68894..2d491a3 100644
+--- a/bpfloader/BpfLoader.cpp
+++ b/bpfloader/BpfLoader.cpp
+@@ -121,8 +121,8 @@ int main() {
+             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.29.2
+