NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "build: Change target name to pineapple-allyes"

Browse source
This commit is contained in:
qctecmdr 2023-03-28 16:39:00 -07:00 • committed by Gerrit - the friendly Code Review server
commit 0e821530c3
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
msm_common.bzl
View file

@ -35,8 +35,7 @@ def gen_config_without_source_lines(build_config, target):
def get_out_dir(msm_target, variant):
if msm_target.find("allyes") != -1:
le_target = msm_target.split(".")[0];
return "out/msm-kernel-{}-{}".format(le_target.replace("-", "_"), variant.replace("-", "_"))
return "out/msm-kernel-{}-{}".format(msm_target.replace("_", "-"), variant.replace("-", "_"))
return "out/msm-kernel-{}-{}".format(msm_target.replace("-", "_"), variant.replace("-", "_"))
def define_signing_keys():

11
msm_kernel_le.bzl
View file

@ -170,6 +170,7 @@ def _define_kernel_dist(target, msm_target, variant):
"""
dist_dir = get_out_dir(msm_target, variant) + "/dist"
le_target = msm_target.split("-")[0];
msm_dist_targets = [
# do not sort
@ -177,7 +178,7 @@ def _define_kernel_dist(target, msm_target, variant):
":{}_images".format(target),
":{}_merged_kernel_uapi_headers".format(target),
":{}_build_config".format(target),
":{}_dummy_files".format(msm_target),
":{}_dummy_files".format(le_target),
]
copy_to_dist_dir(
@ -234,7 +235,7 @@ def define_msm_le(
# Enforce format of "//msm-kernel:target-foo_variant-bar" (underscore is the delimeter
# between target and variant)
target = msm_target.replace("_", "-") + "_" + variant.replace("_", "-")
le_target = msm_target.split(".")[0];
le_target = msm_target.split("-")[0];
dtb_list = get_dtb_list(le_target)
dtbo_list = get_dtbo_list(le_target)
@ -271,10 +272,10 @@ def define_msm_le(
boot_image_outs = ["boot.img"],
)
_define_kernel_dist(target, le_target, variant)
_define_kernel_dist(target, msm_target, variant)
define_abl_dist(target, le_target, variant)
define_abl_dist(target, msm_target, variant)
define_dtc_dist(target, le_target, variant)
define_dtc_dist(target, msm_target, variant)
define_extras(target, flavor = "allyes")

2
pineapple_allyes.bzl
View file

@ -2,7 +2,7 @@ load(":target_variants.bzl", "le_variants")
load(":msm_kernel_le.bzl", "define_msm_le")
load(":image_opts.bzl", "boot_image_opts")
target_name = "pineapple.allyes"
target_name = "pineapple-allyes"
def define_pineapple_allyes():
_pineapple_le_in_tree_modules = [

2
target_variants.bzl
View file

@ -12,7 +12,7 @@ la_variants = [
le_targets = [
# keep sorted
"pineapple.allyes",
"pineapple-allyes",
]
le_variants = [