aboutsummaryrefslogtreecommitdiffstats
path: root/core/java.mk
Commit message (Expand)AuthorAgeFilesLines
* DO NOT MERGE Skip emma instrumentation if we're using jack.Allen Hair2016-06-271-6/+5
* Make jack_check_timestamp depend on setup-jack-serverColin Cross2016-04-191-1/+1
* Allow to force min sdk given to JackYohann Roussel2016-04-141-0/+4
* Update code coverage filteringSebastien Hertz2016-04-111-2/+4
* Rename emma coverage filesSebastien Hertz2016-03-301-1/+1
* Remove rules for building dex with dxYohann Roussel2016-03-181-2/+0
* Fix jack min sdk version for ub branchesYohann Roussel2016-03-161-3/+9
* Inform Jack of the min sdkYohann Roussel2016-03-161-0/+8
* Use Jack to check buildYohann Roussel2016-03-011-5/+14
* AAPT2: library resource compilationYing Wang2016-02-261-4/+6
* Add support for testing obfuscated app with JackYohann Roussel2016-02-221-7/+16
* Merge "Support code coverage with Jack" am: 4dad88980fSebastien Hertz2016-02-021-0/+13
|\
| * Merge "Support code coverage with Jack"Sebastien Hertz2016-02-021-0/+13
| |\
| | * Support code coverage with JackSebastien Hertz2016-01-271-0/+13
* | | Merge "Use dependency files generated by llvm-rs-cc for Java" am: e786d21854Shinichiro Hamaji2016-02-011-1/+1
|\| |
| * | Use dependency files generated by llvm-rs-cc for JavaShinichiro Hamaji2016-02-011-1/+1
* | | Merge "Revert "Use dependency files generated by llvm-rs-cc for Java"" am: d6...Shinichiro Hamaji2016-02-011-1/+1
|\| |
| * | Merge "Revert "Use dependency files generated by llvm-rs-cc for Java""Shinichiro Hamaji2016-02-011-1/+1
| |\ \
| | * | Revert "Use dependency files generated by llvm-rs-cc for Java"Shinichiro Hamaji2016-02-011-1/+1
* | | | Merge "Use dependency files generated by llvm-rs-cc for Java" am: 3fdb9ad716Shinichiro Hamaji2016-02-011-1/+1
|\| | |
| * | | Merge "Use dependency files generated by llvm-rs-cc for Java"Shinichiro Hamaji2016-02-011-1/+1
| |\| |
| | * | Use dependency files generated by llvm-rs-cc for JavaShinichiro Hamaji2016-01-281-1/+1
| | |/
* | | Merge "Use .KATI_DEPFILE for files generated by aidl-java" am: 465fd483f5Shinichiro Hamaji2016-02-011-1/+2
|\| |
| * | Use .KATI_DEPFILE for files generated by aidl-javaShinichiro Hamaji2016-01-281-1/+2
| |/
* | Support to build with AAPT2Ying Wang2016-01-251-1/+3
* | resolve merge conflicts of 42c42b6971 to master.Yohann Roussel2015-12-221-3/+3
|\|
| * Merge "Always start jack server before first call to jack"Yohann Roussel2015-12-221-3/+3
| |\
| | * Always start jack server before first call to jackYohann Roussel2015-12-091-3/+3
* | | Merge "Reduce unnecessary rebuilds of .dex files with restat=1" am: 542aa57f1dShinichiro Hamaji2015-12-151-0/+7
|\| |
| * | Reduce unnecessary rebuilds of .dex files with restat=1Shinichiro Hamaji2015-12-141-0/+7
* | | Merge changes I1de10391,I4399ca26,Iec3b2b0b am: bff3c9b4c1 am: bae8872294Colin Cross2015-12-011-0/+2
|\| |
| * | Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar filesShinichiro Hamaji2015-11-301-0/+2
* | | Merge "Revert "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files"...Shinichiro Hamaji2015-11-271-2/+0
|\| |
| * | Revert "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files"Shinichiro Hamaji2015-11-271-2/+0
* | | Merge "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files" am: c9a...Shinichiro Hamaji2015-11-261-0/+2
|\| |
| * | Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar filesShinichiro Hamaji2015-11-191-0/+2
| |/
| * Allow control of jack used for compilationYohann Roussel2015-10-211-0/+1
| * Clean call-jack and its callersYohann Roussel2015-10-211-1/+1
* | Add new Test API for CTS testing.Michael Wright2015-11-251-4/+6
* | Add LOCAL_FINDBUGS_FLAGS to support custom findbugs flags.Ying Wang2015-10-211-5/+5
* | Allow control of jack used for compilationYohann Roussel2015-10-141-0/+1
* | resolved conflicts for 5acaa9dc to masterColin Cross2015-09-281-3/+3
|\|
| * resolved conflicts for 953981db to stage-aosp-masterColin Cross2015-09-281-3/+3
| |\
| | * Don't add dependencies on Makefiles when using ninjaColin Cross2015-09-281-3/+3
* | | am 5a4ec4e8: am 3a3c21ca: am 094116f0: Merge "Remove the unnecessary rs_compa...Ying Wang2015-09-261-22/+0
|\| |
| * | am 094116f0: Merge "Remove the unnecessary rs_compatibility_jni_libs install ...Ying Wang2015-09-261-22/+0
| |\|
| | * Remove the unnecessary rs_compatibility_jni_libs install rules.Ying Wang2015-09-251-22/+0
* | | am 6f2e72ec: am cbac8789: am af72e1b3: Merge "Move part of logtags stuff back...Ying Wang2015-09-041-19/+15
|\| |
| * | am af72e1b3: Merge "Move part of logtags stuff back to base_rules.mk."Ying Wang2015-09-041-19/+15
| |\|
| | * Move part of logtags stuff back to base_rules.mk.Yasuhiro Matsuda2015-09-041-19/+15