summaryrefslogtreecommitdiffstats
path: root/core/host_dalvik_java_library.mk
Commit message (Collapse)AuthorAgeFilesLines
* Add support for RMTYPEDEF with JackYohann Roussel2015-05-281-1/+1
| | | | | Bug: 21099584 Change-Id: I39aa1f24780c216e978ef743098ca7ac65b2962e
* Use Jack launcherYohann Roussel2015-04-151-1/+1
| | | | | Bug: 20132430 Change-Id: I6e30ad3dffbb32824a4c62e562359b084e6a8784
* Improved nothing-to-do-buildYing Wang2015-02-261-4/+4
| | | | | | | | | | | | | - Removed unnecessary dependency of "$(my_symlink) : $(LOCAL_INSTALLED_MODULE)" We can generate symlink to nonexistent file. Actually in multilib build $(LOCAL_INSTALLED_MODULE) points to file that may not be the target file of the symlink and leads to always obsolete $(my_symlink) in the above dependnecy. - Touch by-product in the dummy rule, to make sure the by-product is newer than the main-product. Change-Id: I2f0e0cc197c49f920fa1f6794083b21cdc333c20
* Force make to check date of classes.jack after Jack runYohann Roussel2015-02-051-0/+4
| | | | | Bug: 19230260 Change-Id: Ibcbacd9e0630cd295ad262bd152fc070866071d2
* Engage Jack incremental on demandYohann Roussel2015-02-041-4/+12
| | | | | | | | | | | Each module may engage Jack incremental with LOCAL_JACK_ENABLED := incremental Include renaming of LOCAL_USE_JACK to LOCAL_JACK_ENABLED that is now accepting 3 values "disabled", "full" and "incremental". Change-Id: Icbff275b397bee36b29312e821f3e8d45f83fbcc
* am 7c05897b: am e937ac81: Merge "Add new build flag LOCAL_DONT_DELETE_JAR_DIRS."Ying Wang2015-01-291-0/+1
|\ | | | | | | | | * commit '7c05897b69801e1945889a9b1a89b86bbbbbdd3a': Add new build flag LOCAL_DONT_DELETE_JAR_DIRS.
| * Add new build flag LOCAL_DONT_DELETE_JAR_DIRS.Fredrik Roubert2015-01-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Normally the build function initialize-package-file will delete all class files and all directory entries from JAR files, but sometimes external projects (eg. ICU4J) depend on having directory entries in their JAR files. This change adds the flag LOCAL_DONT_DELETE_JAR_DIRS (analogous to the flag LOCAL_DONT_DELETE_JAR_META_INF) which when set will skip deletion of directory entries in initialize-package-file. Change-Id: I4464b947b7528fca23925affa95e4071915f04d4
* | am 21f78782: am 1b140e16: Merge "Build hostdex on only Linux."Ying Wang2015-01-261-0/+3
|\ \ | |/ | | | | | | | | * commit '21f78782d5e59a58e664e9ae52f537cee314f407': Build hostdex on only Linux. Fix comma in $(if ...).
| * Build hostdex on only Linux.Ying Wang2015-01-261-0/+3
| | | | | | | | Change-Id: I9213684e4c65632c54e9929f693f4b6a24beb95a
* | Fix host_dalvik_java_library with JackYohann Roussel2015-01-261-1/+1
| | | | | | | | | | | | Looks like this was a bad conflict resolution. Change-Id: I7d2f3d51f1d6d9219ebec6c9342e17051c763168
* | resolved conflicts for merge of 0f205ad9 to masterYing Wang2015-01-221-1/+1
|\ \ | |/ | | | | Change-Id: Ic741805a0037d8d29d7d5ff6e2b6e83067943f12
| * Running jarjar on Java resources.Ying Wang2015-01-211-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, Java resources are added as a separate step (add-java-resources-to-package) after dex is run, so jarjar isn't run on the resource files. With this change, we add Java resources immediately after we call javac, so jarjar is run on the resource files (the module's own resource, as well as resources carried by static Java libraries). When we generate the final apk/jar, we use the jarjar'ed jar as the inital pacakge file, with class files and empty folders removed. (cherry-picked from commit 140274707e31c9585aa28b0de2f1418c64ecd272) Bug: 18837479 Change-Id: I15ecf282bfb65fd53dd03fbd03dd4c71927c186a
* | Running jarjar on Java resources.Ying Wang2015-01-211-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, Java resources are added as a separate step (add-java-resources-to-package) after dex is run, so jarjar isn't run on the resource files. With this change, we add Java resources immediately after we call javac, so jarjar is run on the resource files (the module's own resource, as well as resources carried by static Java libraries). When we generate the final apk/jar, we use the jarjar'ed jar as the inital pacakge file, with class files and empty folders removed. When jack is enabled, in jack-java-to-dex we add the Java resources to a temp jar using the PRIVATE_EXTRA_JAR_ARGS, and extrac the files in a temp dir. Jack will process the resource files and output the result to PRIVATE_JACK_INTERMEDIATES_DIR. When we package the final apk/jar, we need to call add-carried-jack-resources to readd the resources. (TODO: if jack can output all resources to a jar/zip file, we can use that file as the initial package file as well.) Bug: 18837479 Change-Id: I8d7296e30ec8d005054cf04c4f2aed6d7a0d823b
* | Revert "Use Jack to check build"Jean-Philippe Lesot2015-01-201-4/+0
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 8bc90fd2d6ccf70b65d2d3aad22b0453b86a262d. This CL also impacts standard targets. With Jack enabled, a global 'make' without that CL produce ~287 dex files, with this CL, it produces ~697 dex files. Bug: 19069325 Change-Id: I39853da0cba8226f31037733edc420507d76c8c0
* | Use Jack to check buildYohann Roussel2015-01-151-0/+4
| | | | | | | | | | | | Of modules that are to be compiled with Jack. Change-Id: Ie8bd00f67f09c0e5ed8fe650f5131a3dfc29e277
* | Compile using Jack.Yohann Roussel2014-12-021-0/+30
|/ | | | | | | | | | | | | | | | | | | | | | | | This allows to compile dex targeted java sources using Jack and Jill. Default is still to compile with the legacy toolchain. Default can be switched to the new toolchain by setting environement variable: export ANDROID_COMPILE_WITH_JACK=true Toolchain can also be forced for one module by defining LOCAL_USE_JACK:=true # false in the mk portion defining the module. Jack execution environement can be controlled with: Global variable ANDROID_JACK_VM allow to change the jvm executing Jack. Global variable ANDROID_JACK_VM_ARGS allows to change default args given to the jvm. Global variable ANDROID_JACK_EXTRA_ARGS allows to define some default args to give to Jack LOCAL_JACK_VM_ARGS allows to override default args given to the jvm for the module. LOCAL_JACK_EXTRA_ARGS allows to override default args passed to Jack. Change-Id: Ib81a0fd5f86a51d1e0edbb81cc791d828a05dd29
* Make modules depend on their makefile.Dan Albert2014-11-111-2/+8
| | | | | | | | This should obviate much of the need for cleanspecs, and also make it unnecessary to continue adding LOCAL_ADDITIONAL_DEPENDENCIES for this sort of thing all over the tree. Change-Id: I97aa8fd280ae868a5f6364f8b7bf3c2fe235d6ce
* resolved conflicts for merge of 8fd9944e to masterBrian Carlstrom2014-06-181-1/+1
|\ | | | | | | Change-Id: I1ceda92267675d4ca460b6f990c0acea4b4812a8
| * Switch from core to core-libartBrian Carlstrom2014-06-181-1/+1
| | | | | | | | | | Bug: 14298175 Change-Id: I1db40e7c67322d80a108b2b88e6d2e6d275d7898
| * Rework the generation of host java libraries.Narayan Kamath2013-11-251-0/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | We currently have two types of host libraries, those meant for the host VM (Sun, OpenJDK etc.) and those meant for a host dalvik build. The former need to be compiled against the host standard libraries and the latter need to be compiled against libcore. This change introduces two new build rules to complement the existing the existing host rules. BUILD_HOST_DALVIK_JAVA_LIBRARY : Build a java library for a host build of dalvik. Bootclasspath will be set to a host build of libcore. BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY : Build a static java library for a host build of dalvik. Bootclasspath will be set to a host build of libcore. This change also removes support for the LOCAL_BUILD_HOST_DEX flag, which is now unnecessary. bug: 8992787 (cherry picked from commit 0dd273a3f68364045c0e8bdcc10a4ecd3c07b745) Change-Id: I3569fff8eaa4d26d55fcc317bd98471f55d74c14
* Support more precise package exclusion from JAR files.Jeff Brown2014-05-231-0/+1
| | | | | | | | | | | | Allow LOCAL_JAR_PACKAGES to work on subpackages. Previously it only worked on top-level packages due to a bug in how the directories were recursively deleted. Add LOCAL_JAR_EXCLUDE_PACKAGES to allow specific subpackages to be excluded. This rule applies after LOCAL_JAR_PACKAGES has selected which packages to include. It may also be used independently. Change-Id: Ibd0e495be1a20c84b59c9da132e92100ef3f8705
* Rework the generation of host java libraries.Narayan Kamath2013-11-071-0/+106
We currently have two types of host libraries, those meant for the host VM (Sun, OpenJDK etc.) and those meant for a host dalvik build. The former need to be compiled against the host standard libraries and the latter need to be compiled against libcore. This change introduces two new build rules to complement the existing the existing host rules. BUILD_HOST_DALVIK_JAVA_LIBRARY : Build a java library for a host build of dalvik. Bootclasspath will be set to a host build of libcore. BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY : Build a static java library for a host build of dalvik. Bootclasspath will be set to a host build of libcore. This change also removes support for the LOCAL_BUILD_HOST_DEX flag, which is now unnecessary. bug: 8992787 Change-Id: I3569fff8eaa4d26d55fcc317bd98471f55d74c14
generated by cgit v1.1 at 2024-05-19 08:19:38 +0000