diff options
| author | Yifan Hong <elsk@google.com> | 2019-04-26 22:39:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-26 22:39:01 +0000 |
| commit | 874486019fa65856bbd35d173be04b472afa1637 (patch) | |
| tree | a15964f59b0047225e0df1c9943e2b3880c9bdf6 | |
| parent | c1e587fb8d7867c4d7bea3d77078aedd9adca2cb (diff) | |
| parent | a6bd7739b675506b211c33a813d1f1d2cc4fdc1f (diff) | |
| download | libhidl-874486019fa65856bbd35d173be04b472afa1637.tar.gz | |
Merge "Add product manifest." into qt-dev
| -rw-r--r-- | vintfdata/Android.mk | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/vintfdata/Android.mk b/vintfdata/Android.mk index 78351fe..7a30668 100644 --- a/vintfdata/Android.mk +++ b/vintfdata/Android.mk @@ -16,6 +16,12 @@ LOCAL_PATH := $(call my-dir) +# DEVICE_FRAMEWORK_MANIFEST_FILE is a device-specific framework manifest file +# that installed to the system image. HALs entries should be written to +# DEVICE_FRAMEWORK_MANIFEST_FILE or PRODUCT_MANIFEST_FILES depend on the path of +# the module. It is recommended that such device-specific modules to be +# installed on product partition. + FRAMEWORK_MANIFEST_INPUT_FILES := $(LOCAL_PATH)/manifest.xml ifdef DEVICE_FRAMEWORK_MANIFEST_FILE FRAMEWORK_MANIFEST_INPUT_FILES += $(DEVICE_FRAMEWORK_MANIFEST_FILE) @@ -56,9 +62,9 @@ LOCAL_PREBUILT_MODULE_FILE := $(GEN) include $(BUILD_PREBUILT) BUILT_VENDOR_MATRIX := $(LOCAL_BUILT_MODULE) -# Framework Manifest +# System Manifest include $(CLEAR_VARS) -LOCAL_MODULE := framework_manifest.xml +LOCAL_MODULE := system_manifest.xml LOCAL_MODULE_STEM := manifest.xml LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/vintf @@ -78,6 +84,26 @@ LOCAL_PREBUILT_MODULE_FILE := $(GEN) include $(BUILD_PREBUILT) BUILT_SYSTEM_MANIFEST := $(LOCAL_BUILT_MODULE) +# Product Manifest +ifneq ($(PRODUCT_MANIFEST_FILES),) +include $(CLEAR_VARS) +LOCAL_MODULE := product_manifest.xml +LOCAL_MODULE_STEM := manifest.xml +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_RELATIVE_PATH := vintf +GEN := $(local-generated-sources-dir)/manifest.xml +$(GEN): PRIVATE_PRODUCT_MANIFEST_FILES := $(PRODUCT_MANIFEST_FILES) +$(GEN): $(PRODUCT_MANIFEST_FILES) $(HOST_OUT_EXECUTABLES)/assemble_vintf + $(HOST_OUT_EXECUTABLES)/assemble_vintf \ + -i $(call normalize-path-list,$(PRIVATE_PRODUCT_MANIFEST_FILES)) \ + -o $@ + +LOCAL_PREBUILT_MODULE_FILE := $(GEN) +include $(BUILD_PREBUILT) +BUILT_PRODUCT_MANIFEST := $(LOCAL_BUILT_MODULE) +endif + VINTF_VNDK_VERSION := FRAMEWORK_MANIFEST_INPUT_FILES := DEVICE_MATRIX_INPUT_FILE := +PRODUCT_MANIFEST_INPUT_FILES := |