diff options
| author | Devin Moore <devinmoore@google.com> | 2024-04-08 20:08:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-08 20:08:16 +0000 |
| commit | 19f98bd6a24058812d835b5a6216828714b3e30f (patch) | |
| tree | 25e218ec022cbd84b28a5693441d086d8bca8df4 | |
| parent | 50ced9f4397e21c69156e42cdebd4dd9113ff66d (diff) | |
| parent | 4c25a9f53fa83db26fbb58dc4b2d45812b815a10 (diff) | |
| download | libhidl-19f98bd6a24058812d835b5a6216828714b3e30f.tar.gz | |
Merge "Add hwservicemanager vintf fragments to system_ext" into main
| -rw-r--r-- | vintfdata/Android.mk | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/vintfdata/Android.mk b/vintfdata/Android.mk index 0cd0d1f..ed8f506 100644 --- a/vintfdata/Android.mk +++ b/vintfdata/Android.mk @@ -28,6 +28,21 @@ ifdef DEVICE_FRAMEWORK_MANIFEST_FILE endif SYSTEM_EXT_MANIFEST_INPUT_FILES := $(LOCAL_PATH)/system_ext_manifest.default.xml + +ifeq ($(PRODUCT_HIDL_ENABLED),true) +ifneq ($(filter hwservicemanager,$(PRODUCT_PACKAGES)),) +SYSTEM_EXT_MANIFEST_INPUT_FILES += $(TOPDIR)system/hwservicemanager/hwservicemanager_no_max.xml +else +$(error If PRODUCT_HIDL_ENABLED is set, hwservicemanager must be added to PRODUCT_PACKAGES explicitly) +endif +else +ifneq ($(filter hwservicemanager,$(PRODUCT_PACKAGES)),) +SYSTEM_EXT_MANIFEST_INPUT_FILES += $(TOPDIR)system/hwservicemanager/hwservicemanager.xml +else ifneq ($(filter hwservicemanager,$(PRODUCT_PACKAGES_SHIPPING_API_LEVEL_34)),) +SYSTEM_EXT_MANIFEST_INPUT_FILES += $(TOPDIR)system/hwservicemanager/hwservicemanager.xml +endif +endif + ifdef SYSTEM_EXT_MANIFEST_FILES SYSTEM_EXT_MANIFEST_INPUT_FILES += $(SYSTEM_EXT_MANIFEST_FILES) endif |