Merge changes from topic "libvintf_cp" (0998353f) · Commits · e / os / android_build

target/board/Android.mk

+10 −2

Original line number	Diff line number	Diff line
		@@ -83,7 +83,7 @@ $(GEN): PRIVATE_FLAGS :=
		ifeq ($(PRODUCT_FULL_TREBLE),true)
		ifdef BUILT_VENDOR_MATRIX
		$(GEN): $(BUILT_VENDOR_MATRIX)
		$(GEN): PRIVATE_FLAGS := -c "$(BUILT_VENDOR_MATRIX)"
		$(GEN): PRIVATE_FLAGS += -c "$(BUILT_VENDOR_MATRIX)"
		endif
		endif

		@@ -110,7 +110,7 @@ $(GEN): PRIVATE_FLAGS :=
		ifeq ($(PRODUCT_FULL_TREBLE),true)
		ifdef BUILT_VENDOR_MANIFEST
		$(GEN): $(BUILT_VENDOR_MANIFEST)
		$(GEN): PRIVATE_FLAGS := -c "$(BUILT_VENDOR_MANIFEST)"
		$(GEN): PRIVATE_FLAGS += -c "$(BUILT_VENDOR_MANIFEST)"
		endif
		endif

		@@ -130,6 +130,14 @@ else
		FRAMEWORK_VBMETA_VERSION := 0.0
		endif

		# All kernel versions that the system image works with.
		$(GEN): test/vts-testcase/kernel/config/data/android-3.18/android-base.cfg
		$(GEN): test/vts-testcase/kernel/config/data/android-4.4/android-base.cfg
		$(GEN): test/vts-testcase/kernel/config/data/android-4.9/android-base.cfg
		$(GEN): PRIVATE_FLAGS += --kernel=3.18:test/vts-testcase/kernel/config/data/android-3.18/android-base.cfg
		$(GEN): PRIVATE_FLAGS += --kernel=4.4:test/vts-testcase/kernel/config/data/android-4.4/android-base.cfg
		$(GEN): PRIVATE_FLAGS += --kernel=4.9:test/vts-testcase/kernel/config/data/android-4.9/android-base.cfg

		$(GEN): $(FRAMEWORK_COMPATIBILITY_MATRIX_FILE) $(HOST_OUT_EXECUTABLES)/assemble_vintf
		# TODO(b/37405869) (b/37715375) inject avb versions as well for devices that have avb enabled.
		POLICYVERS=$(POLICYVERS) \