diff options
| author | Yifan Hong <elsk@google.com> | 2020-03-20 12:50:57 -0700 |
|---|---|---|
| committer | Yifan Hong <elsk@google.com> | 2020-03-20 13:08:18 -0700 |
| commit | bb842a65ed0be3e762b1f2214fa20a45cd5ade83 (patch) | |
| tree | 09a424334e48eda9c035d08e32f17281a6550af9 /vintfdata | |
| parent | 2ffda9ee7049466c90152b892a311b7d74047cfa (diff) | |
| download | libhidl-bb842a65ed0be3e762b1f2214fa20a45cd5ade83.tar.gz | |
Move vendor-ndk and system-sdk to system_ext manifest
... from system manifest. Needed for CSI.
Bug: 137712494
Test: m check-vintf-all and inspect output
Change-Id: Ibc2444d56bb0d8801378403bcc60a120b8b18fa8
Diffstat (limited to 'vintfdata')
| -rw-r--r-- | vintfdata/Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vintfdata/Android.mk b/vintfdata/Android.mk index c8dd7d4..bca1cdc 100644 --- a/vintfdata/Android.mk +++ b/vintfdata/Android.mk @@ -75,11 +75,8 @@ LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/vintf GEN := $(local-generated-sources-dir)/manifest.xml -$(GEN): PRIVATE_VINTF_VNDK_VERSION := $(VINTF_VNDK_VERSION) $(GEN): PRIVATE_SYSTEM_MANIFEST_INPUT_FILES := $(SYSTEM_MANIFEST_INPUT_FILES) $(GEN): $(SYSTEM_MANIFEST_INPUT_FILES) $(HOST_OUT_EXECUTABLES)/assemble_vintf - PROVIDED_VNDK_VERSIONS="$(PRIVATE_VINTF_VNDK_VERSION) $(PRODUCT_EXTRA_VNDK_VERSIONS)" \ - PLATFORM_SYSTEMSDK_VERSIONS="$(PLATFORM_SYSTEMSDK_VERSIONS)" \ $(HOST_OUT_EXECUTABLES)/assemble_vintf \ -i $(call normalize-path-list,$(PRIVATE_SYSTEM_MANIFEST_INPUT_FILES)) \ -o $@ @@ -115,7 +112,10 @@ LOCAL_SYSTEM_EXT_MODULE := true LOCAL_MODULE_RELATIVE_PATH := vintf GEN := $(local-generated-sources-dir)/manifest.xml $(GEN): PRIVATE_SYSTEM_EXT_MANIFEST_FILES := $(SYSTEM_EXT_MANIFEST_INPUT_FILES) +$(GEN): PRIVATE_VINTF_VNDK_VERSION := $(VINTF_VNDK_VERSION) $(GEN): $(SYSTEM_EXT_MANIFEST_INPUT_FILES) $(HOST_OUT_EXECUTABLES)/assemble_vintf + PROVIDED_VNDK_VERSIONS="$(PRIVATE_VINTF_VNDK_VERSION) $(PRODUCT_EXTRA_VNDK_VERSIONS)" \ + PLATFORM_SYSTEMSDK_VERSIONS="$(PLATFORM_SYSTEMSDK_VERSIONS)" \ $(HOST_OUT_EXECUTABLES)/assemble_vintf \ -i $(call normalize-path-list,$(PRIVATE_SYSTEM_EXT_MANIFEST_FILES)) \ -o $@ |