commit b9beb40cdf9d540e40246b452868893764ccefff
author Joel Fernandes <joelaf@google.com> Thu Jun 13 14:24:50 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 13 14:24:50 2019 -0700
tree 6c74b382c666708160983e0e2d4ffe16edfd2e0d
parent c8d3143ef49b64abd036263e3c0ee1dea41d47a5
parent b68c65554b8673a8aa4a56d5b042498108ef2dca

Merge "bpfloader: Try to load even if bpf.progs_loaded is set" am: 4389649d8a am: 86a54a9ac0
am: b68c65554b

Change-Id: Ie830f9e89aa94583a6161758844fc5fba382c5cb

bpfloader/BpfLoader.cpp

diff --git a/bpfloader/BpfLoader.cpp b/bpfloader/BpfLoader.cpp
index 01c02cc..c9bed5e 100644
--- a/bpfloader/BpfLoader.cpp
+++ b/bpfloader/BpfLoader.cpp
@@ -86,12 +86,6 @@
 }
 
 int main() {
-    std::string value = android::base::GetProperty("bpf.progs_loaded", "");
-    if (value == "1") {
-        ALOGI("Property bpf.progs_loaded is set, progs already loaded.\n");
-        return 0;
-    }
-
     if (android::bpf::getBpfSupportLevel() != android::bpf::BpfLevel::NONE) {
         // Load all ELF objects, create programs and maps, and pin them
         loadAllElfObjects();