| commit | 9bd540594d6ad11694145ed52b957cca5cd2c496 | [log] [tgz] |
|---|---|---|
| author | Nan Zhang <nanzhang@google.com> | Wed Sep 13 13:13:53 2017 -0700 |
| committer | Nan Zhang <nanzhang@google.com> | Tue Sep 19 18:49:33 2017 -0700 |
| tree | f2df17aaac58031c421abd4522e114c4447710ed | |
| parent | 729a221a16fef9141b379354474f7a02061fe802 [diff] |
Use merge_zips to merge jars during Java build in Make. 1. Use merge_zips to merge jars without unzipping/rezipping static Java libraries. And seperate merging process as a independent Make target so that Javac can only depend on Turbine. 2. Remove duplicate vars: "full_java_lib_deps" in droiddoc.mk 3. Also use classes-header.jar for link_apk & link_instr Bug: b/65455145 Test: m clean && m -j32 Change-Id: I7b0307664a6b86075c983284fce099bd3946318c