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

Merge "change kernel config naming convention"

Browse source 
am: f4fdfc325f

Change-Id: I4c9e0e3baa0ec27ecb9e74f4accff4e2d2b91790
This commit is contained in:
Steve Muckle 2018-07-25 16:31:47 -07:00 committed by android-build-merger
commit 0564f4d6a9
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
compatibility_matrices/compatibility_matrix.mk
View file

@ -32,7 +32,7 @@
# assemble_vintf invocation. Format is "VINTF_ENFORCE_NO_UNUSED_HALS=true". # assemble_vintf invocation. Format is "VINTF_ENFORCE_NO_UNUSED_HALS=true".
# LOCAL_ASSEMBLE_VINTF_FLAGS: Add additional command line arguments to assemble_vintf invocation. # LOCAL_ASSEMBLE_VINTF_FLAGS: Add additional command line arguments to assemble_vintf invocation.
# LOCAL_KERNEL_CONFIG_DATA_PATHS: Paths to search for kernel config requirements. Format for each is # LOCAL_KERNEL_CONFIG_DATA_PATHS: Paths to search for kernel config requirements. Format for each is
# <kernel version x.y.z>:<path that contains android-base*.cfg>. # <kernel version x.y.z>:<path that contains android-base*.config>.
# LOCAL_GEN_FILE_DEPENDENCIES: A list of additional dependencies for the generated file. # LOCAL_GEN_FILE_DEPENDENCIES: A list of additional dependencies for the generated file.
ifndef LOCAL_MODULE ifndef LOCAL_MODULE
@ -80,10 +80,10 @@ endif # LOCAL_ADD_VBMETA_VERSION
ifneq (,$(strip $(LOCAL_KERNEL_CONFIG_DATA_PATHS))) ifneq (,$(strip $(LOCAL_KERNEL_CONFIG_DATA_PATHS)))
$(GEN): PRIVATE_KERNEL_CONFIG_DATA_PATHS := $(LOCAL_KERNEL_CONFIG_DATA_PATHS) $(GEN): PRIVATE_KERNEL_CONFIG_DATA_PATHS := $(LOCAL_KERNEL_CONFIG_DATA_PATHS)
$(GEN): $(foreach pair,$(PRIVATE_KERNEL_CONFIG_DATA_PATHS),\ $(GEN): $(foreach pair,$(PRIVATE_KERNEL_CONFIG_DATA_PATHS),\
$(wildcard $(call word-colon,2,$(pair))/android-base*.cfg)) $(wildcard $(call word-colon,2,$(pair))/android-base*.config))
$(GEN): PRIVATE_FLAGS += $(foreach pair,$(PRIVATE_KERNEL_CONFIG_DATA_PATHS),\ $(GEN): PRIVATE_FLAGS += $(foreach pair,$(PRIVATE_KERNEL_CONFIG_DATA_PATHS),\
--kernel=$(call word-colon,1,$(pair)):$(call normalize-path-list,\ --kernel=$(call word-colon,1,$(pair)):$(call normalize-path-list,\
$(wildcard $(call word-colon,2,$(pair))/android-base*.cfg))) $(wildcard $(call word-colon,2,$(pair))/android-base*.config)))
endif endif
my_matrix_src_files := \ my_matrix_src_files := \