summaryrefslogtreecommitdiffstats
path: root/core/java.mk
Commit message (Collapse)AuthorAgeFilesLines
* [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)
* 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 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
* | | 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
* | 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 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
* | | am e4cbc2af: Merge "Revert "Add support for prebuilt AARs."" into lmp-mr1-ub-devNick Kralevich2014-11-021-3/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'e4cbc2af5f476d9eb875253584260bed807acddf': Revert "Add support for prebuilt AARs."
| * | Revert "Add support for prebuilt AARs."Nick Kralevich2014-11-021-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | master doesn't compile anymore. This reverts commit f56729250448200834c5c95c86c937e887d73623. Change-Id: Icc16fe5360d1222740b803e9dd006081e3c66e46
* | | am f5672925: Add support for prebuilt AARs.Ying Wang2014-10-311-0/+3
|\ \ \ | |/ / | | / | |/ |/| * commit 'f56729250448200834c5c95c86c937e887d73623': Add support for prebuilt AARs.
| * Add support for prebuilt AARs.Ying Wang2014-10-291-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: I478913d5d498f800b322529d7c2c2c0ea78425e5
* | am 427d1e98: Merge "Pull in latest protolib when using ↵Jeff Davidson2014-10-291-3/+15
|\ \ | |/ |/| | | | | | | | | LOCAL_PROTOC_OPTIMIZE_TYPE." * commit '427d1e98eceb78f5cb8f1e50d00d342fc7f359c6': Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE.
| * Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE.Jeff Davidson2014-10-231-3/+15
| | | | | | | | | | | | | | | | If a module is explicitly depending on a versioned protolib, we strip the dependency and log a warning so the unneeded dependency can be removed. Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
| * Support dx generating multiple dex files.Yohann Roussel2014-07-161-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dx is now capable of generating multiple dex file in one run. This capability is not compatible with --output=*.dex so this CL changes the --output argument to be a directory. This CL also includes the packaging of the multiple dex files when dx generates more than one dex file. (cherry picked from commit 8ffe9c3e7967ec9c6c6e9a03095454dc1b073c3b) Conflicts: core/java.mk Change-Id: I1ddc91b416de5929d4d4b41824c6012b32f94deb
* | am 0ab5cc6b: am 99332f11: Allow for opt-in of proguard shrinking of tests ↵Mark Renouf2014-09-101-1/+4
|\ \ | | | | | | | | | | | | | | | | | | with new flag * commit '0ab5cc6b8e04e0a07778f3c620a9edac3a40bc4e': Allow for opt-in of proguard shrinking of tests with new flag
| * | Allow for opt-in of proguard shrinking of tests with new flagMark Renouf2014-09-091-1/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By adding 'shrinktests' to LOCAL_PROGUARD_ENABLED, the -dontshrink flag will be omitted from the resulting proguard config allowing tests to have unnecessary classes removed before dexxing. Clockwork is running into 64k method limits on some tests which depend on GmsCore. On 4.4W (klp-modular-dev) we don't have the option for multi-dex so proguard is the only solution here. This change leaves the default behavior unchanged. Shrinking is still disabled for tests by default unless the 'shrinktests' flag is set in the Makefile. Change-Id: Ib586ae9e7f617072b41e95742559bf7c8a6a6ce1
* | Support "LOCAL_SDK_VERSION := system_current"Ying Wang2014-07-191-2/+4
| | | | | | | | | | | | | | | | A module can declare "LOCAL_SDK_VERSION := system_current" to build against the android system stubs generated from source. For now this is only supported in platform build. Change-Id: I1e9bbd159886bc0ea3a02b1dc4cbcb1a56e9cb15
* | 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
* | Fix the path for findbugs.Yuncheol Heo2014-05-201-1/+1
| | | | | | | | Change-Id: I45485f1aeaf7fc3db2839f42829278d8c0ec97e3
* | am 74b71317: am 2d72094f: am 960d919e: resolved conflicts for merge of ↵Ying Wang2014-02-101-1/+7
|\ \ | |/ | | | | | | | | | | 4df82b3e to klp-dev-plus-aosp * commit '74b71317711fe4bacc6422e45de599fea840f061': Allow proguarding the main app and the test app in a single run.
| * resolved conflicts for merge of 4df82b3e to klp-dev-plus-aospYing Wang2014-02-081-1/+7
| |\ | | | | | | | | | Change-Id: I7a1d9e1954ede06a818814bd05a77c69f1ed3bc6
| | * Allow proguarding the main app and the test app in a single run.Mihail Dumitrescu2014-02-071-1/+7
| | | | | | | | | | | | | | | Bug: 12895101 Change-Id: I6804d73306a164d3e3ec0cab4743f9582b5ef2cf
* | | am 03a06f41: am 9507a0fd: am 82c59aef: am 71e8a22e: Merge "Add DEXPREOPT ↵Ying Wang2013-12-181-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | support for ART" * commit '03a06f4158e9eea9152f25286fcf2c30044d4e06': Add DEXPREOPT support for ART
| * | Add DEXPREOPT support for ARTBrian Carlstrom2013-12-171-0/+5
| | | | | | | | | | | | Change-Id: I24d0d7b2a23a769f5d69bd4dc14be22e1475b759
| * | Add FORCE_BUILD_RS_COMPAT option.Stephen Hines2013-11-271-1/+1
| |/ | | | | | | | | | | | | | | This enables the .so libraries to be built for apps using the RenderScript support library. Traditionally, we trim these .so files from full platform builds. Change-Id: I6f8e9b8d2b671338d3d5a5ac0bfcc60fd448688b
| * Drop the [no]proguard. prefix for the intermediate targetsYing Wang2013-09-121-17/+1
| | | | | | | | | | | | | | | | | | | | Since we have enabled Progaurd for all build variants, we don't need the different naming scheme along the path to make incremental build work properly when you switch build variant. As a result, this fixes the nothing-to-do-do-build-gets-something-build bug introduced by the multi-dex change. Change-Id: I907ff13091013d28910b0aa190b9218144385132
* | Add FORCE_BUILD_RS_COMPAT option.Stephen Hines2013-09-301-1/+1
| | | | | | | | | | | | | | | | This enables the .so libraries to be built for apps using the RenderScript support library. Traditionally, we trim these .so files from full platform builds. Change-Id: I6f8e9b8d2b671338d3d5a5ac0bfcc60fd448688b
* | Drop the [no]proguard. prefix for the intermediate targetsYing Wang2013-09-121-17/+1
| | | | | | | | | | | | | | | | | | | | Since we have enabled Progaurd for all build variants, we don't need the different naming scheme along the path to make incremental build work properly when you switch build variant. As a result, this fixes the nothing-to-do-do-build-gets-something-build bug introduced by the multi-dex change. Change-Id: I907ff13091013d28910b0aa190b9218144385132
* | am 54e81f54: am 37b82aac: Skip compiling Java if an apk has no Java code.Ying Wang2013-08-281-2/+2
|\ \ | |/ | | | | | | * commit '54e81f546ccbb82b1b3a6d27026f8c58bd24731d': Skip compiling Java if an apk has no Java code.
| * Skip compiling Java if an apk has no Java code.Ying Wang2013-08-281-2/+2
| | | | | | | | Change-Id: Iee204e03ad5bc8ce5c3b4b3863c19c89184826e2
* | resolved conflicts for merge of 9915650b to masterYing Wang2013-08-281-17/+19
|\ \ | |/ | | | | Change-Id: Ice0f39a84363b76ea37801eb09a1d5cfd79d38fe
| * Better handle of need_compile_java.Ying Wang2013-08-281-17/+19
| | | | | | | | Change-Id: I609a27e2b35b08962243b6516c6c525c0c938d3c
* | am 161aa74d: am 576e0146: Make it a fatal error if no source files for Java ↵Ying Wang2013-08-281-1/+1
|\ \ | |/ | | | | | | | | | | module. * commit '161aa74de6aaa03d67f9dac10b71f15ebe728b3c': Make it a fatal error if no source files for Java module.
| * Make it a fatal error if no source files for Java module.Ying Wang2013-08-281-1/+1
| | | | | | | | Change-Id: Ia04158c11381b6b1687b9d5c699a9ea8ae3cb317
* | am 670a7a63: am c5b72527: am ec3c15e5: am 04c4d34d: am 7311a344: Make it ↵Ying Wang2013-08-231-20/+52
|\ \ | |/ | | | | | | | | | | easier to enable obfuscation and optimization. * commit '670a7a6389948c325399ae9bb3dc6a678f9982f8': Make it easier to enable obfuscation and optimization.
| * am ec3c15e5: am 04c4d34d: am 7311a344: Make it easier to enable obfuscation ↵Ying Wang2013-08-231-20/+52
| |\ | | | | | | | | | | | | | | | | | | and optimization. * commit 'ec3c15e5c7c11cf3a831898f286c7eb7c216e50f': Make it easier to enable obfuscation and optimization.
| | * Make it easier to enable obfuscation and optimization.Ying Wang2013-08-221-20/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change, use: * LOCAL_PROGUARD_ENABLED := obfuscation # to enable obfuscation * LOCAL_PROGUARD_ENABLED := optimization # to enable optimization * LOCAL_PROGUARD_ENABLED := obfuscation optimization # to enable both Now the meaning of the LOCAL_PROGUARD_ENABLED options: * full: Use the build system's default configurations: with shrink but no obfuscation or optimization, global proguard flags in build/core/proguard.flags are applied. * custom: The same as "full" except no aapt-generated resource-related proguard flags. * nosystem: Don't use any build system's default configurations; but aapt-generated proguard flags are still applied. You are responsible for any other flags. * disabled: Disable proguard. * obfuscation: The same as "full" but with obfuscation enabled. * optimization: The same as "full" but with optimization enabled. * no value (the default): The build system chooses the proper value: "full" if it's an app; "disabled" if it's a library. You can use more than 1 of them in a meaningful combination, for example: LOCAL_PROGUARD_ENABLED := obfuscation optimization Bug: 10307372 Change-Id: Id248caca3048e99547f16559fae74f4afe85c354
* | | Merge "Support dx generating multiple dex files."Yohann Roussel2013-08-221-5/+7
|\ \ \
| * | | Support dx generating multiple dex files.Yohann Roussel2013-08-201-5/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Dx is now capable of generating multiple dex file in one run. This capability is not compatible with --output=*.dex so this CL changes the --output argument to be a directory. This CL also includes the packaging of the multiple dex files when dx generates more than one dex file. Change-Id: I1ddc91b416de5929d4d4b41824c6012b32f94deb
* | | Support to optionally run rmtypedefs.Ying Wang2013-08-141-0/+5
|/ / | | | | | | | | Bug: 10330586 Change-Id: I6ddfca2ec986cf2c82b0942b7a5360508f095e9a
* | Fix typo from previous change to fix the buildMike Lockwood2013-08-061-3/+0
| | | | | | | | Change-Id: I6cf7217eb81abd794339143b7c23456b68808caf
* | Add support for overriding default Java libraries on a per-target basisMike Lockwood2013-08-061-1/+4
| | | | | | | | Change-Id: I425041554867a7ed7d74e1d603f160b2110bc86b
* | Split framework jar.Jeff Brown2013-07-171-1/+2
| | | | | | | | Change-Id: I38c68ac169a4ea10e4640b5d8e24298a6caaf441
* | Add proper deps for jarjar rules files.Torne (Richard Coles)2013-06-051-1/+1
|/ | | | | | | Changes to the jarjar rules file for a module were not causing rebuilds; add the missing dependency. Change-Id: Ib78fa708681cbc414218fe84cc2c4282c619f45f
generated by cgit v1.1 at 2025-03-30 13:08:09 +0000