commit 0afd92cb3ab3f45eadd16d1fbfaec66595a31af4
author Xin Li <delphij@google.com> Thu Aug 27 09:44:20 2020 -0700
committer Xin Li <delphij@google.com> Thu Aug 27 09:44:20 2020 -0700
tree 0c6569d5a18a2c1a0091b0e2115ca6ee168928f6
parent c2fe18428ea03702b7fcd96e4865630e03ef219d
parent 0c7e97eb679674fd5e9062e3c1655c2938a46f80

Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged

Bug: 166295507
Merged-In: I722aedc00409b8931c6d05efea4342279d32a7cf
Change-Id: Ib95718b5c7d73700055185598bd7a38e65ec7162

bpfloader/BpfLoader.cpp

diff --git a/bpfloader/BpfLoader.cpp b/bpfloader/BpfLoader.cpp
index e67c469..5aacf6c 100644
--- a/bpfloader/BpfLoader.cpp
+++ b/bpfloader/BpfLoader.cpp
@@ -89,6 +89,7 @@
         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;
     }
 

libbpf_android/Loader.cpp

diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp
index da6a109..47e6c67 100644
--- a/libbpf_android/Loader.cpp
+++ b/libbpf_android/Loader.cpp
@@ -313,7 +313,7 @@
 
     /* No section found with matching name*/
     if (sec_idx == -1) {
-        ALOGE("No %s section could be found in elf object\n", sectionName.c_str());
+        ALOGW("No %s section could be found in elf object\n", sectionName.c_str());
         return -1;
     }