diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2023-10-30 11:58:43 +0200 |
|---|---|---|
| committer | alk3pInjection <webmaster@raspii.tech> | 2024-01-01 09:42:40 +0800 |
| commit | 00dbc0cf0988d8bfb0c921688410418f2ce7d85c (patch) | |
| tree | ba7914c8fd38f2cf80cc03860baadfc2c1fe3927 | |
| parent | 41d46990a039264bf7008b1d4c04899373c25973 (diff) | |
citadel: Guard with proprietary source presence
Don't attempt to build non-existent packages in AOSP.
This allows to enable enforce-product-packages-exist check
on older Pixel devices.
Change-Id: I81d39fdaf29c6cae488785b1fc35039af3dcb4c2
| -rw-r--r-- | citadel/citadel.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/citadel/citadel.mk b/citadel/citadel.mk index fa7c5c3..cfcda78 100644 --- a/citadel/citadel.mk +++ b/citadel/citadel.mk @@ -1,3 +1,4 @@ +ifneq ($(wildcard vendor/google_nos),) PRODUCT_SOONG_NAMESPACES += vendor/google_nos/init/citadel # Citadel PRODUCT_PACKAGES += \ @@ -11,8 +12,6 @@ PRODUCT_PACKAGES += \ android.hardware.weaver-service.citadel \ android.hardware.keymaster@4.1-service.citadel \ android.hardware.identity@1.0-service.citadel \ - android.hardware.fastboot@1.1-impl.pixel \ - wait_for_strongbox \ init_citadel # Citadel debug stuff @@ -22,6 +21,11 @@ PRODUCT_PACKAGES_DEBUG += \ # Resume on Reboot support PRODUCT_PACKAGES += \ android.hardware.rebootescrow-service.citadel +endif + +PRODUCT_PACKAGES += \ + android.hardware.fastboot@1.1-impl.pixel \ + wait_for_strongbox ifneq ($(wildcard vendor/google_nos/provision),) PRODUCT_PACKAGES_DEBUG += CitadelProvision @@ -42,7 +46,9 @@ BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/citadel # USERDEBUG ONLY: Install test packages ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) +ifneq ($(wildcard vendor/google_nos),) PRODUCT_PACKAGES_DEBUG += citadel_integration_tests \ pwntest \ nugget_targeted_tests endif +endif |