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

Commit edd92a40 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-22.2' into a15

parents b0fafe7e 67bbe4a3

build/soong/Android.bp

+29 −0
Original line number Diff line number Diff line
@@ -42,6 +42,22 @@ lineage_generator { 
    ],

}



lineage_generator {

    name: "prebuilt_kernel_includes",



    // The headers extract command

    cmd: "mkdir -p $(KERNEL_BUILD_OUT_PREFIX)$(genDir) && gzip -d < $(TARGET_PREBUILT_KERNEL_HEADERS) | tar -x -C $(KERNEL_BUILD_OUT_PREFIX)$(genDir) && vendor/lineage/tools/clean_headers.sh $(KERNEL_BUILD_OUT_PREFIX)$(genDir)",



    // Directories that can be imported by a cc_* module generated_headers property

    export_include_dirs: [

        "usr/audio/include/uapi",

        "usr/include",

        "usr/include/audio",

        "usr/include/audio/include/uapi",

        "usr/techpack/audio/include",

    ],

}



bootstrap_go_package {

    name: "soong-lineage-mkdir",

    pkgPath: "lineage/soong/mkdir",
@@ -66,6 +82,14 @@ cc_defaults { 
    recovery_available: true,

}



cc_defaults {

    name: "prebuilt_kernel_header_defaults",

    generated_headers: ["prebuilt_kernel_includes"],

    export_generated_headers: ["prebuilt_kernel_includes"],

    vendor_available: true,

    recovery_available: true,

}



cc_library_headers {

    name: "generated_kernel_headers",

    defaults: ["generated_kernel_header_defaults"],
@@ -75,3 +99,8 @@ cc_library_headers { 
    name: "qti_kernel_headers",

    defaults: ["generated_kernel_header_defaults"],

}



cc_library_headers {

    name: "prebuilt_kernel_headers",

    defaults: ["prebuilt_kernel_header_defaults"],

}

build/tasks/kernel.mk

+11 −7
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ 
#

#   TARGET_FORCE_PREBUILT_KERNEL       = Optional, use TARGET_PREBUILT_KERNEL even if

#                                          kernel sources are present

#   TARGET_PREBUILT_KERNEL_HEADERS     = Optional, if this is set, don't warn about prebuilt

#                                          kernel because headers should match

#

#   TARGET_MERGE_DTBS_WILDCARD         = Optional, limits the .dtb files used to generate the

#                                          final DTB image when using QCOM's merge_dtbs script.
@@ -142,6 +144,7 @@ ifeq "$(wildcard $(KERNEL_SRC) )" "" 
    endif



    ifneq ($(HAS_PREBUILT_KERNEL),)

        ifeq ($(TARGET_PREBUILT_KERNEL_HEADERS),)

            $(warning ***************************************************************)

            $(warning * Using prebuilt kernel binary instead of source              *)

            $(warning * THIS IS DEPRECATED, AND IS NOT ADVISED.                     *)
@@ -149,6 +152,7 @@ ifeq "$(wildcard $(KERNEL_SRC) )" "" 
            $(warning * source repository to $(KERNEL_SRC))

            $(warning * for more information                                        *)

            $(warning ***************************************************************)

        endif

        FULL_KERNEL_BUILD := false

        KERNEL_BIN := $(TARGET_PREBUILT_KERNEL)

    else

config/BoardConfigSoong.mk

+2 −1
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ EXPORT_TO_SOONG := \ 
    KERNEL_MAKE_FLAGS \

    PATH_OVERRIDE_SOONG \

    TARGET_KERNEL_CONFIG \

    TARGET_KERNEL_SOURCE

    TARGET_KERNEL_SOURCE \

    TARGET_PREBUILT_KERNEL_HEADERS



# Setup SOONG_CONFIG_* vars to export the vars listed above.

# Documentation here: