Commit Graph

2998 Commits

Author SHA1 Message Date
Ying Wang 783f449bdc 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
2010-06-30 15:21:27 -07:00
Jean-Baptiste Queru 6f88d2b974 ignored 22d019b5
Change-Id: If0d592fab3974847264f6dbb76d95c0edf9f6f9e
2010-06-30 15:20:50 -07:00
Jeff Hamilton 77dfeaed2a Switch the required host Java environment to 1.6.
The path to the Java toolchain is now explicitly
specified so no manual configuration should be
required.

Change-Id: I84abc122c557372e77e4579e9a9efe56af2b412c

The java version changed, and we made envsetup automatically find the right JAVA_HOME.

This change forces everyone to re-source envsetup.sh

Change-Id: Ieb9512d5725cca26a83debf9b0480bc20e19d5ee

Fix javadoc for Java 6.

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

Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp

The inherited value has caused build breakage on Mac build.

Change-Id: I8a1b1d6c6d411f6aaaee2d8dbd0297e3d60ab5c2

Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.

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
2010-06-30 13:36:27 -05:00
Doug Kwan 5e431bcb2c Merge "Enable ICF link-time optimization." 2010-06-30 10:35:19 -07:00
Jean-Baptiste Queru 22d019b51d Merge "Change branch name to gingerbread, to match reality - DO NOT MERGE" into gingerbread 2010-06-30 08:58:32 -07:00
The Android Open Source Project 32027c93d3 am 28c292da: am 79a8c2e9: set up fast-forward from froyo-release to gingerbread
Merge commit '28c292daf8ef0e7922ecdb0765556c42d428ca92'

* commit '28c292daf8ef0e7922ecdb0765556c42d428ca92': (150 commits)
  frf85B
  frf85
  frf84B
  frf84
  frf83
  frf82
  FRF78
  FRF77B
  FRF75
  FRF72
  FRF71
  FRF69C
  FRF69B
  FRF69
  FRF68
  FRF64
  FRF58
  FRF57
  FRF55
  FRF51
  ...
2010-06-29 14:38:07 -07:00
The Android Open Source Project 28c292daf8 am 79a8c2e9: set up fast-forward from froyo-release to gingerbread
Merge commit '79a8c2e9def3c41ac6bb1dd13c2d6ac179b3ac2e' into gingerbread-plus-aosp

* commit '79a8c2e9def3c41ac6bb1dd13c2d6ac179b3ac2e': (150 commits)
  frf85B
  frf85
  frf84B
  frf84
  frf83
  frf82
  FRF78
  FRF77B
  FRF75
  FRF72
  FRF71
  FRF69C
  FRF69B
  FRF69
  FRF68
  FRF64
  FRF58
  FRF57
  FRF55
  FRF51
  ...
2010-06-29 14:36:09 -07:00
The Android Open Source Project 79a8c2e9de set up fast-forward from froyo-release to gingerbread
Change-Id: I91ef2a183f34b54405580498a3cab39ec6dc7f24
2010-06-29 14:34:16 -07:00
Doug Kwan baff089c37 Enable ICF link-time optimization.
Change-Id: I49af3366262bebe12dacfebe99ec742b79bf9d84
2010-06-29 11:14:42 -07:00
Ying Wang 8f5069b1be resolved conflicts for merge of 822fa972 to master
Change-Id: Ic7a7499b2058abbc6cefd94a0a06a95ef8c4d61c
2010-06-29 11:08:13 -07:00
Ying Wang 822fa972f8 am dd2c2155: am 0af605f3: Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo
Merge commit 'dd2c21550c6a31493b4c1d0a01451a88a8747b35' into gingerbread-plus-aosp

* commit 'dd2c21550c6a31493b4c1d0a01451a88a8747b35':
  Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS
2010-06-29 09:31:06 -07:00
Ying Wang dd2c21550c am 0af605f3: Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo
Merge commit '0af605f3b6e759f480a5124dc6b338ec58e1d40c' into gingerbread

* commit '0af605f3b6e759f480a5124dc6b338ec58e1d40c':
  Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS
2010-06-29 09:28:56 -07:00
Ying Wang 0af605f3b6 Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo 2010-06-29 09:18:00 -07:00
The Android Open Source Project dcd11407e2 merge from open-source master
Change-Id: I90d465b0197034dab76505b8a68afc519be3e6e0
2010-06-28 10:35:50 -07:00
Jean-Baptiste Queru 833e62400e Update platform version strings for AOSP
Change-Id: I47d405646dd2f5179bd0db0a0b360bf5ba0069c1
2010-06-28 09:40:24 -07:00
Kenny Root afb36e7e86 Clean up warnings in soslim
Change-Id: I497745fe9701876272fdbe7a946622a40efffdd5
2010-06-26 22:43:55 -07:00
David 'Digit' Turner cf937bb4d8 am 5cd0870e: am a7f9179e: Merge "Enable shared libraries to use crtbegin_so.S and crtend_so.S" into gingerbread
Merge commit '5cd0870e6215ab8c2be01a8e7b36600db323b77a'

* commit '5cd0870e6215ab8c2be01a8e7b36600db323b77a':
  Enable shared libraries to use crtbegin_so.S and crtend_so.S
2010-06-25 14:21:37 -07:00
The Android Open Source Project d68a27cb27 am fd76f16a: merge from froyo-plus-aosp
Merge commit 'fd76f16a0245d252ea949d245cc6cdff310291c9'

* commit 'fd76f16a0245d252ea949d245cc6cdff310291c9':
2010-06-25 14:20:50 -07:00
David 'Digit' Turner 5cd0870e62 am a7f9179e: Merge "Enable shared libraries to use crtbegin_so.S and crtend_so.S" into gingerbread
Merge commit 'a7f9179ecc7e2c4b70cf6eedb8ea785a00efb4c3' into gingerbread-plus-aosp

* commit 'a7f9179ecc7e2c4b70cf6eedb8ea785a00efb4c3':
  Enable shared libraries to use crtbegin_so.S and crtend_so.S
2010-06-25 10:45:00 -07:00
David 'Digit' Turner a7f9179ecc Merge "Enable shared libraries to use crtbegin_so.S and crtend_so.S" into gingerbread 2010-06-25 10:42:42 -07:00
The Android Open Source Project fd76f16a02 merge from froyo-plus-aosp
Change-Id: I9b0d0e248aff2cc31726f3d3209915b2e26f8bf3
2010-06-25 09:38:15 -07:00
Scott Main 45e4685a7e am 7e5592c7: am 62c65665: 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 '7e5592c703964c35a177c8f4514c4a9eb2135344'

* commit '7e5592c703964c35a177c8f4514c4a9eb2135344':
  docs: show the download message on the SDK homepage because we no longer
2010-06-24 18:16:36 -07:00
Scott Main 7e5592c703 am 62c65665: 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 '62c65665589de463a557e3826dc6cb2e1ec99c2a' into gingerbread-plus-aosp

* commit '62c65665589de463a557e3826dc6cb2e1ec99c2a':
  docs: show the download message on the SDK homepage because we no longer
2010-06-24 18:14:36 -07:00
Scott Main 62c6566558 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 '81b68ad95d6a8ecb8a44ad453d336dff3a059488' into gingerbread

* commit '81b68ad95d6a8ecb8a44ad453d336dff3a059488':
  docs: show the download message on the SDK homepage because we no longer
2010-06-24 18:12:45 -07:00
Scott Main fe75781ee9 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 '81b68ad95d6a8ecb8a44ad453d336dff3a059488' into froyo-plus-aosp

* commit '81b68ad95d6a8ecb8a44ad453d336dff3a059488':
  docs: show the download message on the SDK homepage because we no longer
2010-06-24 18:11:52 -07:00
Scott Main 81b68ad95d Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo 2010-06-24 18:10:32 -07:00
Ying Wang 6ae5c1b512 am b2fe30f0: am c955834a: am c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"
Merge commit 'b2fe30f05ee9f4ca27a0039a44e3fb3a64c0fc88'

* commit 'b2fe30f05ee9f4ca27a0039a44e3fb3a64c0fc88':
  default empty tapas to TARGET_BUILD_APPS "all"
2010-06-24 18:04:21 -07:00
Ying Wang b2fe30f05e am c955834a: am c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"
Merge commit 'c955834ad0715343a2245142be416f92b83e8306' into gingerbread-plus-aosp

* commit 'c955834ad0715343a2245142be416f92b83e8306':
  default empty tapas to TARGET_BUILD_APPS "all"
2010-06-24 18:02:17 -07:00
Ying Wang 665828875b am c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"
Merge commit 'c048c9b598b36dc7506a954cc0d3d80f308b1b13' into froyo-plus-aosp

* commit 'c048c9b598b36dc7506a954cc0d3d80f308b1b13':
  default empty tapas to TARGET_BUILD_APPS "all"
2010-06-24 18:00:46 -07:00
Ying Wang c955834ad0 am c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"
Merge commit 'c048c9b598b36dc7506a954cc0d3d80f308b1b13' into gingerbread

* commit 'c048c9b598b36dc7506a954cc0d3d80f308b1b13':
  default empty tapas to TARGET_BUILD_APPS "all"
2010-06-24 17:59:32 -07:00
Scott Main a1b358a22c docs: show the download message on the SDK homepage because we no longer
need to walk through the TOS

Change-Id: I46f7e7284792b2bea77cf2a88b195e8117b4e4d2
2010-06-24 17:57:50 -07:00
android-build SharedAccount 9e32ccf59c frf85B
Change-Id: I012a38642e8f0685d9811ec1a4dcb6e3d59d19bd
2010-06-24 16:06:16 -07:00
Ying Wang c048c9b598 default empty tapas to TARGET_BUILD_APPS "all"
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
2010-06-24 15:13:09 -07:00
Andy McFadden d3e1d0e960 am 8969167d: am bd960940: Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.
Merge commit '8969167db684ebdbfe72dd57aea7f7bdd5de8064'

* commit '8969167db684ebdbfe72dd57aea7f7bdd5de8064':
  Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.
2010-06-24 13:32:02 -07:00
Andy McFadden 8969167db6 am bd960940: Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.
Merge commit 'bd960940e1299d69a6cdf4176cfd1f53a5dba83a' into gingerbread-plus-aosp

* commit 'bd960940e1299d69a6cdf4176cfd1f53a5dba83a':
  Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.
2010-06-24 13:29:15 -07:00
Andy McFadden bd960940e1 Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.
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
2010-06-24 12:52:51 -07:00
android-build SharedAccount 3ee659d97a frf85
Change-Id: Ib1a8aa2cd4e652a46f70c54540afc2ea87724779
2010-06-24 12:28:31 -07:00
James Dong e63763087d am 6f2bb44b: am c1ab82ae: Merge "Use stagefright (instead of OpenCore) authoring engine by default -rebased" into gingerbread
Merge commit '6f2bb44b4b3551738c429a25f99e42aca8913f4f'

* commit '6f2bb44b4b3551738c429a25f99e42aca8913f4f':
  Use stagefright (instead of OpenCore) authoring engine by default
2010-06-24 11:59:12 -07:00
Ying Wang 572d63052d am 8b4be231: am 8e6f821e: Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp
Merge commit '8b4be231519376c9dc73622be4b8a5ddc0d83805'

* commit '8b4be231519376c9dc73622be4b8a5ddc0d83805':
  Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp
2010-06-24 11:59:09 -07:00
James Dong 6f2bb44b4b am c1ab82ae: Merge "Use stagefright (instead of OpenCore) authoring engine by default -rebased" into gingerbread
Merge commit 'c1ab82ae6b26d12cf6d5cdad1bd0ffc0d3acfb9b' into gingerbread-plus-aosp

* commit 'c1ab82ae6b26d12cf6d5cdad1bd0ffc0d3acfb9b':
  Use stagefright (instead of OpenCore) authoring engine by default
2010-06-24 11:57:25 -07:00
Ying Wang 8b4be23151 am 8e6f821e: Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp
Merge commit '8e6f821e733e075086cb80309717e3a85e2a9c37' into gingerbread-plus-aosp

* commit '8e6f821e733e075086cb80309717e3a85e2a9c37':
  Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp
2010-06-24 11:57:23 -07:00
James Dong c1ab82ae6b Merge "Use stagefright (instead of OpenCore) authoring engine by default -rebased" into gingerbread 2010-06-24 11:55:40 -07:00
Ying Wang 8e6f821e73 Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp
The inherited value has caused build breakage on Mac build.

Change-Id: I8a1b1d6c6d411f6aaaee2d8dbd0297e3d60ab5c2
2010-06-24 11:10:07 -07:00
James Dong d891654b0c Use stagefright (instead of OpenCore) authoring engine by default
-rebased

Change-Id: Ic184789eb4fb99b0e7cd5883bbe1267f903bc834
2010-06-24 09:53:35 -07:00
Andreas Huber 5f9168c0d5 am c55bb9ec: am f2bab487: Merge "Remove now unnecessary property overrides to opt into stagefright." into gingerbread
Merge commit 'c55bb9ecc92d34e448adec76bc06abdcd3c35f0e'

* commit 'c55bb9ecc92d34e448adec76bc06abdcd3c35f0e':
  Remove now unnecessary property overrides to opt into stagefright.
2010-06-24 09:10:19 -07:00
Andreas Huber c55bb9ecc9 am f2bab487: Merge "Remove now unnecessary property overrides to opt into stagefright." into gingerbread
Merge commit 'f2bab487cc71a8a210ff98d21172d62edcaa6d2a' into gingerbread-plus-aosp

* commit 'f2bab487cc71a8a210ff98d21172d62edcaa6d2a':
  Remove now unnecessary property overrides to opt into stagefright.
2010-06-24 09:08:43 -07:00
Andreas Huber f2bab487cc Merge "Remove now unnecessary property overrides to opt into stagefright." into gingerbread 2010-06-24 09:05:19 -07:00
Ying Wang a52c4f31dc am 48de6ce7: am 7b142da3: Fix javadoc for Java 6.
Merge commit '48de6ce732a797f5c61186a3e57bec535e37d873'

* commit '48de6ce732a797f5c61186a3e57bec535e37d873':
  Fix javadoc for Java 6.
2010-06-23 21:30:04 -07:00
Ying Wang 48de6ce732 am 7b142da3: Fix javadoc for Java 6.
Merge commit '7b142da3ce3849e56134666566df3f04f033c57d' into gingerbread-plus-aosp

* commit '7b142da3ce3849e56134666566df3f04f033c57d':
  Fix javadoc for Java 6.
2010-06-23 21:28:50 -07:00
Ying Wang 7b142da3ce Fix javadoc for Java 6.
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
2010-06-23 20:59:22 -07:00