diff options
| author | Yifan Hong <elsk@google.com> | 2019-08-30 18:21:53 +0000 |
|---|---|---|
| committer | Yifan Hong <elsk@google.com> | 2019-08-30 12:54:09 -0700 |
| commit | 948b259b52f2a923b2506d8b6804293e43c68817 (patch) | |
| tree | f8522115cdc9e8cb2eba73c631d0448490b28e91 | |
| parent | f833a75283f4aa6af36d678f1c5c5a8999b8ff32 (diff) | |
| download | build-948b259b52f2a923b2506d8b6804293e43c68817.tar.gz | |
Partially Revert "Check VINTF compatibility at OTA generation time."
This partially reverts commit 9276cf0226d341927d0a7e682a8db677e25ae5dd.
Reason for revert: broke mixed build
Put META/{system,vendor}_{manifest,matrix}.xml back because mixed builds
needs this.
Bug: 140217956
Test: mainline builds
Change-Id: I80898a17d6b86b17114b729d905dd9ab10bc927a
| -rw-r--r-- | core/Makefile | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile index 5ae99b7a3d..30a46c2f9f 100644 --- a/core/Makefile +++ b/core/Makefile @@ -4011,6 +4011,10 @@ $(BUILT_TARGET_FILES_PACKAGE): \ $(HOST_OUT_EXECUTABLES)/fs_config \ $(ADD_IMG_TO_TARGET_FILES) \ $(MAKE_RECOVERY_PATCH) \ + $(BUILT_ASSEMBLED_FRAMEWORK_MANIFEST) \ + $(BUILT_ASSEMBLED_VENDOR_MANIFEST) \ + $(BUILT_SYSTEM_MATRIX) \ + $(BUILT_VENDOR_MATRIX) \ $(BUILT_KERNEL_CONFIGS_FILE) \ $(BUILT_KERNEL_VERSION_FILE) \ | $(ACP) @@ -4251,6 +4255,16 @@ ifdef BUILDING_SYSTEM_OTHER_IMAGE $(hide) $(call fs_config,$(zip_root)/SYSTEM_OTHER,system/) > $(zip_root)/META/system_other_filesystem_config.txt endif @# Metadata for compatibility verification. + $(hide) cp $(BUILT_SYSTEM_MATRIX) $(zip_root)/META/system_matrix.xml +ifdef BUILT_ASSEMBLED_FRAMEWORK_MANIFEST + $(hide) cp $(BUILT_ASSEMBLED_FRAMEWORK_MANIFEST) $(zip_root)/META/system_manifest.xml +endif +ifdef BUILT_ASSEMBLED_VENDOR_MANIFEST + $(hide) cp $(BUILT_ASSEMBLED_VENDOR_MANIFEST) $(zip_root)/META/vendor_manifest.xml +endif +ifdef BUILT_VENDOR_MATRIX + $(hide) cp $(BUILT_VENDOR_MATRIX) $(zip_root)/META/vendor_matrix.xml +endif ifdef BUILT_KERNEL_CONFIGS_FILE $(hide) cp $(BUILT_KERNEL_CONFIGS_FILE) $(zip_root)/META/kernel_configs.txt endif |