From 8503d0a4583f819a4d952d823e1e5fd57f77de06 Mon Sep 17 00:00:00 2001
From: Harshit Jain <dev-harsh1998@hotmail.com>
Date: Mon, 24 May 2021 17:33:07 +0000
Subject: [PATCH] universal7885: Fix build on android S environment

Change-Id: I7180195ed613f91beaac667391aad32472c2cd1e
Signed-off-by: SamarV-121 <samarvispute121@pm.me>
Signed-off-by: roynatech2544 <whiteshell2544@naver.com>
---
 universal7885-common/libshims/Android.bp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/universal7885-common/libshims/Android.bp b/universal7885-common/libshims/Android.bp
index f72e18a..e111b11 100644
--- a/universal7885-common/libshims/Android.bp
+++ b/universal7885-common/libshims/Android.bp
@@ -3,15 +3,14 @@ cc_library_shared {
 
     srcs: ["ASensorManager.cpp"],
     shared_libs: [
-        "libbase",
         "libsensorndkbridge",
         "libutils",
     ],
-
+    whole_static_libs: ["libbase"],
+    header_libs: ["libbase_headers"],
     vendor: true,
 
     include_dirs: [
-        "system/core/base/include",
         "system/core/libutils/include",
         "frameworks/hardware/interfaces/sensorservice/libsensorndkbridge",
     ],