Commit graph

39 commits

Author SHA1 Message Date
Jean-Baptiste Queru
5890600dac Add a better explanation about how to deal with user modules
Change-Id: Ib79cc0f4b47648daa18db97aa949cd167c8d44a9
2010-09-15 14:29:14 -07:00
Jean-Baptiste Queru
32afccc732 Revert "Default host module tag to optional."
This reverts commit 528362f074.
2010-09-14 13:25:42 -07:00
Jean-Baptiste Queru
6e8b268dec Fail the build when using a user tag on a non-legacy module. do not merge
The supported mechanism is to explicitly add the module
name to the PRODUCT_PACKAGES of the relevant product definitions.

Change-Id: I67bef9a967576b77a5d6c298178f03c66722eb37
2010-09-14 08:59:21 -07:00
Ying Wang
528362f074 Default host module tag to optional.
Change-Id: I8ae572b368e7ecdcc8e5bb257bb2f6084b5fb508
2010-09-13 14:56:15 -07:00
Ying Wang
73ca57f5e6 Fix host-dexed libraries.
With this change, host-dexed library A can have host-dexed library B in its LOCAL_JAVA_LIBRARIES.
Bug: 2992136

Change-Id: I794613d3230d4eb471a0566c325078da8fa38b86
2010-09-10 18:43:33 -07:00
Jean-Baptiste Queru
39de432897 Warn when new modules are found that use user tags - DO NOT MERGE
Change-Id: Ia563765f3d0161d7c851a0162d65c2a249b4dd38
2010-09-03 17:39:10 -07:00
Ying Wang
3dae0ee46c Fix inherited dependency when instrmentation.
It turns out we should also LOCAL_INSTRUMENTATION_FOR.
To disambiguate LOCAL_INSTRUMENTATION_FOR_PACKAGE_NAME is renamed to LOCAL_MANIFEST_INSTRUMENTATION_FOR.

Bug: 2902591
Change-Id: I6cb893c135736fc4170aa2259105b4c5eea798a1
2010-09-03 10:05:39 -07:00
Joe Onorato
14d9515363 Instrumentation links against the jar file for its app, so use that at the dependency.
I don't remember exactly, but I think the dependencies for apps
were broken, and you couldn't reliably cause the java to be rebuilt
by depending just on the jar file-- you needed to depend on the
apk.  That isn't the case anymore, and relying on the apk means
that something built in out/target/common was depending on something
that's deleted by installclean.

With this change (and others), on my mac, the build after
installclean for passion-eng takes 2 minutes instead of 11.

Change-Id: Ib490f88292d591254013e07958961fc50ec2e3dc
2010-07-14 19:49:05 -07:00
Joe Onorato
b751053151 Fix event-log-tags so we don't rebuild framework.jar because of an installclean.
Produce an event logs tag file for everything we know about, in order
to properly allocate numbers.  Then produce a file that's filtered
for what's going to be installed.

Change-Id: Id0778aec0b4d045e8ff91ba2c9c8265e860eaba5
2010-07-14 10:22:54 -07:00
Ying Wang
74a9fd0873 am a07d37b7: Cherry-pick bug fixes from master.
Merge commit 'a07d37b79300e76da5f21f532578fcd686a74b16' into gingerbread

* commit 'a07d37b79300e76da5f21f532578fcd686a74b16':
  Cherry-pick bug fixes from master.
2010-06-11 09:04:43 -07:00
Ying Wang
a07d37b793 Cherry-pick bug fixes from master.
1. Set correct aidl_preprocess_import for LOCAL_SDK_VERSION current.
2. Set correct PRIVATE_BOOTCLASSPATH for non-empty LOCAL_SDK_VERSION.

Change-Id: Iff8e266931434863521bfa4621767bed31d31cc0
2010-06-09 12:08:07 -07:00
Ying Wang
66356cef22 am 7a794289: Merge "Unbundle the build system." into froyo
Merge commit '7a7942899eedde3b946768a155fac3d70af5c9c3' into kraken

* commit '7a7942899eedde3b946768a155fac3d70af5c9c3':
  Unbundle the build system.
2010-06-09 11:33:32 -07:00
Ying Wang
0f6f4ca54e Unbundle the build system.
Change-Id: I88912d876c3972212e8871b3e5b3b8b6d2da34d0
2010-06-09 10:26:26 -07:00
Ying Wang
f33c3ef933 am b93e03cb: am 52911309: Cherry-pick unbundled build changes from master
Merge commit 'b93e03cbc9d47a9d9a385c780ed64639e2a23ae5' into kraken

* commit 'b93e03cbc9d47a9d9a385c780ed64639e2a23ae5':
  Cherry-pick unbundled build changes from master
2010-06-02 13:11:32 -07:00
Joe Onorato
8a06bac1db Make make ECLIPSE-lunch build a .classpath for all the java stuff that will be included in the
build.

Change-Id: I5a6066fa2afc9cb7bea794770bbb589615a1f9eb
2010-05-26 17:58:21 -04:00
Ying Wang
5291130983 Cherry-pick unbundled build changes from master
Change-Id: I82cab32f00b7b729d9b01c8e1532c8bf0ad2fb92
2010-05-26 13:39:31 -07:00
Ying Wang
01c351793a Fix typo.
Change-Id: I6eb60e7b89bd331deaa46e2c3f746aa2b042e1b4
2010-05-17 19:07:21 -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
Ying Wang
8c254825a0 Support to override instr target package in inherit-package
http://b/issue?id=2451361
With this CL, you can inherit a testing package to test a inheriting package.
Note: we change the meaning of $(5), so we need to change any existing calls
to inherit-package in other projects.

Change-Id: I673155d1b8b6006953d14e1ab87066536ebd1e54
2010-03-16 17:08:58 -07:00
Doug Zongker
abfbbe2e1d allow EventLog tag numbers to be auto-assigned
With this change, you can specify "?" in place of a tag number in a
.logtags file and the build system will assign numbers to these tags.
(The numbers used shouldn't matter since we translate them back to tag
names whenever the logs are read back.)

This is pretty straightforward to do:

- make merge-event-log-tags.py assign numbers to any tags that specify
  "?"

- make the generated java files depend on the merged output

- make java-event-log-tags.py read both the original .logtags and the
  merged output, and fill in tag numbers for any "?" using the merged
  version.

Change-Id: Icc6ccd705db461d570fc929922a830aa6deaca48
2010-02-16 14:32:08 -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
Jeff Hamilton
bb67d21337 Get LOCAL_MANIFEST_PACKAGE_NAME working.
Change-Id: Ieafbf2596252ee3a2fe5d1ad433e8863fbf84601
2010-02-05 23:57:34 -06:00
Jean-Baptiste Queru
6907cfe7de Remove special-case where CLASS=apps ignored TAGS=user
Also add a warning when there's TAG=user on a CLASS=apps module,
as this is not what people normally intend (this should be handled
in core.mk instead).

This used to be a source of confusion, with people using TAGS=user on
APPS and non-APPS modules, and being surprised to see some of those
included but not others.

Change-Id: I56b5618a556abdc6b841bf7a943d77c20fe9a4c5
2010-01-11 09:40:39 -08:00
Jean-Baptiste Queru
a831cbdcfc Warn when using unrecognized/uncommon tags.
Such tags don't do anything, so using them is at
best a no-op, at worst a typo where the author intended
something else.

Change-Id: I1462032f4df3564b06a82685f226a6d5a665a633
2010-01-11 09:40:39 -08:00
Joe Onorato
05c7f61caf Don't do the check build step for apps that link against the SDK.
We already have the apicheck process to make sure that nobody breaks that,
so doing the extra check isn't necessary.
2010-01-05 12:47:14 -08:00
Doug Zongker
9bd4962af8 break up event-log-tags; generate java source files with constants
Construct the /system/etc/event-log-tags file by unioning together any
*.logtags files included in LOCAL_SRC_FILES throughout the system (with
appropriate error checking for dup tag numbers, etc.)

For java packages, generate a java source file from the logtags file for
that package that contains static integer constants for each tag name.
2009-12-03 16:47:52 -08:00
Joe Onorato
e62902c95b Fix http://b/2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references 2009-09-24 09:27:35 -07:00
Joe Onorato
f2bce89880 am e334d255: Speed up the full build.
Merge commit 'e334d255dc8f85d610f4d0339227a0b985494811'

* commit 'e334d255dc8f85d610f4d0339227a0b985494811':
  Speed up the full build.
2009-07-17 17:13:08 -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
Dima Zavin
0c72f970b0 am 46e9beca: core: Add support for static libraries to include other whole static libs.
Merge commit '46e9beca50057bd4ff375b35fd5958c05ce5bcb7'

* commit '46e9beca50057bd4ff375b35fd5958c05ce5bcb7':
  core: Add support for static libraries to include other whole static libs.
2009-05-28 12:31:35 -07:00
Dima Zavin
46e9beca50 core: Add support for static libraries to include other whole static libs.
Currently, if LOCAL_WHOLE_STATIC_LIBRARIES is specified, its values is
ignored. This patch addresses this limitation and works as follows:
For every whole lib specified, it extracts the archive into a sub-directory
under the target lib's intermediate, and then seeds the initial target
archive with all the members.

Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 20:14:55 -07:00
Patrick Scott
d033d57f40 Change PRIVATE to LOCAL for additional dependencies.
This change will be used by webcore_test in a separate change.
2009-05-19 18:13:58 -04:00
The Android Open Source Project
2f31293ba7 auto import from //branches/cupcake/...@137197 2009-03-09 11:52:11 -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