commit abb968350b1cfc4a583e845a85f207a68d5d8903
author Kevin Jeon <kevinjeon@google.com> Tue Mar 30 23:29:39 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 30 23:29:39 2021 +0000
tree 7ea51ddec4a9055893392a674b8a73de13847edb
parent 97c7509b69b4fef02d3eb00f11c33ba2ab25969d
parent 8358b93938669b34ec8e446f28e0825218f71f67

Mark libmeminfo library as vendor available am: c851b322c9 am: 8358b93938

Original change: https://android-review.googlesource.com/c/platform/system/memory/libmeminfo/+/1657461

Change-Id: I4fcca1e71325f7b1ba6c71e1e8a569bedbfa9968

Android.bp

diff --git a/Android.bp b/Android.bp
index a634b0f..7306d44 100644
--- a/Android.bp
+++ b/Android.bp
@@ -44,6 +44,11 @@
                 "libbpf_android",
             ],
         },
+	vendor: {
+	    exclude_static_libs: [
+	        "libbpf_android",
+	    ],
+	},
         darwin: {
             enabled: false,
         },
@@ -55,6 +60,7 @@
     name: "libmeminfo",
     host_supported: true,
     native_bridge_supported: true,
+    vendor_available: true,
     defaults: ["libmeminfo_defaults"],
     export_include_dirs: [
         "include",

sysmeminfo.cpp

diff --git a/sysmeminfo.cpp b/sysmeminfo.cpp
index c5f39d8..2dabea8 100644
--- a/sysmeminfo.cpp
+++ b/sysmeminfo.cpp
@@ -28,7 +28,7 @@
 #include <cstdio>
 #include <fstream>
 #include <iterator>
-#if defined(__ANDROID__) && !defined(__ANDROID_APEX__)
+#if defined(__ANDROID__) && !defined(__ANDROID_APEX__) && !defined(__ANDROID_VNDK__)
 #include "bpf/BpfMap.h"
 #endif
 #include <sstream>
@@ -321,7 +321,7 @@
 }
 
 bool ReadGpuTotalUsageKb(uint64_t* size) {
-#if defined(__ANDROID__) && !defined(__ANDROID_APEX__)
+#if defined(__ANDROID__) && !defined(__ANDROID_APEX__) && !defined(__ANDROID_VNDK__)
     static constexpr const char kBpfGpuMemTotalMap[] =
         "/sys/fs/bpf/map_gpu_mem_gpu_mem_total_map";
     static constexpr uint64_t kBpfKeyGpuTotalUsage = 0;