summaryrefslogtreecommitdiffstats
path: root/core/java.mk
Commit message (Collapse)AuthorAgeFilesLines
* Enable -Wall/-Werror with LOCAL_RENDERSCRIPT_FLAGS.Stephen Hines2011-12-071-0/+6
| | | | Change-Id: Ia2a058e6711839d89072c2e96f0c60aa4cedda6b
* Merge "Provide LOCAL_RENDERSCRIPT_TARGET_API override."Ying Wang2011-09-081-8/+7
|\
| * Provide LOCAL_RENDERSCRIPT_TARGET_API override.Stephen Hines2011-08-291-8/+7
| | | | | | | | | | | | | | | | | | BUG=5206223 This allows us to set the RS API level independent of the other SDK versions that a developer might choose. Change-Id: Id8b476abcbbbdaa86e04ba0ea16414cb2fa5bd15
* | Add filterfw.jar to standard list of java libraries to include.Eino-Ville Talvala2011-08-261-1/+1
|/ | | | | | | | | | Since classes from this jar are part of the public API, it should be included by default. Also add the jar into the dex_preopt list. Bug: 5098987 Change-Id: Ib39deffea43714eb56630ad1d65411cfde5878fd
* Merge "Provide mechanism to override llvm-rs-cc headers."Ying Wang2011-08-241-0/+4
|\
| * Provide mechanism to override llvm-rs-cc headers.Stephen Hines2011-08-231-0/+4
| | | | | | | | Change-Id: I87fd496069a9dfde633e2d232e436fa5d7315cc0
* | Removing target-api option from build.jeffhao2011-08-231-17/+0
|/ | | | | | This is cherry-picked from dalvik-dev. Change-Id: I85cd23c08fcad400e6426cdaad079e91dcd9babf
* Update build to properly use prebuilt llvm-rs-cc.Stephen Hines2011-08-101-7/+22
| | | | Change-Id: I52a83066b6c08d05d69db4f93631eeaf9c0b41c6
* am 823f6389: am 3487736b: am 7d83ef8f: Support custom RenderScript compilerYing Wang2011-06-021-1/+6
|\ | | | | | | | | * commit '823f63894fb4ad5c1280a5ee7eb004792223a488': Support custom RenderScript compiler
| * Support custom RenderScript compilerYing Wang2011-05-271-1/+6
| | | | | | | | Change-Id: I85e38e84565e04f99dd26217f280274883dc322d
* | Use manifest minSdkVersion as "--target-api" in LOCAL_DX_FLAGSYing Wang2011-04-071-5/+21
|/ | | | | | Or use LOCAL_SDK_VERSION, if minSdkVersion is not available. Change-Id: Ia1d6946867e02df953a1685079b2724236d46798
* Support to build renderscript in unbundled apps.Ying Wang2011-03-291-1/+8
| | | | Change-Id: I8104be723f507df4f9673616bada11fb613651b7
* Disable "-t" for acp.Ying Wang2011-01-191-3/+3
| | | | | | | Acp can not handle high resolution file timestamp on ext4. We need this to fix incremental build on ext4. Change-Id: I54e45c73ffa44c4253c7a431375d419fa4dccfd9
* Add external/clang/lib/Headers as llvm-rs-cc's system header search pathYing Wang2011-01-191-2/+4
| | | | | Change-Id: I30257631d484491d9a8346205e411013c76c5a91 Bug: 2943524
* Fix a spelling error.Ficus Kirkpatrick2010-11-121-1/+1
| | | | Change-Id: If89847fa16db4e2b30372678ab8f7117ad5fa0c6
* Integrate protocol buffer compiler into the build system.Ying Wang2010-11-021-6/+12
| | | | | Bug: 3152546 Change-Id: Ida3ca3d633ce45704dc8e80d044cdbd3ca69aca5
* Hook up the dependency.Ying Wang2010-10-111-1/+1
| | | | | | Now llvm-rs-link is directly called by the build system. Change-Id: I281cc6fd9e21ee7d120ddea390f802b57c894fd6
* Make naming consistent: llvm-rs-cc and llvm-rs-link.Shih-wei Liao2010-10-081-2/+2
| | | | Change-Id: I8e8ae27548131b47fbbd037d55b472d095d7bb8f
* Integrate the slang "-MD" into the build system.Ying Wang2010-10-081-2/+7
| | | | | | | So that the header dependency can be included. Bug: 2932230 Change-Id: I4d69870049157206ce2ab637ec6d673467db0c64
* am b7019e21: am a9c381ed: Any intermediate targets between Progaurd and the ↵Ying Wang2010-10-021-12/+9
|\ | | | | | | | | | | | | | | | | built_dex should be differently named. Merge commit 'b7019e2147173a962febeab0e0693cdec9f80789' * commit 'b7019e2147173a962febeab0e0693cdec9f80789': Any intermediate targets between Progaurd and the built_dex should be differently named.
| * Any intermediate targets between Progaurd and the built_dex should be ↵Ying Wang2010-10-021-12/+9
| | | | | | | | | | | | | | | | differently named. Change-Id: Ifb01b1fcf24ba0c5b98aa02dd604cd81918e1841 To do that, we have to move classes.jar step before proguard, so classes.jar is always with the full names.
* | am 3c3bf677: am 0b9382c7: Separate out Proguard flag files to fix dependency.Ying Wang2010-09-301-2/+4
|\ \ | |/ | | | | | | | | | | Merge commit '3c3bf6773ac7e2324c1d06282c625b81f799e427' * commit '3c3bf6773ac7e2324c1d06282c625b81f799e427': Separate out Proguard flag files to fix dependency.
| * Separate out Proguard flag files to fix dependency.Ying Wang2010-09-291-2/+4
| | | | | | | | | | Bug: 3048005 Change-Id: I3e77ca1082cf7c92a43b249e5c887e3fbdf4ba11
* | resolved conflicts for merge of 3453d5f3 to masterYing Wang2010-09-241-20/+37
|\ \ | |/ | | | | Change-Id: If23d2817b4d74d48632776923805c2141da82257
| * Fix dependency when switching between build variants with and without Proguard.Ying Wang2010-09-231-20/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change, in a user build the dependency looks like: package.apk -> progaurd.classes.dex -> ... -> proguard.classes.jar While in an eng build: package.apk -> noproguard.classes.dex -> ... -> noproguard.classes.jar Because package.apk is product-specific and removed when switching between user and eng builds, it can always be built with the correct and up-to-date .dex file. Bug: 3022484 Change-Id: I3a732cb3e256f193088c294dc4a0573188283cb2
| * Tracking merge of dalvik-dev to gingerbreadBrian Carlstrom2010-08-041-1/+1
| | | | | | | | | | | | | | | | | | git cherry-pick --no-commit f2f3e4b2 git cherry-pick --no-commit b6a08f0cd36b12054ac73992a2737ea294387116 git cherry-pick --no-commit d05d74b2d6f717ee25ca14c913ea7610c030ecd1 git cherry-pick --no-commit 5479d77e320420ef0cd7250d1a6729839ef907ce Change-Id: I6f339aa73823e053146719b3af7af91d5375df1c
* | Now slang supports "-I" options.Ying Wang2010-09-011-0/+5
| | | | | | | | Change-Id: I32aef6c913d9d30f9982a593397145f1562aecf9
* | Fix jar dependency on the local manifest file.Ying Wang2010-07-201-1/+1
| | | | | | | | | | Change-Id: I1a868885e72c94c4b065723a8d6e890fce5ba1e0 http://b/issue?id=1444634
* | Build system support for RenderScriptYing Wang2010-07-191-0/+29
| | | | | | | | | | | | | | | | | | With this change, you can add your .rs files to LOCAL_SRC_FILES. The .rs files will be compiled by slang and the output .java files will be compiled into the jar, while the generated .bc files will be put into the final apk as raw resources. Change-Id: Icde3d6139951d6d039b4b37376e72e1fc5c8b0d4
* | am 8b0ecc08: am de6a0857: Fix broken interaction of JarJar and Emma.Steve Howard2010-07-081-20/+21
|\ \ | |/ | | | | | | | | | | Merge commit '8b0ecc08166a4e83a8df5864e5264a88962101f1' * commit '8b0ecc08166a4e83a8df5864e5264a88962101f1': Fix broken interaction of JarJar and Emma.
| * Fix broken interaction of JarJar and Emma.Steve Howard2010-07-071-20/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JarJar, like DX, can't handle the local var corruption that Emma performs. To fix this, I'm moving the JarJar step before the Emma step. Couple other minor changes: * Improved the comment about emma hardcoding its output filename, since this took me about an hour to track down. * Changed one line from "Copying $<" to "Copying $@". It seems to be the convention that such lines print the destination, not the source, so I made it consistent. Change-Id: I9f5c36b4f5af15daf15025b89860e942f15bb668
| * Manual merge of change 50994 from master (DO NOT MERGE)Steve Howard2010-07-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Merging from master because I'm bringing my maps API work into gingerbread. Fix and enable JarJar in Java builds. java.mk contained a target to enable JarJar in Java builds, but it was being bypassed. This change enabled JarJar as part of the build process, and fixes a slight bug with the way it was set up. Change-Id: I814e64eb30b41bf249a63d683c03040e2658fe0d
| * Squashed commit of the following (DO NOT MERGE):Guang Zhu2010-05-181-15/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 7401608f3b9b52b3348e32ec9fefe7583d6c2fa4 Author: Guang Zhu <guangzhu@google.com> Date: Fri Apr 23 11:54:37 2010 -0700 collect emm meta files for emma instrumented build when doing 'make dist', with EMMA_INSTRUMENT on the coverage.em files generated for each module will be collected into one emma_meta.zip file Change-Id: I382c39a97005e6cae5c79ad7eaef1c8857f658af commit 8376d70938f6507d54b66fe5832a637aa883974e Author: Guang Zhu <guangzhu@google.com> Date: Wed Mar 10 15:48:03 2010 -0800 enhancement for building app with emma code coverage * global filter to avoid applying instrumentation on emma classes * remove local variable information at dex step instead of compile time Change-Id: If04c27bc717f34816077a98ead9ceb0dbcbb0d2f Change-Id: I971bd0f291bede2568b21347247d37a7d035c661
* | am 36ce8736: am 77dc0a58: Add a rule that builds an eclipse project file for ↵Joe Onorato2010-05-171-1/+2
|\ \ | |/ | | | | an app.
| * Add a rule that builds an eclipse project file for an app.Joe Onorato2010-05-171-1/+2
| | | | | | | | | | | | Type make ECLIPSE-<app1>-<app2>... with the apps as listed in LOCAL_PACKAGE_NAME. Change-Id: Ieb96dfc9dfc13bdf1b3be53572092fc7bc695869
* | Moving junit out of core.jar and into core-junit.jarJesse Wilson2010-05-111-1/+1
| | | | | | | | | | | | | | | | | | This commit was submitted too early: https://android-git.corp.google.com/g/50610 ...and then rolled back: https://android-git.corp.google.com/g/50622 Change-Id: I5f4e53bd0c892ab64711b99b2e95d2f101626dbc
* | Fix and enable JarJar in Java builds.Steve Howard2010-05-071-2/+2
| | | | | | | | | | | | | | | | java.mk contained a target to enable JarJar in Java builds, but it was being bypassed. This change enabled JarJar as part of the build process, and fixes a slight bug with the way it was set up. Change-Id: If24113f399a168939a1a1d0738c5df57caf8d05f
* | Undo commit: Moving junit out of core.jar and into core-junit.jarJesse Wilson2010-05-041-1/+1
| | | | | | | | Change-Id: I09875ef5f45b1d643ae389a6871cad374d80746b
* | Moving junit out of core.jar and into core-junit.jar.Jesse Wilson2010-05-041-1/+1
| | | | | | | | | | | | | | Also extending the arbitrary limit on build argument sizes, which I ran up against in building after this change. Change-Id: Iba79a37b27e7d5efa2b02a99aa253a2eec7ede75
* | enhancement for building app with emma code coverageGuang Zhu2010-04-201-15/+30
|/ | | | | | | * global filter to avoid applying instrumentation on emma classes * remove local variable information at dex step instead of compile time Change-Id: If04c27bc717f34816077a98ead9ceb0dbcbb0d2f
* Let Proguard load emma jar if it's enabled.Ying Wang2010-03-091-3/+7
| | | | | Change-Id: I57a0bcfb486339f48dc25f5fc5d44a1178dee678 See: http://b/issue?id=2502181
* Turn on Proguard by default for user/userdebug builds.Ying Wang2010-02-191-0/+3
|
* Makefile change for build against historical sdk versions.Ying Wang2010-02-111-1/+5
| | | | | If LOCAL_SDK_VERSION is current, link against the stub, otherwise link against prebuilt historical sdk
* Fix and enable proguard on packages.Ying Wang2010-02-111-16/+30
|
* Add support for LOCAL_JAVACFLAGSBrian Carlstrom2010-02-051-0/+1
| | | | | | | The Dalvik core libraries team would like to start making warnings errors in certain packages by definition LOCAL_JAVACFLAGS. This will allow easier debuging of warnings in other packages by supplying "-Xlint:..." options.
* Fixes ProGuard options.Ying Wang2009-12-091-0/+1
| | | | | | 1. Dedup LOCAL_JAVA_LIBRARIES. 2. Even no resource or asset for a package, we still need to set package_expected_intermediates_COMMON, which is anyway used by ProGuard.
* Add the ability to turn on proguard for java targets, and to call aaptJoe Onorato2009-08-301-5/+39
| | | | | to generate a rules file for proguard for stuff from the manifest and other resources that need to be kept.
* Speed up the full build.Joe Onorato2009-07-171-24/+58
| | | | | | | | | | | | | | | | Now, by default, instead of fully building everything, we skip dexing the modules that aren't going to be included in the current build. This will slow down some of the incremental builds (like tests), but it improves the regular eng build from 27.5 minutes on my Mac Pro to 25 minutes. That's not as much of an improvement as I had hoped for, but it's still better. There is also a change in here that puts the java-source-list file which is used to get around limited command line lengths in the proper directory. Before this change, it was an accident that the directory for that file existed!
* Fix makefile to be compatible with findbugs v 1.3.8Andrew Stadler2009-05-131-3/+2
| | | | modified: core/java.mk
* AI 145618: am: CL 145333 Cloned from CL 144759 by 'g4 patch'.Joe Onorato2009-04-091-0/+15
| | | | | | | | | | | | | | | Original change by joeo@abreu on 2009/04/06 19:54:13. Implement SDK add-ons in the build system. - Add an option to use the standard javadoc doclet instead of droiddoc, since droiddocs non-sdk templates aren't ready for prime time. - Add the notion of a stubs for a library. It's only implemented for java libraries, but when we do native libraries in the NDK or sdk-addons, it will work there too. Original author: joeo Merged from: //branches/cupcake/... Automated import of CL 145618
generated by cgit v1.1 at 2025-03-21 13:25:48 +0000