OSDN Git Service
Mike Lockwood [Thu, 9 Jun 2011 02:06:43 +0000 (19:06 -0700)]
post_process_props: Write mangled properties back to file instead of stdout
Change-Id: I78b642400c46019165f12d409a238344ca6e09dd
Signed-off-by: Mike Lockwood <lockwood@android.com>
Joe Onorato [Wed, 8 Jun 2011 23:04:45 +0000 (16:04 -0700)]
Merge "post process the system properties"
Joe Onorato [Wed, 8 Jun 2011 23:04:14 +0000 (16:04 -0700)]
post process the system properties
Change-Id: Ib78fe238d90dd4523326e4fa088d9333edc9e299
Ed Heyl [Wed, 8 Jun 2011 18:02:27 +0000 (11:02 -0700)]
am
d23d0f07: (-s ours) am
ec664803: am
c811f291: add ANDROID_HOST_OUT to env (please do not merge)
* commit '
d23d0f076465a2aaf86989de01cdcc686842499a':
add ANDROID_HOST_OUT to env (please do not merge)
Eino-Ville Talvala [Wed, 8 Jun 2011 17:27:25 +0000 (10:27 -0700)]
Merge "Ensure all filter framework libraries are included."
Jean-Baptiste Queru [Wed, 8 Jun 2011 15:09:02 +0000 (08:09 -0700)]
Reconcile with gingerbread-release
Change-Id: Iade0c3ecab1c6d6a0b8c3ab7381c60975393d9a1
Jean-Baptiste Queru [Wed, 8 Jun 2011 01:20:30 +0000 (18:20 -0700)]
am
f0d2a546: Merge
78e7f1f0
* commit '
f0d2a54669c8bf14e95482437e361c81dfb62404':
Increase the Java heap size for droiddoc
Jean-Baptiste Queru [Wed, 8 Jun 2011 01:20:28 +0000 (18:20 -0700)]
Jean-Baptiste Queru [Wed, 8 Jun 2011 01:20:25 +0000 (18:20 -0700)]
am
45a3ad7d: Merge
c1efb060
* commit '
45a3ad7d225495367a47440da118609b4940fe71':
Relax the constraint of 64bit build environment.
Ying Wang [Wed, 8 Jun 2011 00:16:24 +0000 (17:16 -0700)]
am
60d6ef91: am
1482d2db: am
e2419c89: Support to run dex-preopt on prebuilt apks.
* commit '
60d6ef91b6e1f7803fdf7869afba01cdf37f1b17':
Support to run dex-preopt on prebuilt apks.
Doug Kwan [Tue, 7 Jun 2011 22:09:19 +0000 (15:09 -0700)]
Add libgabi++. We need this for RTTI.
Change-Id: I0cae803b16babf84e7be2e80681d33469ce43964
Eino-Ville Talvala [Tue, 7 Jun 2011 22:04:38 +0000 (15:04 -0700)]
Ensure all filter framework libraries are included.
Change-Id: I48f75868b4082d2b47c451ffc7251dfa5b25e8c1
Ed Heyl [Tue, 7 Jun 2011 20:15:20 +0000 (13:15 -0700)]
am
ec664803: am
c811f291: add ANDROID_HOST_OUT to env (please do not merge)
* commit '
ec6648036ef9e0d4fe25a4d4abbd79279d2ee9d0':
add ANDROID_HOST_OUT to env (please do not merge)
Jean-Baptiste Queru [Tue, 7 Jun 2011 20:11:14 +0000 (13:11 -0700)]
Merge
78e7f1f0
Change-Id: I4d24d154fd3964a4433baf87e4061421fce28986
Jean-Baptiste Queru [Tue, 7 Jun 2011 20:10:15 +0000 (13:10 -0700)]
Merge
5adc2d05
Change-Id: I84a96fc4ca9db476e62959425f622fc88527e181
Jean-Baptiste Queru [Tue, 7 Jun 2011 20:09:58 +0000 (13:09 -0700)]
Merge
c1efb060
Change-Id: I5688046fd44bc6420b541a0eb97a46d216655a3d
Ed Heyl [Tue, 7 Jun 2011 19:55:39 +0000 (12:55 -0700)]
am
c811f291: add ANDROID_HOST_OUT to env (please do not merge)
* commit '
c811f29198fc4862e22dbf233bc28210d14e0205':
add ANDROID_HOST_OUT to env (please do not merge)
Ed Heyl [Tue, 7 Jun 2011 19:02:51 +0000 (12:02 -0700)]
add ANDROID_HOST_OUT to env (please do not merge)
Change-Id: I97e49fcb2610344df1907ec17116ee6e8a586e38
Doug Kwan [Tue, 7 Jun 2011 17:55:48 +0000 (10:55 -0700)]
Allow per module RTTI setting. This fixes a bug in previous check-ins.
Change-Id: I5fcac192a7945720fd7667f7497078d310370bc5
Jean-Baptiste Queru [Tue, 7 Jun 2011 17:42:18 +0000 (10:42 -0700)]
Reconcile with honeycomb-mr2-release honeycomb-LTE-release
Change-Id: Id467baa2d2c87f9cf16ca4fb66be3a8a9f50008d
Brian Carlstrom [Tue, 7 Jun 2011 17:30:30 +0000 (10:30 -0700)]
Merge "Add KeyChain to core product defintion since Browser depends on it"
Martijn Coenen [Tue, 7 Jun 2011 15:57:34 +0000 (08:57 -0700)]
Revert "x86: Enable -fstack-protector"
This reverts commit
e397dcccbb1bb2ed52b4d6febaee8fb900154b3e.
The Android Automerger [Tue, 7 Jun 2011 14:10:44 +0000 (07:10 -0700)]
HTJ68
Change-Id: I7baad71a7587fa3c47f3d07d763376c24586e343
The Android Automerger [Tue, 7 Jun 2011 14:10:29 +0000 (07:10 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Tue, 7 Jun 2011 13:12:17 +0000 (06:12 -0700)]
HLJ68
Change-Id: I2a9e9b11f0ceb6f49baec44f5ac3deac8ba33a7f
The Android Automerger [Tue, 7 Jun 2011 13:12:12 +0000 (06:12 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Brian Carlstrom [Tue, 7 Jun 2011 04:35:47 +0000 (21:35 -0700)]
Add KeyChain to core product defintion since Browser depends on it
Change-Id: I7c8ca42565875e72c7297c41d8bcb9cf1c1b4664
Ying Wang [Tue, 7 Jun 2011 00:29:49 +0000 (17:29 -0700)]
am
1482d2db: am
e2419c89: Support to run dex-preopt on prebuilt apks.
* commit '
1482d2db83abaa7d9a01831bdaeb99d4a68fd68a':
Support to run dex-preopt on prebuilt apks.
Ying Wang [Mon, 6 Jun 2011 23:24:46 +0000 (16:24 -0700)]
Merge "Use arg list file to pass arguments to jar."
android-merger [Mon, 6 Jun 2011 22:18:47 +0000 (15:18 -0700)]
GRJ67B
Change-Id: I73742ebdf6e60ddf7fe40605e4f50b7188e082b9
The Android Automerger [Mon, 6 Jun 2011 22:00:39 +0000 (15:00 -0700)]
GRJ67
Change-Id: I034d285ebaaa4e88f08c1f29cdbf41f837d9aeb3
The Android Automerger [Mon, 6 Jun 2011 22:00:32 +0000 (15:00 -0700)]
merge in gingerbread-release history after reset to gingerbread
David Turner [Mon, 6 Jun 2011 21:39:32 +0000 (14:39 -0700)]
am
0a2d335e: am
c1705c9a: Merge "x86: Enable -fstack-protector"
* commit '
0a2d335e99bae3c257c0e26fe180d00de04bebaa':
x86: Enable -fstack-protector
Ying Wang [Mon, 6 Jun 2011 21:34:52 +0000 (14:34 -0700)]
Use arg list file to pass arguments to jar.
To fix error "/bin/bash: Argument list too long"
Change-Id: Ie336b18f9a7eba38d94a6e32c07a88589ce9f1fd
Doug Kwan [Mon, 6 Jun 2011 20:20:49 +0000 (13:20 -0700)]
Merge "Revert "Clear LOCAL_RTTI_FLAG.""
David Turner [Mon, 6 Jun 2011 19:56:15 +0000 (12:56 -0700)]
am
e4778e6a: am
4272b32a: Merge "Clean up of X86 build flags"
* commit '
e4778e6ab82a40475081482f26759985deeb7f21':
Clean up of X86 build flags
David Turner [Mon, 6 Jun 2011 19:27:26 +0000 (12:27 -0700)]
am
c1705c9a: Merge "x86: Enable -fstack-protector"
* commit '
c1705c9ad8da4d6c2d267e27afd6e16aa7b431b6':
x86: Enable -fstack-protector
Doug Kwan [Mon, 6 Jun 2011 19:11:19 +0000 (12:11 -0700)]
Revert "Clear LOCAL_RTTI_FLAG."
This reverts commit
f524df7ce1a5e276607563272fa1838967a4a239.
Doug Kwan [Mon, 6 Jun 2011 18:35:08 +0000 (11:35 -0700)]
Merge "Clear LOCAL_RTTI_FLAG."
David Turner [Mon, 6 Jun 2011 18:33:04 +0000 (11:33 -0700)]
am
4272b32a: Merge "Clean up of X86 build flags"
* commit '
4272b32a86bd22ce560e41816cece950a7af4e51':
Clean up of X86 build flags
Jean-Baptiste Queru [Mon, 6 Jun 2011 17:20:04 +0000 (10:20 -0700)]
Fix typo
Change-Id: I45e5fbe272f837e751eea14162432de1af1c67a2
Jean-Baptiste Queru [Mon, 6 Jun 2011 16:50:15 +0000 (09:50 -0700)]
Tweak apps in "full" configs.
Add new apps. Also move VoiceDialer to only appear in
telephony-enabled builds.
Change-Id: I3560c19f841296be0c7438553e870df12a4c8cda
Jean-Baptiste Queru [Mon, 6 Jun 2011 15:23:09 +0000 (08:23 -0700)]
am
536938e0: am
978f86ea: Merge "Increase the Java heap size for droiddoc"
* commit '
536938e01195a2ee279a6652e0b88c50d5f4c2a8':
Increase the Java heap size for droiddoc
Jean-Baptiste Queru [Mon, 6 Jun 2011 15:19:48 +0000 (08:19 -0700)]
am
978f86ea: Merge "Increase the Java heap size for droiddoc"
* commit '
978f86ea5439ce192e9c343fc2565f1ec4e2e6d2':
Increase the Java heap size for droiddoc
Jean-Baptiste Queru [Mon, 6 Jun 2011 15:12:31 +0000 (08:12 -0700)]
Merge "Increase the Java heap size for droiddoc"
The Android Automerger [Mon, 6 Jun 2011 14:10:52 +0000 (07:10 -0700)]
HTJ67
Change-Id: I7ff92bfcaf4afee08e41f0dc4b9941f56f0e3517
The Android Automerger [Mon, 6 Jun 2011 14:10:48 +0000 (07:10 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Mon, 6 Jun 2011 13:07:30 +0000 (06:07 -0700)]
HLJ67
Change-Id: I8dff96060e3e7055540f7da6b51240bdd040a3e1
The Android Automerger [Mon, 6 Jun 2011 13:07:23 +0000 (06:07 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Sat, 4 Jun 2011 16:53:48 +0000 (09:53 -0700)]
HLJ65
Change-Id: I15f0314d3957aeada8e3a3c50806a55dc75d7be1
The Android Automerger [Sat, 4 Jun 2011 16:53:42 +0000 (09:53 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Doug Kwan [Sat, 4 Jun 2011 01:26:48 +0000 (18:26 -0700)]
Clear LOCAL_RTTI_FLAG.
Change-Id: I0f1388e76af1ce0592cd3271a689fbb6c0ea3eba
The Android Automerger [Fri, 3 Jun 2011 21:58:33 +0000 (14:58 -0700)]
HLJ64B
Change-Id: I5fed324d11ec024ed88a6f70b6ad5075c2982059
The Android Automerger [Fri, 3 Jun 2011 21:58:27 +0000 (14:58 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 3 Jun 2011 15:55:28 +0000 (08:55 -0700)]
HLJ64
Change-Id: I9cdd419c478f47ddd8bfcb543da82fc3c6b92e88
The Android Automerger [Fri, 3 Jun 2011 15:55:17 +0000 (08:55 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 3 Jun 2011 15:40:16 +0000 (08:40 -0700)]
HTJ64
Change-Id: Idd922f6ca79b8add0143368bf76802faeae90334
The Android Automerger [Fri, 3 Jun 2011 15:40:12 +0000 (08:40 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
Ying Wang [Thu, 2 Jun 2011 23:49:33 +0000 (16:49 -0700)]
am
823f6389: am
3487736b: am
7d83ef8f: Support custom RenderScript compiler
* commit '
823f63894fb4ad5c1280a5ee7eb004792223a488':
Support custom RenderScript compiler
Scott Main [Thu, 2 Jun 2011 23:22:44 +0000 (16:22 -0700)]
am
9b6614d5: am
e02449dc: am
44c32b95: Merge "docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08" into honeycomb-mr2
* commit '
9b6614d58bf3ed4ad127bc607405af834c349662':
docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08
Ying Wang [Thu, 2 Jun 2011 21:06:24 +0000 (14:06 -0700)]
am
bb567df0: am
4cd9e2d9: am
06e2f72b: Support to run dex-preopt on prebuilt apks.
* commit '
bb567df00abfe33d800339eba089b8cfd91a7785':
Support to run dex-preopt on prebuilt apks.
The Android Automerger [Thu, 2 Jun 2011 14:10:52 +0000 (07:10 -0700)]
HTJ63
Change-Id: I94d314cf2a2ce9c5fc77e7f484b5f719a552a4fd
The Android Automerger [Thu, 2 Jun 2011 14:10:40 +0000 (07:10 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Thu, 2 Jun 2011 13:08:23 +0000 (06:08 -0700)]
HLJ63
Change-Id: If3f71c0865d0427fee14ffae7cae5fca7d3c31c8
The Android Automerger [Thu, 2 Jun 2011 13:08:16 +0000 (06:08 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Wed, 1 Jun 2011 22:46:19 +0000 (15:46 -0700)]
keep history
Jean-Baptiste Queru [Wed, 1 Jun 2011 21:26:18 +0000 (14:26 -0700)]
Jean-Baptiste Queru [Wed, 1 Jun 2011 21:09:24 +0000 (14:09 -0700)]
Merge from gingerbread
Change-Id: If6c009d62eb4b2ed931d3e5082d08ad996aca689
The Android Automerger [Wed, 1 Jun 2011 20:48:00 +0000 (13:48 -0700)]
HLJ59C
Change-Id: Ia1229f139e0d34f3263d0901c22601a9a8a9412f
Jean-Baptiste Queru [Wed, 1 Jun 2011 20:27:30 +0000 (13:27 -0700)]
Reconcile with gingerbread-mr2-release
Change-Id: I98de118c52ed658a448c2e885a481eece75257a3
The Android Automerger [Wed, 1 Jun 2011 20:12:12 +0000 (13:12 -0700)]
HTJ62B
Change-Id: Ibda60ed391f4b579f53cb01456140d3e3044d584
Doug Kwan [Wed, 1 Jun 2011 18:23:20 +0000 (11:23 -0700)]
Merge "Allow enabling RTTI in a module."
Jean-Baptiste Queru [Wed, 1 Jun 2011 15:07:56 +0000 (08:07 -0700)]
am
3c60c67a: Merge from open-source gingerbread
* commit '
3c60c67ad2a157f5bfb731accfc74f5b42c69851':
Relax the constraint of 64bit build environment.
Jean-Baptiste Queru [Wed, 1 Jun 2011 14:42:07 +0000 (07:42 -0700)]
Merge from open-source gingerbread
Change-Id: I417fc97191a14102617c0a87718bb690a1944e8b
The Android Automerger [Wed, 1 Jun 2011 14:10:27 +0000 (07:10 -0700)]
HTJ62
Change-Id: If3aada3c898f34fefba87fb0b078fb9261c01d43
The Android Automerger [Wed, 1 Jun 2011 14:10:21 +0000 (07:10 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Wed, 1 Jun 2011 13:09:56 +0000 (06:09 -0700)]
HLJ62
Change-Id: I4a80cb869fea85b08c48faaae17c140cddd50870
The Android Automerger [Wed, 1 Jun 2011 13:09:42 +0000 (06:09 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Joe Onorato [Wed, 1 Jun 2011 01:21:07 +0000 (18:21 -0700)]
Switch the java encoding from ascii to utf8.
Change-Id: Iee0972df68b44fc8c653812cf165b57350a7ec5d
Ed Heyl [Tue, 31 May 2011 21:05:14 +0000 (14:05 -0700)]
GT the gingerbread-mr2-release branch
Change-Id: I22d6f9759fada4d7970dc915119345eb3fba24d4
Jean-Baptiste Queru [Tue, 31 May 2011 21:03:21 +0000 (14:03 -0700)]
Merge "Relax the constraint of 64bit build environment." into gingerbread
The Android Automerger [Tue, 31 May 2011 18:42:14 +0000 (11:42 -0700)]
HTJ61B
Change-Id: Ib02f4934b0288205d18fe4509023c91a8fa539ff
Dan Bornstein [Tue, 31 May 2011 17:29:47 +0000 (10:29 -0700)]
Clean up how dex preoptimization gets configured.
Change-Id: I505ac438f1b963060b4be36d94bb5fbee6112dc5
The Android Automerger [Tue, 31 May 2011 14:09:42 +0000 (07:09 -0700)]
HTJ61
Change-Id: I754599d3010650ee2e9882b43600add6d0a8c7bb
The Android Automerger [Tue, 31 May 2011 14:09:35 +0000 (07:09 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Tue, 31 May 2011 13:08:21 +0000 (06:08 -0700)]
HLJ61
Change-Id: I6c9b504f66794e67ed74abb6c1c48c3ee486319f
The Android Automerger [Tue, 31 May 2011 13:08:08 +0000 (06:08 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Mon, 30 May 2011 14:10:23 +0000 (07:10 -0700)]
HTJ60
Change-Id: If1681ab7490f9d85dc6f98489d4d6e9dd94e1ea7
The Android Automerger [Mon, 30 May 2011 14:10:19 +0000 (07:10 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Mon, 30 May 2011 13:02:23 +0000 (06:02 -0700)]
HLJ60
Change-Id: I36aa1631a8e00896c9d3b20cfb3ed20226f4244d
The Android Automerger [Mon, 30 May 2011 13:02:19 +0000 (06:02 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Mon, 30 May 2011 03:09:52 +0000 (20:09 -0700)]
HLJ59B
Change-Id: Icde595e06a0940d823996b96db9c85f34e4602c4
The Android Automerger [Mon, 30 May 2011 03:09:45 +0000 (20:09 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Sun, 29 May 2011 14:44:48 +0000 (07:44 -0700)]
HLJ59
Change-Id: Ib78243e109a362ecc470e57fbc2ab3ee299b5b6d
The Android Automerger [Sun, 29 May 2011 14:44:39 +0000 (07:44 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Sat, 28 May 2011 05:03:52 +0000 (22:03 -0700)]
HLJ57B
Change-Id: I6cf699dbefcb292575b52ac2881c329f3079e404
The Android Automerger [Sat, 28 May 2011 05:03:46 +0000 (22:03 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Mathias Agopian [Fri, 27 May 2011 23:38:05 +0000 (16:38 -0700)]
Merge "add sensorservice package to the list"
Ying Wang [Fri, 27 May 2011 22:38:10 +0000 (15:38 -0700)]
am
3487736b: am
7d83ef8f: Support custom RenderScript compiler
* commit '
3487736bac5625bef8ff9bc4ef311b29348055d9':
Support custom RenderScript compiler
Ying Wang [Fri, 27 May 2011 22:35:48 +0000 (15:35 -0700)]
am
7d83ef8f: Support custom RenderScript compiler
* commit '
7d83ef8ff7679239063bb8484f0c1fdcf31abf8b':
Support custom RenderScript compiler
OSDN Git Service
