OSDN Git Service
Scott Main [Thu, 8 Jul 2010 18:44:55 +0000 (11:44 -0700)]
am
38d2e1da: am
b66a5c05: docs: modify redirect link text
Merge commit '
38d2e1dacd7c69f980a03184084469b5096edd9e' into gingerbread-plus-aosp
* commit '
38d2e1dacd7c69f980a03184084469b5096edd9e':
docs: modify redirect link text
Scott Main [Thu, 8 Jul 2010 18:42:13 +0000 (11:42 -0700)]
am
b66a5c05: docs: modify redirect link text
Merge commit '
b66a5c0574e14b838d9dc2497540ffc6cb73dc4f' into gingerbread
* commit '
b66a5c0574e14b838d9dc2497540ffc6cb73dc4f':
docs: modify redirect link text
Scott Main [Thu, 8 Jul 2010 18:29:28 +0000 (11:29 -0700)]
docs: modify redirect link text
Change-Id: Ieb26c4278958624b9c7aa8795cd7a8cab87fafec
Steve Howard [Thu, 8 Jul 2010 18:12:20 +0000 (11:12 -0700)]
am
de6a0857: Fix broken interaction of JarJar and Emma.
Merge commit '
de6a08576487b949180c1b0ed1c19e9f7f4ef787' into gingerbread-plus-aosp
* commit '
de6a08576487b949180c1b0ed1c19e9f7f4ef787':
Fix broken interaction of JarJar and Emma.
Steve Howard [Wed, 7 Jul 2010 21:07:24 +0000 (14:07 -0700)]
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
David Turner [Wed, 7 Jul 2010 21:16:55 +0000 (14:16 -0700)]
am
2b8ba2fa: Merge "Clean up warnings in soslim" into gingerbread
Merge commit '
2b8ba2fa20505630fbbafaf04d20e8c6d05f3b25' into gingerbread-plus-aosp
* commit '
2b8ba2fa20505630fbbafaf04d20e8c6d05f3b25':
Clean up warnings in soslim
David Turner [Wed, 7 Jul 2010 21:14:19 +0000 (14:14 -0700)]
Merge "Clean up warnings in soslim" into gingerbread
The Android Open Source Project [Wed, 7 Jul 2010 20:45:53 +0000 (13:45 -0700)]
merge from open-source master
Change-Id: I3b89fb8a09f7c3e1a23695572bca33751626542d
Chih-Wei Huang [Mon, 31 Aug 2009 06:55:33 +0000 (14:55 +0800)]
Add $(TARGET_DEVICE_DIR)/system.prop to be a prerequisite
If $(TARGET_DEVICE_DIR)/system.prop exists, it should be
a prerequisite of $(INSTALLED_BUILD_PROP_TARGET),
as the following rules state.
Change-Id: Ie395b6f08cef198c3f5c733a5b6ae5a458335a9c
Steve Howard [Fri, 2 Jul 2010 18:11:12 +0000 (11:11 -0700)]
am
750ac4f3: Manual merge of change 50994 from master (DO NOT MERGE)
Merge commit '
750ac4f3a43dfbb66e45517ce2502858daeab1a9' into gingerbread-plus-aosp
* commit '
750ac4f3a43dfbb66e45517ce2502858daeab1a9':
Manual merge of change 50994 from master (DO NOT MERGE)
The Android Open Source Project [Fri, 2 Jul 2010 14:31:36 +0000 (07:31 -0700)]
merge from open-source master
Change-Id: I8ff445963424ee9520f5de46f6ca8d2c3313c819
Steve Howard [Mon, 3 May 2010 22:01:38 +0000 (15:01 -0700)]
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
Ed Heyl [Thu, 1 Jul 2010 22:02:11 +0000 (15:02 -0700)]
am
7d735133: Add ramdisk.img to the dist dir, again (was removed at some point) - from master - please do no merge b/
2590492 and requested again
Merge commit '
7d735133cd6f019ce839fa824f4507f19aff2e8f' into gingerbread-plus-aosp
* commit '
7d735133cd6f019ce839fa824f4507f19aff2e8f':
Add ramdisk.img to the dist dir, again (was removed at some point) - from master - please do no merge
Ed Heyl [Thu, 1 Jul 2010 17:23:20 +0000 (10:23 -0700)]
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
Jean-Baptiste Queru [Thu, 1 Jul 2010 16:22:53 +0000 (09:22 -0700)]
Add full-eng instead of generic-eng in the lunch menu
Change-Id: I3f779087021ef3674ee9ceb8cc3b15f83a98b8f4
The Android Open Source Project [Thu, 1 Jul 2010 15:30:40 +0000 (08:30 -0700)]
merge from open-source master
Change-Id: Idf8c8890a251c77b131fed6019428501a41fd788
Ying Wang [Wed, 30 Jun 2010 23:37:02 +0000 (16:37 -0700)]
am
ca88861b: am
783f449b: Don\'t copy apns-conf.xml for apps-only build
Merge commit '
ca88861ba6ede0e577d92c1ed103fd4acd3fc0ba' into gingerbread-plus-aosp
* commit '
ca88861ba6ede0e577d92c1ed103fd4acd3fc0ba':
Don't copy apns-conf.xml for apps-only build
Ying Wang [Wed, 30 Jun 2010 23:34:52 +0000 (16:34 -0700)]
am
783f449b: Don\'t copy apns-conf.xml for apps-only build
Merge commit '
783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9' into gingerbread
* commit '
783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9':
Don't copy apns-conf.xml for apps-only build
Raphael Moll [Tue, 29 Jun 2010 00:38:09 +0000 (17:38 -0700)]
Fix to "make ddmlib ddmuilib" under Windows/Cygwin.
Needed by the latest change to sdk.git/eclipse/script/create_ddms*.sh
Change-Id: I6dfbb418cc8813c7cdfbc077705158424220724f
The Android Open Source Project [Wed, 30 Jun 2010 22:56:03 +0000 (15:56 -0700)]
merge from open-source master
Change-Id: Ic07f9774ce9cd04437d5e5096f32ce3d46d7116a
The Android Open Source Project [Wed, 30 Jun 2010 22:53:54 +0000 (15:53 -0700)]
merge from open-source master - DO NOT MERGE
Change-Id: I52a12f84d69726d353c87c1b150af205ba22f460
Ying Wang [Wed, 30 Jun 2010 22:21:27 +0000 (15:21 -0700)]
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
Jean-Baptiste Queru [Wed, 30 Jun 2010 22:20:35 +0000 (15:20 -0700)]
ignored
22d019b5
Change-Id: If0d592fab3974847264f6dbb76d95c0edf9f6f9e
Jeff Hamilton [Mon, 21 Jun 2010 23:26:38 +0000 (18:26 -0500)]
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
Jean-Baptiste Queru [Wed, 30 Jun 2010 15:58:32 +0000 (08:58 -0700)]
Merge "Change branch name to gingerbread, to match reality - DO NOT MERGE" into gingerbread
The Android Open Source Project [Tue, 29 Jun 2010 21:36:09 +0000 (14:36 -0700)]
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
...
The Android Open Source Project [Tue, 29 Jun 2010 21:34:16 +0000 (14:34 -0700)]
set up fast-forward from froyo-release to gingerbread
Change-Id: I91ef2a183f34b54405580498a3cab39ec6dc7f24
Ying Wang [Tue, 29 Jun 2010 16:31:06 +0000 (09:31 -0700)]
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
Ying Wang [Tue, 29 Jun 2010 16:28:56 +0000 (09:28 -0700)]
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
Ying Wang [Tue, 29 Jun 2010 16:18:00 +0000 (09:18 -0700)]
Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo
The Android Open Source Project [Mon, 28 Jun 2010 17:35:50 +0000 (10:35 -0700)]
merge from open-source master
Change-Id: I90d465b0197034dab76505b8a68afc519be3e6e0
Jean-Baptiste Queru [Mon, 28 Jun 2010 16:40:24 +0000 (09:40 -0700)]
Update platform version strings for AOSP
Change-Id: I47d405646dd2f5179bd0db0a0b360bf5ba0069c1
Kenny Root [Sun, 27 Jun 2010 05:39:38 +0000 (22:39 -0700)]
Clean up warnings in soslim
Change-Id: I497745fe9701876272fdbe7a946622a40efffdd5
David 'Digit' Turner [Fri, 25 Jun 2010 17:45:00 +0000 (10:45 -0700)]
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
David 'Digit' Turner [Fri, 25 Jun 2010 17:42:42 +0000 (10:42 -0700)]
Merge "Enable shared libraries to use crtbegin_so.S and crtend_so.S" into gingerbread
The Android Open Source Project [Fri, 25 Jun 2010 16:38:15 +0000 (09:38 -0700)]
merge from froyo-plus-aosp
Change-Id: I9b0d0e248aff2cc31726f3d3209915b2e26f8bf3
Scott Main [Fri, 25 Jun 2010 01:14:36 +0000 (18:14 -0700)]
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
Scott Main [Fri, 25 Jun 2010 01:12:45 +0000 (18:12 -0700)]
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
Scott Main [Fri, 25 Jun 2010 01:11:52 +0000 (18:11 -0700)]
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
Scott Main [Fri, 25 Jun 2010 01:10:32 +0000 (18:10 -0700)]
Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo
Ying Wang [Fri, 25 Jun 2010 01:02:17 +0000 (18:02 -0700)]
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"
Ying Wang [Fri, 25 Jun 2010 01:00:46 +0000 (18:00 -0700)]
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"
Ying Wang [Fri, 25 Jun 2010 00:59:32 +0000 (17:59 -0700)]
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"
Scott Main [Thu, 24 Jun 2010 23:36:54 +0000 (16:36 -0700)]
docs: show the download message on the SDK homepage because we no longer
need to walk through the TOS
Change-Id: I46f7e7284792b2bea77cf2a88b195e8117b4e4d2
android-build SharedAccount [Thu, 24 Jun 2010 23:06:16 +0000 (16:06 -0700)]
frf85B
Change-Id: I012a38642e8f0685d9811ec1a4dcb6e3d59d19bd
Ying Wang [Thu, 24 Jun 2010 22:08:33 +0000 (15:08 -0700)]
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
Andy McFadden [Thu, 24 Jun 2010 20:29:15 +0000 (13:29 -0700)]
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.
Andy McFadden [Thu, 24 Jun 2010 19:52:51 +0000 (12:52 -0700)]
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
android-build SharedAccount [Thu, 24 Jun 2010 19:28:31 +0000 (12:28 -0700)]
frf85
Change-Id: Ib1a8aa2cd4e652a46f70c54540afc2ea87724779
James Dong [Thu, 24 Jun 2010 18:57:25 +0000 (11:57 -0700)]
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
Ying Wang [Thu, 24 Jun 2010 18:57:23 +0000 (11:57 -0700)]
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
James Dong [Thu, 24 Jun 2010 18:55:40 +0000 (11:55 -0700)]
Merge "Use stagefright (instead of OpenCore) authoring engine by default -rebased" into gingerbread
Ying Wang [Thu, 24 Jun 2010 18:10:07 +0000 (11:10 -0700)]
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
James Dong [Thu, 24 Jun 2010 16:52:27 +0000 (09:52 -0700)]
Use stagefright (instead of OpenCore) authoring engine by default
-rebased
Change-Id: Ic184789eb4fb99b0e7cd5883bbe1267f903bc834
Andreas Huber [Thu, 24 Jun 2010 16:08:43 +0000 (09:08 -0700)]
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.
Andreas Huber [Thu, 24 Jun 2010 16:05:19 +0000 (09:05 -0700)]
Merge "Remove now unnecessary property overrides to opt into stagefright." into gingerbread
Ying Wang [Thu, 24 Jun 2010 04:28:50 +0000 (21:28 -0700)]
am
7b142da3: Fix javadoc for Java 6.
Merge commit '
7b142da3ce3849e56134666566df3f04f033c57d' into gingerbread-plus-aosp
* commit '
7b142da3ce3849e56134666566df3f04f033c57d':
Fix javadoc for Java 6.
Ying Wang [Thu, 24 Jun 2010 03:59:22 +0000 (20:59 -0700)]
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
Andreas Huber [Wed, 23 Jun 2010 23:39:45 +0000 (16:39 -0700)]
Remove now unnecessary property overrides to opt into stagefright.
Change-Id: I9810030e5576ac5a9cb31fcf0ce3f0baa96f6f40
related-to-bug:
2370115
Joe Onorato [Wed, 23 Jun 2010 23:02:49 +0000 (16:02 -0700)]
am
aee4daac: The java version changed, and we made envsetup automatically find the right JAVA_HOME.
Merge commit '
aee4daacc804bbcd1df551cc2229d12fa5c35c24' into gingerbread-plus-aosp
* commit '
aee4daacc804bbcd1df551cc2229d12fa5c35c24':
The java version changed, and we made envsetup automatically find the right JAVA_HOME.
android-build SharedAccount [Wed, 23 Jun 2010 22:44:01 +0000 (15:44 -0700)]
frf84B
Change-Id: I44d0d9d2e9bec68089b1e2d4dee5bd74a847ead1
android-build SharedAccount [Wed, 23 Jun 2010 22:37:41 +0000 (15:37 -0700)]
frf84
Change-Id: Icb9eb9a74294965302cb7bc5ebddb4939953487d
Joe Onorato [Wed, 23 Jun 2010 21:03:13 +0000 (14:03 -0700)]
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
Ying Wang [Wed, 23 Jun 2010 20:34:22 +0000 (13:34 -0700)]
Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS
Change-Id: Ibbcd626e6856d9340d9d3e2f916127feed0b6f5c
Jeff Hamilton [Wed, 23 Jun 2010 19:49:54 +0000 (12:49 -0700)]
am
4a1c70e5: Switch the required host Java environment to 1.6.
Merge commit '
4a1c70e53be40fd1b2c14eb7c0acc93f6df865bc' into gingerbread-plus-aosp
* commit '
4a1c70e53be40fd1b2c14eb7c0acc93f6df865bc':
Switch the required host Java environment to 1.6.
android-build SharedAccount [Tue, 22 Jun 2010 22:49:50 +0000 (15:49 -0700)]
frf83
Change-Id: I25c7ad6d743d7d9a2e13f9eb9b5cede50b4ad249
Jeff Hamilton [Mon, 21 Jun 2010 23:26:38 +0000 (18:26 -0500)]
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
Dianne Hackborn [Tue, 22 Jun 2010 18:24:18 +0000 (11:24 -0700)]
am
f319c635: Add new "libandroid" to prelink map.
Merge commit '
f319c635a85aca77b2f93f2a352295dba28c946b' into gingerbread-plus-aosp
* commit '
f319c635a85aca77b2f93f2a352295dba28c946b':
Add new "libandroid" to prelink map.
Dianne Hackborn [Sat, 19 Jun 2010 01:14:06 +0000 (18:14 -0700)]
Add new "libandroid" to prelink map.
Change-Id: I10bc30088fced39b2875bbbc19e33c53fa8352d7
Doug Zongker [Mon, 21 Jun 2010 22:43:25 +0000 (15:43 -0700)]
am
06acf91f: am
3b85269c: include build timestamp in OTA metadata
Merge commit '
06acf91f65015f8588f2621b89b8088b4664f9a3' into gingerbread-plus-aosp
* commit '
06acf91f65015f8588f2621b89b8088b4664f9a3':
include build timestamp in OTA metadata
Doug Zongker [Mon, 21 Jun 2010 22:42:14 +0000 (15:42 -0700)]
am
3b85269c: include build timestamp in OTA metadata
Merge commit '
3b85269cfe10ec15e9b544dd6964b8c9f5f761f9' into froyo-plus-aosp
* commit '
3b85269cfe10ec15e9b544dd6964b8c9f5f761f9':
include build timestamp in OTA metadata
Doug Zongker [Mon, 21 Jun 2010 22:40:21 +0000 (15:40 -0700)]
am
3b85269c: include build timestamp in OTA metadata
Merge commit '
3b85269cfe10ec15e9b544dd6964b8c9f5f761f9' into gingerbread
* commit '
3b85269cfe10ec15e9b544dd6964b8c9f5f761f9':
include build timestamp in OTA metadata
Doug Zongker [Mon, 21 Jun 2010 22:30:45 +0000 (15:30 -0700)]
include build timestamp in OTA metadata
Change-Id: I44292c6346db3356dfafbd044027e37a9b467cfe
android-build SharedAccount [Mon, 21 Jun 2010 22:27:11 +0000 (15:27 -0700)]
frf82
Change-Id: Ic8aa76257e743e9923eb03591f64202a624a80ec
Guang Zhu [Mon, 21 Jun 2010 19:51:44 +0000 (12:51 -0700)]
am
4b137047: restore emma changes overwrittern by I9174f843
Merge commit '
4b137047210a1e64df1ebc0807d4eeeac7052c1e' into gingerbread-plus-aosp
* commit '
4b137047210a1e64df1ebc0807d4eeeac7052c1e':
restore emma changes overwrittern by I9174f843
Guang Zhu [Mon, 21 Jun 2010 19:34:51 +0000 (12:34 -0700)]
restore emma changes overwrittern by I9174f843
Change-Id: Ic5199ddfdaa2f8366bda960be84464945726e2f5
The Android Open Source Project [Mon, 21 Jun 2010 17:56:43 +0000 (10:56 -0700)]
merge from froyo-plus-aosp
Change-Id: I85cd0e3207b09b81e41f15d85cd1c900a6bb56b3
The Android Open Source Project [Mon, 21 Jun 2010 17:55:21 +0000 (10:55 -0700)]
merge from froyo-plus-aosp - DO NOT MERGE
Change-Id: I5ddea1d56218732cf5cba16e0c8db18399b7f504
Ying Wang [Mon, 21 Jun 2010 16:08:06 +0000 (09:08 -0700)]
am
45113a7f: am
06898660: A nothing-to-do build should do nothing.
Merge commit '
45113a7faa37747032be887ed12dd0e440524229' into gingerbread-plus-aosp
* commit '
45113a7faa37747032be887ed12dd0e440524229':
A nothing-to-do build should do nothing.
Ying Wang [Mon, 21 Jun 2010 16:06:12 +0000 (09:06 -0700)]
am
06898660: A nothing-to-do build should do nothing.
Merge commit '
068986605b2afcd5e044b62f22ac6ecd5c15b519' into froyo-plus-aosp
* commit '
068986605b2afcd5e044b62f22ac6ecd5c15b519':
A nothing-to-do build should do nothing.
Ying Wang [Mon, 21 Jun 2010 15:47:44 +0000 (08:47 -0700)]
am
06898660: A nothing-to-do build should do nothing.
Merge commit '
068986605b2afcd5e044b62f22ac6ecd5c15b519' into gingerbread
* commit '
068986605b2afcd5e044b62f22ac6ecd5c15b519':
A nothing-to-do build should do nothing.
David 'Digit' Turner [Fri, 18 Jun 2010 22:05:01 +0000 (15:05 -0700)]
Enable shared libraries to use crtbegin_so.S and crtend_so.S
This is necessary to ensure that dlclose() will properly call C++
destructors for the static objects within the shared library.
Change-Id: Ieb056042f9cda7ab120eb770b21f365cd6d64a66
The Android Open Source Project [Fri, 18 Jun 2010 20:49:35 +0000 (13:49 -0700)]
merge from open-source master
Change-Id: Ia4356e797e0c9bceec56a9a5cfeab3def5ae453c
Jean-Baptiste Queru [Fri, 18 Jun 2010 15:10:44 +0000 (08:10 -0700)]
Change branch name to openmaster, to avoid confusion
Change-Id: Ibd0e460fd0f0c5d6fa4c1f858fbc280a0bcf7f1a
Jean-Baptiste Queru [Fri, 18 Jun 2010 15:08:14 +0000 (08:08 -0700)]
Change branch name to gingerbread, to match reality - DO NOT MERGE
Bug:
2780717
Change-Id: I448fa9c164ab3732c52d1f195493ed86be0a1b08
android-build SharedAccount [Fri, 18 Jun 2010 02:39:07 +0000 (19:39 -0700)]
Merge branch 'froyo' of ssh://android-git.corp.google.com:29418/platform/build into froyo-release
android-build SharedAccount [Fri, 18 Jun 2010 02:21:02 +0000 (19:21 -0700)]
FRF78
Change-Id: I8469df6db72297c26fd84774e0ce6959e42309c3
Ying Wang [Fri, 18 Jun 2010 00:52:18 +0000 (17:52 -0700)]
A nothing-to-do build should do nothing.
Before this CL, ota_from_target_files is always executed even with no new change.
Change-Id: I29d6aef3c60e5b0229551a3bf22f2d31cb41f219
Jean-Baptiste Queru [Thu, 17 Jun 2010 17:01:30 +0000 (10:01 -0700)]
merge from froyo-plus-aosp
Change-Id: Ica7f3076728f549ce94dd90584bdc24ee84ced15
The Android Open Source Project [Thu, 17 Jun 2010 16:58:22 +0000 (09:58 -0700)]
merge from open-source master
Change-Id: I55d36474223c79e6ab5000b2cb09b01762eb3823
Jean-Baptiste Queru [Thu, 17 Jun 2010 16:27:59 +0000 (09:27 -0700)]
Revert "Build BUILD_MULTI_PREBUILT for the prebuilt target"
This reverts commit
9bfd697cffae4b4f2bdbf122c3bbe7920525e718,
which was causing all prebuilts to be installed in all builds.
Change-Id: Ia5973b31d23bd74ec187b9e44715dea56c063efe
Jing Yu [Thu, 17 Jun 2010 03:44:14 +0000 (20:44 -0700)]
am
ada132a8: Switch toolchain from gcc-4.4.0 to gcc-4.4.3
Merge commit '
ada132a80ba7edde00ac71727a205d55578e3f47' into gingerbread-plus-aosp
* commit '
ada132a80ba7edde00ac71727a205d55578e3f47':
Switch toolchain from gcc-4.4.0 to gcc-4.4.3
Jing Yu [Thu, 17 Jun 2010 03:17:19 +0000 (20:17 -0700)]
Switch toolchain from gcc-4.4.0 to gcc-4.4.3
gcc-4.4.3 toolchain is based on fsf GCC-4.4.3 with numerous patches.
It reduces 3.65% code size than the prebuilt gcc-4.4.0 toolchain,
and improves 3.4% performance on Android benchmarks.
The toolchain uses gold as default linker. With gold, the toolchain
further reduces 1MB system image.
Change-Id: I55eb4df185f2932e71498fcc28428e4d1b175393
android-build SharedAccount [Thu, 17 Jun 2010 01:10:52 +0000 (18:10 -0700)]
FRF77B
Change-Id: I90c887745e7a34169f2fd4799e047c7c51b287cb
David 'Digit' Turner [Thu, 17 Jun 2010 00:02:44 +0000 (17:02 -0700)]
am
3e467785: Remove irritating warnings about \'va_list\' mangling when building C++ sources.
Merge commit '
3e4677856f0e16a732cecc15cafa7efde1f21241' into gingerbread-plus-aosp
* commit '
3e4677856f0e16a732cecc15cafa7efde1f21241':
Remove irritating warnings about 'va_list' mangling when building C++ sources.
David 'Digit' Turner [Wed, 16 Jun 2010 23:04:55 +0000 (16:04 -0700)]
Remove irritating warnings about 'va_list' mangling when building C++ sources.
Change-Id: I6305e93515e57462e7c57af0cc41a659e4190696
Guang Zhu [Wed, 16 Jun 2010 22:26:41 +0000 (15:26 -0700)]
am
a943634a: Merge "improvement for emma filter option" into gingerbread
Merge commit '
a943634afaf64ad2188fc8ecfb54daed40350be2' into gingerbread-plus-aosp
* commit '
a943634afaf64ad2188fc8ecfb54daed40350be2':
improvement for emma filter option
Guang Zhu [Wed, 16 Jun 2010 22:25:19 +0000 (15:25 -0700)]
Merge "improvement for emma filter option" into gingerbread
Ying Wang [Tue, 15 Jun 2010 22:17:42 +0000 (15:17 -0700)]
am
c01cf7b9: resolved conflicts for merge of
2b8d2383 to gingerbread
Merge commit '
c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6' into gingerbread-plus-aosp
* commit '
c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6':
Add a tapas command.
Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
Ying Wang [Tue, 15 Jun 2010 22:11:51 +0000 (15:11 -0700)]
resolved conflicts for merge of
2b8d2383 to gingerbread
Change-Id: I9174f843f0fde139a7d582f45b027f3face5c981