Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3528bab7 authored by Steve Muckle's avatar Steve Muckle Committed by android-build-merger
Browse files

Merge "change kernel config naming convention" am: f4fdfc32 am: 0564f4d6 am: 25b62557 

am: a156c4fd

Change-Id: Id7b51c88ac8698f7b58c7a815c0a19766baffc01
parents cfb94787 a156c4fd

compatibility_matrices/compatibility_matrix.mk

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#       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_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.



ifndef LOCAL_MODULE
@@ -80,10 +80,10 @@ endif # LOCAL_ADD_VBMETA_VERSION 
ifneq (,$(strip $(LOCAL_KERNEL_CONFIG_DATA_PATHS)))

$(GEN): PRIVATE_KERNEL_CONFIG_DATA_PATHS := $(LOCAL_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),\

	--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



my_matrix_src_files := \