tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes from topic "libvintf_cp" am: 9bab2f5fa2

Browse source 
am: 0998353f08

Change-Id: Ie8a7521d4c20f871b57267b88488add9d9c22461
This commit is contained in:
Yifan Hong 2017-08-24 19:59:45 +00:00 committed by android-build-merger
commit 1c3670d185
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
target/board/Android.mk
View file

@ -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) \