| commit | fda45fdbe131248eddf49e1bf95d61d9d7bddc75 | [log] [tgz] |
|---|---|---|
| author | Nan Zhang <nanzhang@google.com> | Thu Sep 21 14:45:28 2017 -0700 |
| committer | Nan Zhang <nanzhang@google.com> | Thu Sep 21 16:51:18 2017 -0700 |
| tree | 3d0e4e87f386fbb2ddbbb8b46abea159b5eaa768 | |
| parent | bedc2110b75e16cca60aafb9de99d6b99253848a [diff] |
Re-org the merge_zips logiic under Turbine rule. Mac java build has flaky error for merge_zips. The error happend is because both turbine.jar.premerged and static_java_libs are missing. We allow one of them can be missing, but we don't allow both of them are missing. So re-org the merge_zips logic to see if the input of Turbine is empty or it is due to Turbine internal. Bug: b/66441248 Test: m clean && m -j32 Change-Id: I3c4b15004fd67fef2b83eabc36841bc8c8ff6e4c