No description
782695112d
This changes tries to reconcile drift between transform-java-to-classes.jar which is used to build java for the target with transform-host-java-to-package which is used for the host. Several packages such as libcore are built both ways and the drift between these rules was making it hard to make common changes to things such as warning options. The new compile-javac definition tries to include as much as possible from the two previous definitions. Some conflicts it sorts out: - hardwired -g vs PRIVATE_JAVAC_DEBUG_FLAGS - consistent order of arguments - moving PRIVATE_JAVAC_FLAGS to end to allow override of arguments - xlint_unchecked is always conditional based on LOCAL_WARNINGS_ENABLE Now what differs between the two is clear in the transform-java-to-classes and transform-host-java-to-package definitions. Notable differences: - the target case supplies a bootclasspath while the host case does not. - .class files are cleaned up after jaring in the target case, but in the cost case they are left for the sake of the vm-tests target which expects them to be present. That should probably be fixed in the future. - PRIVATE_EXTRA_JAR_ARGS used to package resources into the jar only happens for the host. Its handled by add-java-resources-to-package for the target after dxing. Change-Id: I2fb28f688fbb632102ca63448c2ac911db0477ae |
||
|---|---|---|
| core | ||
| libs/host | ||
| target | ||
| tools | ||
| .gitignore | ||
| buildspec.mk.default | ||
| CleanSpec.mk | ||
| envsetup.sh | ||