GitLab

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

Add ramdisk.img to the dist dir, again (was removed at some point) - from master - please do no merge
b/2590492 and requested again

Change-Id: I1f4efac2a8ca47f1b69761bb9233427e0ca0411d

Merge commit '783f449b' into gingerbread

* commit '783f449b':
  Don't copy apns-conf.xml for apps-only build

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

Change-Id: I91ef2a183f34b54405580498a3cab39ec6dc7f24

am 0af605f3: Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo

Merge commit '0af605f3' into gingerbread

* commit '0af605f3':
  Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS

am 81b68ad9: Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo

Merge commit '81b68ad9' into gingerbread

* commit '81b68ad9':
  docs: show the download message on the SDK homepage because we no longer

Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo

Merge commit 'c048c9b5' into gingerbread

* commit 'c048c9b5':
  default empty tapas to TARGET_BUILD_APPS "all"

need to walk through the TOS

Change-Id: I46f7e7284792b2bea77cf2a88b195e8117b4e4d2

Change-Id: I012a38642e8f0685d9811ec1a4dcb6e3d59d19bd

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

Change-Id: Ib1a8aa2cd4e652a46f70c54540afc2ea87724779

The inherited value has caused build breakage on Mac build.

Change-Id: I8a1b1d6c6d411f6aaaee2d8dbd0297e3d60ab5c2

-rebased

Change-Id: Ic184789eb4fb99b0e7cd5883bbe1267f903bc834

If you don't set bootclasspath, there would be errors like:
javadoc: error - In doclet class DroidDoc, method start has thrown an exception java.lang.reflect.InvocationTargetException

Change-Id: I1b83360cb595d50577c6043d6e91b0f92e4c04d6

Change-Id: I9810030e5576ac5a9cb31fcf0ce3f0baa96f6f40
related-to-bug: 2370115

Change-Id: I44d0d9d2e9bec68089b1e2d4dee5bd74a847ead1

Change-Id: Icb9eb9a74294965302cb7bc5ebddb4939953487d

This change forces everyone to re-source envsetup.sh

Change-Id: Ieb9512d5725cca26a83debf9b0480bc20e19d5ee

Change-Id: Ibbcd626e6856d9340d9d3e2f916127feed0b6f5c

Change-Id: I25c7ad6d743d7d9a2e13f9eb9b5cede50b4ad249

The path to the Java toolchain is now explicitly
specified so no manual configuration should be
required.

Change-Id: I84abc122c557372e77e4579e9a9efe56af2b412c

Change-Id: I10bc30088fced39b2875bbbc19e33c53fa8352d7

Merge commit '3b85269c' into gingerbread

* commit '3b85269c':
  include build timestamp in OTA metadata

Change-Id: I44292c6346db3356dfafbd044027e37a9b467cfe

Change-Id: Ic8aa76257e743e9923eb03591f64202a624a80ec

Change-Id: Ic5199ddfdaa2f8366bda960be84464945726e2f5

Merge commit '06898660' into gingerbread

* commit '06898660':
  A nothing-to-do build should do nothing.

This is necessary to ensure that dlclose() will properly call C++
destructors for the static objects within the shared library.

Change-Id: Ieb056042f9cda7ab120eb770b21f365cd6d64a66

Bug: 2780717
Change-Id: I448fa9c164ab3732c52d1f195493ed86be0a1b08

Change-Id: I8469df6db72297c26fd84774e0ce6959e42309c3

Before this CL, ota_from_target_files is always executed even with no new change.

Change-Id: I29d6aef3c60e5b0229551a3bf22f2d31cb41f219