summaryrefslogtreecommitdiffstats
path: root/core/java.mk
Commit message (Collapse)AuthorAgeFilesLines
* build: Degreenify javamyfluxi2015-10-061-1/+1
| | | | Change-Id: Iac348407997f7e52844af0494ee59762df0819d7
* build-with-colors: moar colorsChirayu Desai2015-10-061-6/+6
| | | | | | | | | | | | | | | | - rename CL_PFX and CL_INS to better match the colors they show. - add more colors. Output of: - most host stuff is yellow - most target stuff is green - installing/copying files is cyan - import/export includes and notice files is cyan - bootimage/recoveryimage is cyan - and some more colors in many places ;) Change-Id: I5532afa4ba608e0a7c408516dc9f912f9ca389f7
* [RenderScript] Only upgrade RS target API for compat build.Miao Wang2015-07-291-4/+6
| | | | | | | | - Fix build Bug: 22796994 Bug: 22693954 Change-Id: Iff91cc4691ea3e4cd8542cdf38245e2aa7724a71
* [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.Miao Wang2015-07-281-7/+15
| | | | | | | | | | | | Bug: 22796994 Bug: 22693954 This change fixes the RS_PREBUILT_LIBPATH when used with 64-bit target devices. It also fixes an issue where the target RenderScript API is below 21 for 64-bit compilation. In those cases, we should always upconvert it to 21 (since that is the first available 64-bit release). Change-Id: I27e9d0bd5c01bac0b3b28e9002333264a55d628f
* Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]Ying Wang2015-07-201-1/+1
| | | | | | | | | - Don't overwrite [TARGET|HOST]_[CC|CXX] with the [CC|CXX]_WRAPPER prefix, so that we can disable the wrapper per module. - Disable ccache on a module when FDO is enabled. Bug: 22612634 Change-Id: Ibc04a4742d589955066c7eceb43a0da9a2b893bc
* Raise progaurd library to platform libraries even for "current" SDK.Ying Wang2015-06-261-2/+2
| | | | | | | | | | | Without this change, if an app with "LOCAL_SDK_VERSION := current" links against a static library that uses removed APIs, the app will fail ProGuard processing because the removed APIs can't be found in the current SDK. This works around the issue. Bug: 18510449 Bug: 20667396 Change-Id: Ia6e2a81cf5ecba972d155e56238ea946f8539411
* Merge "Add support for RMTYPEDEF with Jack" into mnc-devYohann Roussel2015-06-021-1/+1
|\
| * Add support for RMTYPEDEF with JackYohann Roussel2015-05-281-1/+1
| | | | | | | | | | Bug: 21099584 Change-Id: I39aa1f24780c216e978ef743098ca7ac65b2962e
* | Use TARGET_DEFAULT_JAVA_LIBRARIES instead of just framework.Ying Wang2015-05-191-1/+1
|/ | | | | | | | | | - When raising the ProGuard sdk version for platform build, use TARGET_DEFAULT_JAVA_LIBRARIES instead of just framework. - Also added SUPPORT_LIBRARY_ROOT to reference support library resource dir. Bug: 20658265 Change-Id: Ib008d8e70508723db91431a062cac691367f2f6c
* Raise SDK version for ProGuard processing when app links support library.Ying Wang2015-05-051-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | When an app's LOCAL_SDK_VERSION is lower than the support library's LOCAL_SDK_VERSION, we artifically raises the "SDK version" "linked" by ProGuard, to - suppress ProGuard warnings of referencing symbols unknown to the lower SDK version. - prevent ProGuard stripping subclass in the support library that extends class added in the higher SDK version. This allows us to remove the dangerous ProGuard flag "-dontwarn android.support.**". Notes: - We don't raise the app's LOCAL_SDK_VERSION, so that the app's own code is still unable to use the higher SDK version. - For platform build, we can't just raise to the "current" SDK, because would break apps that use APIs removed from the current SDK. We raise it to framework.jar instead, which contains the most complete symbol set. Bug: 20658265 Change-Id: I90099073457a65cb8031fbaec6b396d68ce614a7 (cherry picked from commit 8e8d1e7abadb53d5dcb211fac6ab6ed20f5dc9ac)
* Use Jack launcherYohann Roussel2015-04-151-1/+1
| | | | | Bug: 20132430 Change-Id: I6e30ad3dffbb32824a4c62e562359b084e6a8784
* am ea517854: am aacc8bb4: am 18ecae31: Merge "Convert bc depfiles to .P files."Ying Wang2015-04-041-5/+6
|\ | | | | | | | | * commit 'ea5178545bf939fb65f77cd54eba9f274512638b': Convert bc depfiles to .P files.
| * Convert bc depfiles to .P files.Ying Wang2015-04-031-5/+6
| | | | | | | | | | | | So you don't need clean step when a header file gets moved or deleted. Change-Id: Iec0d63b89ba17c4ef0ad75f4a52b6759f2bff58a
* | am a840faef: am c35e7902: am 555b7770: Merge "Move the inclusion of depfile ↵Ying Wang2015-04-031-5/+5
|\ \ | |/ | | | | | | | | | | to where it\'s generated." * commit 'a840faef517a196e235a197992e8feb9f13c27b7': Move the inclusion of depfile to where it's generated.
| * Move the inclusion of depfile to where it's generated.Ying Wang2015-04-031-5/+5
| | | | | | | | Change-Id: Ib7ed6d7d9105e49961ac467fd1d390060d4f5c38
| * [Renderscript] making librsjni.so be packed with apks whenMiao Wang2015-03-131-2/+6
| | | | | | | | | | | | | | | | v8.renderscript is needed, even for bundled apps. Bug: 19343399 Change-Id: I461e244be15e08d4525439bc042529314c84031e (cherry picked from commit c919b0ba88c0a7ce4b8722b4e3befbc81a652422)
* | Improved nothing-to-do-buildYing Wang2015-02-261-5/+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
* | Change built module of static java librariesYohann Roussel2015-02-181-5/+2
| | | | | | | | | | | | | | | | | | Set LOCAL_BUILT_MODULE of static java libraries when Jack is enabled to classes.jack instead of javalib.jar. This allows that running mm in those libraries will build classes.jack instead of the jar. Change-Id: I96b4b227848e971df96331b3f0cc731e856be349
* | Merge "[Renderscript] making librsjni.so be packed with apks when ↵Miao Wang2015-02-131-2/+6
|\ \ | | | | | | | | | v8.renderscript is needed, even for bundled apps."
| * | [Renderscript] making librsjni.so be packed with apks whenMiao Wang2015-02-121-2/+6
| | | | | | | | | | | | | | | | | | | | | v8.renderscript is needed, even for bundled apps. Bug: 19343399 Change-Id: I461e244be15e08d4525439bc042529314c84031e
* | | Force make to check date of classes.jack after Jack runYohann Roussel2015-02-051-0/+5
|/ / | | | | | | | | Bug: 19230260 Change-Id: Ibcbacd9e0630cd295ad262bd152fc070866071d2
* | Engage Jack incremental on demandYohann Roussel2015-02-041-7/+19
| | | | | | | | | | | | | | | | | | | | | | 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
* | Running jarjar on Java resources.Ying Wang2015-01-211-2/+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. 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
* | Merge "Revert "Use Jack to check build""Jean-Philippe Lesot2015-01-211-5/+2
|\ \
| * | Revert "Use Jack to check build"Jean-Philippe Lesot2015-01-201-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Revert "Running jarjar on Java resources."Narayan Kamath2015-01-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 140274707e31c9585aa28b0de2f1418c64ecd272. Breaks the build on uiautomator_compat. Change-Id: I6d14f39e3432bf5e691027bbb8e7260e4bec8e8d
* | | Running jarjar on Java resources.Ying Wang2015-01-201-2/+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. 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: I15ecf282bfb65fd53dd03fbd03dd4c71927c186a
* | | am 50ef9040: am 2b942f87: Merge "Add build rules for libRSSupportIO ↵Miao Wang2015-01-161-1/+7
|\ \ \ | | |/ | |/| | | | | | | | | | | | | (Usage_IO lib for RS compat lib)" * commit '50ef904068c37792015040c1c28a117fafe328a6': Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)
| * | am 2b942f87: Merge "Add build rules for libRSSupportIO (Usage_IO lib for RS ↵Miao Wang2015-01-161-1/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | compat lib)" * commit '2b942f87f6b74ad9c5381fa96dcb1d46f155779b': Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)
| | * \ Merge "Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)"Miao Wang2015-01-161-1/+7
| | |\ \
| | | * | Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)Miao Wang2015-01-091-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug 12924018 Change-Id: I35af72c1f7788f9fd9cb24bfabdbbad09e865a8b
* | | | | am 0c949bd8: am 64606bd5: Merge "Update protobuf library from 2.3 to 2.6."Jeff Davidson2015-01-161-12/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '0c949bd86773c5d39df11cd824c9df372dc00342': Update protobuf library from 2.3 to 2.6.
| * | | | am 64606bd5: Merge "Update protobuf library from 2.3 to 2.6."Jeff Davidson2015-01-151-12/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '64606bd5b0b702b7f6d7fd1088486b5380ccc25f': Update protobuf library from 2.3 to 2.6.
| | * | | Merge "Update protobuf library from 2.3 to 2.6."Jeff Davidson2015-01-151-12/+0
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Update protobuf library from 2.3 to 2.6.Jeff Davidson2015-01-081-12/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I02d308b01f635307dbb63ea9610db2e56eb1f31b
* | | | | Merge "Use Jack to check build"Yohann Roussel2015-01-151-2/+5
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Use Jack to check buildYohann Roussel2015-01-151-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Of modules that are to be compiled with Jack. Change-Id: Ie8bd00f67f09c0e5ed8fe650f5131a3dfc29e277
* | | | | Merge "Remove some useless depencies"Yohann Roussel2015-01-151-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Remove some useless depenciesYohann Roussel2015-01-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... from dexes to jars. This should allow to build less jars when building dex files with Jack and Jill. Change-Id: Ib3a717251e3bec3cc73564c205eb908ba1ef380f
* | | | | am de00ebbe: am caf44db2: Merge "Add build rules for 64bit Renderscript ↵Miao Wang2015-01-091-2/+14
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | Compat lib." * commit 'de00ebbe24185237a1056fde39cfc839534e31da': Add build rules for 64bit Renderscript Compat lib.
| * | | am caf44db2: Merge "Add build rules for 64bit Renderscript Compat lib."Miao Wang2015-01-091-2/+14
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'caf44db2d1d829a001d5b0ac8371d33928b3d575': Add build rules for 64bit Renderscript Compat lib.
| | * | Add build rules for 64bit Renderscript Compat lib.Miao Wang2015-01-081-2/+14
| | |/ | | | | | | | | | Change-Id: Iea168f8ecb3b4cf6b9ab6ffefc403eb77ee09000
* | | Adapt to Jack and Jill Brest releaseYohann Roussel2014-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes cherry-picks of: 2e78d2f4263bc7c0f90d58af7014017f16aa3ce6 Jack option --import-res was renamed --import-resource fdc913ee86fe0c45581178b901a673fdd7937e03 Update references to Jack type collison policy 8d83d1b21ec678fb9fb1c6ee643ace46d5f700ce Rename jill tmp file 8a1c98ce4ba0b4db39f274d6258b6a08bbc3ec2c Ensure that jar-arg-list is never shared 8d83d1b21ec678fb9fb1c6ee643ace46d5f700ce Remove manipulations of jack libraries Change-Id: I3ee159d408ba5281ac15c9836dc4fd2bdeb845d3
* | | Compile using Jack.Yohann Roussel2014-12-021-13/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 5245bc8b: am 201f6b3e: Merge "Make modules depend on their makefile."Dan Albert2014-11-111-3/+10
|\ \ \ | |/ / | | | | | | | | | * commit '5245bc8b3421b3a9676a9ad650d0804d8d9e2787': Make modules depend on their makefile.
| * | am 201f6b3e: Merge "Make modules depend on their makefile."Dan Albert2014-11-111-3/+10
| |\ \ | | |/ | | | | | | | | | * commit '201f6b3e92a2ef2f3a117f33cd399d5304dd385a': Make modules depend on their makefile.
| | * Make modules depend on their makefile.Dan Albert2014-11-111-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 007026f0: am 3fe170c5: Merge "Add support for prebuilt AARs." into ↵Ying Wang2014-11-031-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | lmp-mr1-ub-dev * commit '007026f0ebf2216d875b9fdab44cc68b659e2307': Add support for prebuilt AARs.
| * | am 3fe170c5: Merge "Add support for prebuilt AARs." into lmp-mr1-ub-devYing Wang2014-11-031-0/+3
| |\ \ | | | | | | | | | | | | | | | | * commit '3fe170c51ea1eca253164fa8738ab42b5b9aaa6b': Add support for prebuilt AARs.
| | * | Add support for prebuilt AARs.Ying Wang2014-11-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - You can give a .aar as source file to a prebuilt static Java library module. The build system will set up dependencies and rules to extract classes.jar and other resource files. - To build against a prebuilt AAR module, use: LOCAL_STATIC_JAVA_AAR_LIBRARIES := <module names of aar prebuilt AARs> The build system will set up rules to merge the library's AndroidManifest.xml with the main AndroidManifest.xml, add the AAR's resource dirs and link/merge the AAR's classes.jar. Bug: 18168693 Change-Id: Ic2c1d20572a93bd98dbc72f8a39e26b459e442c2
generated by cgit v1.1 at 2024-05-19 07:02:34 +0000