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

Commit 18f20fe3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make dir work on multiple paths" am: cd2eca27 am: 626335b7 am:...

Merge "Make dir work on multiple paths" am: cd2eca27 am: 626335b7 am: 59b9e47e am: 29131c2f am: f249306f

Original change: https://android-review.googlesource.com/c/platform/build/+/2053130



Change-Id: Ib4ab3fc6369915092946bdaa7cfabf1968c8229a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9b7531c5 f249306f
Loading
Loading
Loading
Loading
+8 −5
Original line number Diff line number Diff line
@@ -439,10 +439,6 @@ def __base(path):
    """Returns basename."""
    return path.rsplit("/",1)[-1]

def __dir(path):
    """Returns dirname."""
    return path.rsplit("/",1)[0]

def _board_platform_in(g, string_or_list):
    """Returns true if board is in the list."""
    board = g.get("TARGET_BOARD_PLATFORM","")
@@ -533,6 +529,13 @@ def _filter(pattern, text):
                break
    return res

def _dir(paths):
    """Equivalent to the GNU make function $(dir).

    Returns the folder of the file for each path in paths.
    """
    return " ".join([w.rsplit("/",1)[0] for w in __words(paths)])

def _notdir(paths):
    """Equivalent to the GNU make function $(notdir).

@@ -756,7 +759,7 @@ rblf = struct(
    copy_files = _copy_files,
    copy_if_exists = _copy_if_exists,
    cfg = __h_cfg,
    dir = __dir,
    dir = _dir,
    enforce_product_packages_exist = _enforce_product_packages_exist,
    expand_wildcard = _expand_wildcard,
    file_exists = rblf_file_exists,