Merge commit 'd5c217aca18726f0ed9f2ea034f750620d4bdf7d' into gingerbread
* commit 'd5c217aca18726f0ed9f2ea034f750620d4bdf7d':
add phony target "all_modules" and use it as make goal for "mm"/"mmm"
So that mm/mmm don't depend on phony target "files", which brings in
unwanted files for apps-only build.
Also allow "dist" for mmm.
Bug: http://b/issue?id=2811503
Change-Id: I2c0794aebd1d171d8a0f44eb8cda67855704d6bd
Merge commit '9269a711753f2523acd3fe5ae661559f754a1bd0' into gingerbread
* commit '9269a711753f2523acd3fe5ae661559f754a1bd0':
docs: ensure code-ified links in qv are the proper color
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
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
Merge commit 'b6a1c1802961f40fe4736e80402f849968cd2563' into gingerbread
* commit 'b6a1c1802961f40fe4736e80402f849968cd2563':
Keep the crt start/end var name of sh consistent with other archs
Bug 2814482
Froyo's cts.mk was missing two lines added to Eclair's cts.mk that
are needed to build the accessibility tests and apk.
Change-Id: I05f93bc0a56b2ec1e07eab8c7a15ef7d4bb90d18
Merge commit 'b66a5c0574e14b838d9dc2497540ffc6cb73dc4f' into gingerbread
* commit 'b66a5c0574e14b838d9dc2497540ffc6cb73dc4f':
docs: modify redirect link text
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
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
http://b/issue?id=2796939
This can fix commands mm and mmm in an unbundled branch.
The cause is that mm & mmm depends on phony target "files", which includes apns-conf.xml.
Change-Id: I72ce1c7c5ddfdcd3bbea5cb9645ca3a48ff8ac12
Merge commit '0af605f3b6e759f480a5124dc6b338ec58e1d40c' into gingerbread
* commit '0af605f3b6e759f480a5124dc6b338ec58e1d40c':
Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS
Merge commit '81b68ad95d6a8ecb8a44ad453d336dff3a059488' into gingerbread
* commit '81b68ad95d6a8ecb8a44ad453d336dff3a059488':
docs: show the download message on the SDK homepage because we no longer
So that "tapas" without argument won't end in makefile-could-not-load error in unbundled branch.
Also, the magic "all" apps will build only apps, not other things.
Change-Id: Iac6dd928ee4e42996147acdab31930cd4ffa1768
Don't check STAY_OFF_MY_LAWN in set_java_home. That function already
refuses to update JAVA_HOME if it's set to something, which should
be sufficient for anybody who doesn't want the script to mess with it.
With this change, you can get the benefits of the 1.5/1.6 auto-selection
without having to suffer through window title changes.
Change-Id: I5cfc5d6fdf26a10b42b52925f877012c0506b9a5
Ying Wang