From 6c43e1c6ebf1df0f46aa0d4a816b1dafb1b6dc4f Mon Sep 17 00:00:00 2001
From: roynatech2544 <whiteshell2544@naver.com>
Date: Sat, 30 Apr 2022 09:25:25 +0900
Subject: [PATCH] universal7885: Fixup mistakes

* Set flag for keymaster, import Google hardware Soong namespaces back
---
 universal7885-common/Android.bp              | 2 ++
 universal7885-common/BoardConfigCommon.mk    | 3 +++
 universal7885-common/universal7885-common.mk | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/universal7885-common/Android.bp b/universal7885-common/Android.bp
index 958d559..2728e79 100644
--- a/universal7885-common/Android.bp
+++ b/universal7885-common/Android.bp
@@ -1,5 +1,7 @@
 soong_namespace {
     imports: [
         "hardware/samsung",
+        "hardware/google/pixel",
+        "hardware/google/interfaces",
     ],
 }
diff --git a/universal7885-common/BoardConfigCommon.mk b/universal7885-common/BoardConfigCommon.mk
index da16a08..fd7a00d 100644
--- a/universal7885-common/BoardConfigCommon.mk
+++ b/universal7885-common/BoardConfigCommon.mk
@@ -63,6 +63,9 @@ TARGET_KERNEL_SOURCE := kernel/samsung/exynos7885
 TARGET_KERNEL_CLANG_COMPILE := true
 KERNEL_LD := LD=ld.lld
 
+# Keymaster
+TARGET_KEYMASTER_VARIANT := samsung
+
 # HIDL
 include device/samsung/universal7885-common/configs/vintf/manifest.mk
 
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index 6da6f75..9afe5c8 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -281,6 +281,8 @@ PRODUCT_PACKAGES += \
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH) \
+    hardware/google/interfaces \
+    hardware/google/pixel \
     hardware/samsung
 
 # Sysconfig