commit 33aa7718bc108a19c19460ddcc72f5929cf5f4c2
author Adam Shih <adamshih@google.com> Tue Aug 30 11:54:49 2022 +0800
committer Adam Shih <adamshih@google.com> Wed Aug 31 10:32:55 2022 +0800
tree a8ec0a9c1f4e4d06ef0d811f55f2678288b66753
parent 03c476483848041da977c92f39ada6fae5041713

Move dauntless settings to gs-common

Bug: 242479757
Test: build pass on all Gchip devices
Change-Id: Idfd52a88a420f04169b273a1ef575f10b92874c1

dauntless/gsc.mk

diff --git a/dauntless/gsc.mk b/dauntless/gsc.mk
index fd3e3bc..a26644a 100644
--- a/dauntless/gsc.mk
+++ b/dauntless/gsc.mk
@@ -1,2 +1,19 @@
-PRODUCT_PACKAGES += dump_gsc.sh
+# Dauntless
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/dauntless/sepolicy
+PRODUCT_SOONG_NAMESPACES += vendor/google_nos/init/dauntless
+
+PRODUCT_PACKAGES += \
+    citadeld \
+    citadel_updater \
+    android.hardware.weaver@1.0-service.citadel \
+    android.hardware.identity@1.0-service.citadel \
+    init_citadel \
+    android.hardware.strongbox_keystore.xml \
+    android.hardware.security.keymint-service.citadel \
+    dump_gsc.sh
+
+# USERDEBUG ONLY: Install test packages
+PRODUCT_PACKAGES_DEBUG += citadel_integration_tests \
+                          pwntest \
+                          nugget_targeted_tests \
+                          CitadelProvision