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

Commit 9f666657 authored by Rob Seymour's avatar Rob Seymour Committed by Automerger Merge Worker
Browse files

Merge "Update check_target_files_vintf to check the last line of stdout." am: e78ed3ed 

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



Change-Id: I1a8fddf55fdb0bd2ca18a803eb291ccc71183ac6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c5aa1d26 e78ed3ed

tools/releasetools/check_target_files_vintf.py

+2 −1
Original line number Diff line number Diff line
@@ -142,9 +142,10 @@ def CheckVintfFromExtractedTargetFiles(input_tmp, info_dict=None): 
    command = common_command + sku_args

    proc = common.Run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)

    out, err = proc.communicate()

    last_out_line = out.split()[-1] if out != "" else out

    if proc.returncode == 0:

      logger.info("Command `%s` returns 'compatible'", ' '.join(command))

    elif out.strip() == "INCOMPATIBLE":

    elif last_out_line.strip() == "INCOMPATIBLE":

      logger.info("Command `%s` returns 'incompatible'", ' '.join(command))

      success = False

    else: