Commit graph

308 commits

Author SHA1 Message Date
Ying Wang
5758b8ed96 Remove the R/Manifest classes when building the static Java library
Bug: 5448433

Instead of deferring the removal to building the app.
In that case any R/Manifest classes in any static Java libraries will be
deleted, no matter if they are generated from Android resource, or just
source R.java/Manifest.java in the source tree by accident.

Change-Id: I656f45e3cbc3796c5d4832363231480b3f1dc5b8
2011-12-15 16:36:55 -08:00
Ying Wang
e109a1d08d Allow to build Java module from mere static Java libraries.
With this change, we can easily turn a static Java library to a shared
Java library.

Change-Id: I9915992cd19879846511d6272483d7a0a934e7eb
2011-12-12 17:52:03 -08:00
Stephen Hines
914f7a2990 Enable -Wall/-Werror with LOCAL_RENDERSCRIPT_FLAGS.
Change-Id: Ia2a058e6711839d89072c2e96f0c60aa4cedda6b
2011-12-07 11:41:28 -08:00
Ying Wang
d62de0f884 Merge "Provide LOCAL_RENDERSCRIPT_TARGET_API override." 2011-09-08 14:26:28 -07:00
Stephen Hines
a941d137fa Provide LOCAL_RENDERSCRIPT_TARGET_API override.
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
2011-08-29 19:00:25 -07:00
Eino-Ville Talvala
76a7d82fac Add filterfw.jar to standard list of java libraries to include.
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
2011-08-26 14:22:57 -07:00
Ying Wang
6e41a7483a Merge "Provide mechanism to override llvm-rs-cc headers." 2011-08-24 10:26:41 -07:00
Stephen Hines
d4136c0fc6 Provide mechanism to override llvm-rs-cc headers.
Change-Id: I87fd496069a9dfde633e2d232e436fa5d7315cc0
2011-08-23 22:01:49 -07:00
jeffhao
ca94f3583f Removing target-api option from build.
This is cherry-picked from dalvik-dev.

Change-Id: I85cd23c08fcad400e6426cdaad079e91dcd9babf
2011-08-23 14:18:24 -07:00
Stephen Hines
c963eae72c Update build to properly use prebuilt llvm-rs-cc.
Change-Id: I52a83066b6c08d05d69db4f93631eeaf9c0b41c6
2011-08-10 17:01:43 -07:00
Ying Wang
4387dc3ee1 am 823f6389: am 3487736b: am 7d83ef8f: Support custom RenderScript compiler
* commit '823f63894fb4ad5c1280a5ee7eb004792223a488':
  Support custom RenderScript compiler
2011-06-02 16:49:33 -07:00
Ying Wang
7d83ef8ff7 Support custom RenderScript compiler
Change-Id: I85e38e84565e04f99dd26217f280274883dc322d
2011-05-27 13:47:17 -07:00
Ying Wang
9681379c6f Use manifest minSdkVersion as "--target-api" in LOCAL_DX_FLAGS
Or use LOCAL_SDK_VERSION, if minSdkVersion is not available.

Change-Id: Ia1d6946867e02df953a1685079b2724236d46798
2011-04-07 11:45:01 -07:00
Ying Wang
fcf00d53bf Support to build renderscript in unbundled apps.
Change-Id: I8104be723f507df4f9673616bada11fb613651b7
2011-03-29 11:47:12 -07:00
Ying Wang
84ed6fa27b Disable "-t" for acp.
Acp can not handle high resolution file timestamp on ext4.
We need this to fix incremental build on ext4.

Change-Id: I54e45c73ffa44c4253c7a431375d419fa4dccfd9
2011-01-19 12:15:38 -08:00
Ying Wang
85aa5ded4c Add external/clang/lib/Headers as llvm-rs-cc's system header search path
Change-Id: I30257631d484491d9a8346205e411013c76c5a91
Bug: 2943524
2011-01-19 11:50:09 -08:00
Ficus Kirkpatrick
16e2f98395 Fix a spelling error.
Change-Id: If89847fa16db4e2b30372678ab8f7117ad5fa0c6
2010-11-12 17:38:20 -08:00
Ying Wang
a5fc87a937 Integrate protocol buffer compiler into the build system.
Bug: 3152546
Change-Id: Ida3ca3d633ce45704dc8e80d044cdbd3ca69aca5
2010-11-02 19:25:47 -07:00
Ying Wang
16697b7000 Hook up the dependency.
Now llvm-rs-link is directly called by the build system.

Change-Id: I281cc6fd9e21ee7d120ddea390f802b57c894fd6
2010-10-11 13:44:50 -07:00
Shih-wei Liao
d01fadb6bc Make naming consistent: llvm-rs-cc and llvm-rs-link.
Change-Id: I8e8ae27548131b47fbbd037d55b472d095d7bb8f
2010-10-08 17:55:26 -07:00
Ying Wang
24e1c018ba Integrate the slang "-MD" into the build system.
So that the header dependency can be included.
Bug: 2932230

Change-Id: I4d69870049157206ce2ab637ec6d673467db0c64
2010-10-08 09:37:44 -07:00
Ying Wang
25a04dadf6 am b7019e21: am a9c381ed: Any intermediate targets between Progaurd and the built_dex should be differently named.
Merge commit 'b7019e2147173a962febeab0e0693cdec9f80789'

* commit 'b7019e2147173a962febeab0e0693cdec9f80789':
  Any intermediate targets between Progaurd and the built_dex should be differently named.
2010-10-02 20:10:59 -07:00
Ying Wang
a9c381ed45 Any intermediate targets between Progaurd and the built_dex should be 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.
2010-10-02 19:41:10 -07:00
Ying Wang
ed7211848a am 3c3bf677: am 0b9382c7: Separate out Proguard flag files to fix dependency.
Merge commit '3c3bf6773ac7e2324c1d06282c625b81f799e427'

* commit '3c3bf6773ac7e2324c1d06282c625b81f799e427':
  Separate out Proguard flag files to fix dependency.
2010-09-30 11:27:04 -07:00
Ying Wang
0b9382c792 Separate out Proguard flag files to fix dependency.
Bug: 3048005
Change-Id: I3e77ca1082cf7c92a43b249e5c887e3fbdf4ba11
2010-09-29 16:08:17 -07:00
Ying Wang
509d28b2b3 resolved conflicts for merge of 3453d5f3 to master
Change-Id: If23d2817b4d74d48632776923805c2141da82257
2010-09-24 18:27:29 -07:00
Ying Wang
957fea52f3 Fix dependency when switching between build variants with and without Proguard.
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
2010-09-23 16:48:46 -07:00
Ying Wang
512802772a Now slang supports "-I" options.
Change-Id: I32aef6c913d9d30f9982a593397145f1562aecf9
2010-09-01 13:28:52 -07:00
Brian Carlstrom
7dc35a3b9c Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit f2f3e4b2
git cherry-pick --no-commit b6a08f0cd3
git cherry-pick --no-commit d05d74b2d6
git cherry-pick --no-commit 5479d77e32

Change-Id: I6f339aa73823e053146719b3af7af91d5375df1c
2010-08-04 23:17:47 -07:00
Ying Wang
c06243d195 Fix jar dependency on the local manifest file.
Change-Id: I1a868885e72c94c4b065723a8d6e890fce5ba1e0
http://b/issue?id=1444634
2010-07-20 16:36:44 -07:00
Ying Wang
0bd59a0a58 Build system support for RenderScript
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
2010-07-19 13:38:56 -07:00
Steve Howard
ee195f3365 am 8b0ecc08: am de6a0857: Fix broken interaction of JarJar and Emma.
Merge commit '8b0ecc08166a4e83a8df5864e5264a88962101f1'

* commit '8b0ecc08166a4e83a8df5864e5264a88962101f1':
  Fix broken interaction of JarJar and Emma.
2010-07-08 19:09:53 -07:00
Steve Howard
de6a085764 Fix broken interaction of JarJar and Emma.
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
2010-07-07 18:46:45 -07:00
Steve Howard
750ac4f3a4 Manual merge of change 50994 from master (DO NOT MERGE)
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
2010-07-01 19:52:04 -07:00
Guang Zhu
18b7556642 Squashed commit of the following (DO NOT MERGE):
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
2010-05-18 15:26:22 -07:00
Joe Onorato
a64dbd75be am 36ce8736: am 77dc0a58: Add a rule that builds an eclipse project file for an app. 2010-05-17 18:30:45 -07:00
Joe Onorato
77dc0a58e2 Add a rule that builds an eclipse project file for an app.
Type make ECLIPSE-<app1>-<app2>... with the apps as listed in LOCAL_PACKAGE_NAME.

Change-Id: Ieb96dfc9dfc13bdf1b3be53572092fc7bc695869
2010-05-17 18:20:42 -07:00
Jesse Wilson
f2f3e4b234 Moving junit out of core.jar and into core-junit.jar
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
2010-05-11 20:20:49 -07:00
Steve Howard
ef5c640fd4 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: If24113f399a168939a1a1d0738c5df57caf8d05f
2010-05-07 11:28:00 -07:00
Jesse Wilson
3600a1604a Undo commit: Moving junit out of core.jar and into core-junit.jar
Change-Id: I09875ef5f45b1d643ae389a6871cad374d80746b
2010-05-04 17:27:15 -07:00
Jesse Wilson
72c941a147 Moving junit out of core.jar and into core-junit.jar.
Also extending the arbitrary limit on build argument sizes,
which I ran up against in building after this change.

Change-Id: Iba79a37b27e7d5efa2b02a99aa253a2eec7ede75
2010-05-04 16:33:49 -07:00
Guang Zhu
155afe393f 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
2010-04-20 13:38:49 -07:00
Ying Wang
389b7e11e4 Let Proguard load emma jar if it's enabled.
Change-Id: I57a0bcfb486339f48dc25f5fc5d44a1178dee678
See: http://b/issue?id=2502181
2010-03-09 17:24:32 -08:00
Ying Wang
85ab497a4e Turn on Proguard by default for user/userdebug builds. 2010-02-19 18:39:13 -08:00
Ying Wang
e3265fb743 Makefile change for build against historical sdk versions.
If LOCAL_SDK_VERSION is current, link against the stub, otherwise
link against prebuilt historical sdk
2010-02-11 14:23:23 -08:00
Ying Wang
3b2bdf1033 Fix and enable proguard on packages. 2010-02-11 13:41:10 -08:00
Brian Carlstrom
f184a0f26d Add support for LOCAL_JAVACFLAGS
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.
2010-02-05 15:57:07 -08:00
Ying Wang
6ef046c893 Fixes ProGuard options.
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.
2009-12-09 14:31:22 -08:00
Joe Onorato
2daa2b3b05 Add the ability to turn on proguard for java targets, and to call aapt
to generate a rules file for proguard for stuff from the manifest and
other resources that need to be kept.
2009-08-30 13:43:00 -07:00
Joe Onorato
e334d255dc Speed up the full build.
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!
2009-07-17 16:48:15 -04:00
Andrew Stadler
cef9ed98ac Fix makefile to be compatible with findbugs v 1.3.8
modified:   core/java.mk
2009-05-13 00:44:59 -07:00
Joe Onorato
64d85d0d82 AI 145618: am: CL 145333 Cloned from CL 144759 by 'g4 patch'.
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
2009-04-09 19:31:12 -07:00
Joe Onorato
bd46b21c31 Automated import from //branches/donutburger/...@140982,140982 2009-03-24 19:07:34 -07:00
The Android Open Source Project
88b607994a auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
The Android Open Source Project
05806d7af6 auto import from //depot/cupcake/@135843 2009-03-03 18:28:14 -08:00
The Android Open Source Project
66339ad5ce auto import from //branches/cupcake/...@126645 2009-01-15 16:12:07 -08:00
The Android Open Source Project
dcc08f073b Code drop from //branches/cupcake/...@124589 2008-12-17 18:03:49 -08:00
The Android Open Source Project
b6c1cf6de7 Initial Contribution 2008-10-21 07:00:00 -07:00