am e6b9f286: am bc9ade72: am d5415dc7: Merge "Fix: exit code is 0 even when check-boot-jars.py fails"

* commit 'e6b9f2869110a35316022c639bf3d932034783d3':
  Fix: exit code is 0 even when check-boot-jars.py fails
This commit is contained in:
Ying Wang
2015-03-26 23:51:07 +00:00
committed by Android Git Automerger

View File

@@ -64,10 +64,10 @@ def CheckJar(jar):
def main(argv):
if len(argv) < 2:
print __doc__
sys.exit(1)
return 1
if not LoadWhitelist(argv[0]):
sys.exit(1)
return 1
passed = True
for jar in argv[1:]:
@@ -80,4 +80,4 @@ def main(argv):
if __name__ == '__main__':
main(sys.argv[1:])
sys.exit(main(sys.argv[1:]))