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

Commit 0f22ebfe authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Improve error message for GetMinSdkVersion" am: a88313f6 am: 9974ee58

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

Change-Id: I48f671890f6e8d336675e94ea682143eeeb0e222
parents 1c855870 9974ee58
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -2245,8 +2245,8 @@ def GetMinSdkVersion(apk_name):
  stdoutdata, stderrdata = proc.communicate()
  if proc.returncode != 0:
    raise ExternalError(
        "Failed to obtain minSdkVersion: aapt2 return code {}:\n{}\n{}".format(
            proc.returncode, stdoutdata, stderrdata))
        "Failed to obtain minSdkVersion for {}: aapt2 return code {}:\n{}\n{}".format(
            apk_name, proc.returncode, stdoutdata, stderrdata))

  for line in stdoutdata.split("\n"):
    # Looking for lines such as sdkVersion:'23' or sdkVersion:'M'.