Commit graph

5821 commits

Author SHA1 Message Date
Ed Heyl
23687596a1 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)
2011-06-08 11:02:27 -07:00
Eino-Ville Talvala
6f45ba1daa Merge "Ensure all filter framework libraries are included." 2011-06-08 10:27:25 -07:00
Jean-Baptiste Queru
6442c8585a Reconcile with gingerbread-release
Change-Id: Iade0c3ecab1c6d6a0b8c3ab7381c60975393d9a1
2011-06-08 08:09:02 -07:00
The Android Automerger
c6594921c5 HTJ69
Change-Id: Ica8c8a4e09e1452ea10a6b00b817e1117013a30f
2011-06-08 07:10:18 -07:00
The Android Automerger
5d6faa4bb3 merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-06-08 07:10:14 -07:00
The Android Automerger
cc0f0a04ac HLJ69
Change-Id: I199c5f33514d99bbdbd70eddbfa767f99f850249
2011-06-08 06:12:43 -07:00
The Android Automerger
169c83e1ff merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-06-08 06:12:31 -07:00
Jean-Baptiste Queru
1cc1b10f0b am f0d2a546: Merge 78e7f1f0
* commit 'f0d2a54669c8bf14e95482437e361c81dfb62404':
  Increase the Java heap size for droiddoc
2011-06-07 18:20:30 -07:00
Jean-Baptiste Queru
513e0ee851 am 0a6c12be: Merge 5adc2d05
* commit '0a6c12be9b17ce74ac0af017b353b72b25550cf0':
2011-06-07 18:20:28 -07:00
Jean-Baptiste Queru
70776231ee am 45a3ad7d: Merge c1efb060
* commit '45a3ad7d225495367a47440da118609b4940fe71':
  Relax the constraint of 64bit build environment.
2011-06-07 18:20:25 -07:00
Ying Wang
2695977b7f am 60d6ef91: am 1482d2db: am e2419c89: Support to run dex-preopt on prebuilt apks.
* commit '60d6ef91b6e1f7803fdf7869afba01cdf37f1b17':
  Support to run dex-preopt on prebuilt apks.
2011-06-07 17:16:24 -07:00
The Android Automerger
c47523c8f8 HTJ68B
Change-Id: I858c6b5c74be695de5d374eba0000161430b2fd0
2011-06-07 15:30:11 -07:00
The Android Automerger
4835d110ae merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-06-07 15:30:05 -07:00
Doug Kwan
b26e497374 Add libgabi++. We need this for RTTI.
Change-Id: I0cae803b16babf84e7be2e80681d33469ce43964
2011-06-07 15:09:19 -07:00
Eino-Ville Talvala
a3ab691118 Ensure all filter framework libraries are included.
Change-Id: I48f75868b4082d2b47c451ffc7251dfa5b25e8c1
2011-06-07 15:04:38 -07:00
Ed Heyl
d23d0f0764 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)
2011-06-07 13:15:20 -07:00
Jean-Baptiste Queru
f0d2a54669 Merge 78e7f1f0
Change-Id: I4d24d154fd3964a4433baf87e4061421fce28986
2011-06-07 13:11:14 -07:00
Jean-Baptiste Queru
0a6c12be9b Merge 5adc2d05
Change-Id: I84a96fc4ca9db476e62959425f622fc88527e181
2011-06-07 13:10:18 -07:00
Jean-Baptiste Queru
45a3ad7d22 Merge c1efb060
Change-Id: I5688046fd44bc6420b541a0eb97a46d216655a3d
2011-06-07 13:10:06 -07:00
Ed Heyl
ec6648036e am c811f291: add ANDROID_HOST_OUT to env (please do not merge)
* commit 'c811f29198fc4862e22dbf233bc28210d14e0205':
  add ANDROID_HOST_OUT to env (please do not merge)
2011-06-07 12:55:39 -07:00
Ed Heyl
4f2297debb add ANDROID_HOST_OUT to env (please do not merge)
Change-Id: Iddc61e1f93e13a3884b919638da1c24271dd6ca5
2011-06-07 12:54:47 -07:00
Ed Heyl
c811f29198 add ANDROID_HOST_OUT to env (please do not merge)
Change-Id: I97e49fcb2610344df1907ec17116ee6e8a586e38
2011-06-07 12:35:46 -07:00
Doug Kwan
e3c3c6d4fe Allow per module RTTI setting. This fixes a bug in previous check-ins.
Change-Id: I5fcac192a7945720fd7667f7497078d310370bc5
2011-06-07 10:55:48 -07:00
Jean-Baptiste Queru
65ce6faa87 Reconcile with honeycomb-mr2-release honeycomb-LTE-release
Change-Id: Id467baa2d2c87f9cf16ca4fb66be3a8a9f50008d
2011-06-07 10:42:18 -07:00
Brian Carlstrom
976672b4e6 Merge "Add KeyChain to core product defintion since Browser depends on it" 2011-06-07 10:30:30 -07:00
Martijn Coenen
3c22287c1b Revert "x86: Enable -fstack-protector"
This reverts commit e397dcccbb.
2011-06-07 08:57:34 -07:00
The Android Automerger
2713fa0a2c HTJ68
Change-Id: I7baad71a7587fa3c47f3d07d763376c24586e343
2011-06-07 07:10:44 -07:00
The Android Automerger
6ad539be44 merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-06-07 07:10:29 -07:00
The Android Automerger
1df1d4420d HLJ68
Change-Id: I2a9e9b11f0ceb6f49baec44f5ac3deac8ba33a7f
2011-06-07 06:12:17 -07:00
The Android Automerger
bc79eeb9da merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-06-07 06:12:12 -07:00
Brian Carlstrom
869727e575 Add KeyChain to core product defintion since Browser depends on it
Change-Id: I7c8ca42565875e72c7297c41d8bcb9cf1c1b4664
2011-06-06 21:35:47 -07:00
Ying Wang
60d6ef91b6 am 1482d2db: am e2419c89: Support to run dex-preopt on prebuilt apks.
* commit '1482d2db83abaa7d9a01831bdaeb99d4a68fd68a':
  Support to run dex-preopt on prebuilt apks.
2011-06-06 17:29:49 -07:00
Ying Wang
65b710aefd Merge "Use arg list file to pass arguments to jar." 2011-06-06 16:24:46 -07:00
android-merger
853d146585 GRJ67B
Change-Id: I73742ebdf6e60ddf7fe40605e4f50b7188e082b9
2011-06-06 15:18:47 -07:00
The Android Automerger
c05f729be7 GRJ67
Change-Id: I034d285ebaaa4e88f08c1f29cdbf41f837d9aeb3
2011-06-06 15:00:39 -07:00
The Android Automerger
dd7c222f37 merge in gingerbread-release history after reset to gingerbread 2011-06-06 15:00:32 -07:00
David Turner
5d627263c8 am 0a2d335e: am c1705c9a: Merge "x86: Enable -fstack-protector"
* commit '0a2d335e99bae3c257c0e26fe180d00de04bebaa':
  x86: Enable -fstack-protector
2011-06-06 14:39:32 -07:00
Ying Wang
194a8ec8ae Use arg list file to pass arguments to jar.
To fix error "/bin/bash: Argument list too long"

Change-Id: Ie336b18f9a7eba38d94a6e32c07a88589ce9f1fd
2011-06-06 14:34:52 -07:00
Doug Kwan
1081a05359 Merge "Revert "Clear LOCAL_RTTI_FLAG."" 2011-06-06 13:20:49 -07:00
David Turner
486ce3495c am e4778e6a: am 4272b32a: Merge "Clean up of X86 build flags"
* commit 'e4778e6ab82a40475081482f26759985deeb7f21':
  Clean up of X86 build flags
2011-06-06 12:56:15 -07:00
David Turner
0a2d335e99 am c1705c9a: Merge "x86: Enable -fstack-protector"
* commit 'c1705c9ad8da4d6c2d267e27afd6e16aa7b431b6':
  x86: Enable -fstack-protector
2011-06-06 12:27:26 -07:00
Doug Kwan
6f937973ff Revert "Clear LOCAL_RTTI_FLAG."
This reverts commit f524df7ce1.
2011-06-06 12:11:19 -07:00
Doug Kwan
c2466a2d1e Merge "Clear LOCAL_RTTI_FLAG." 2011-06-06 11:35:08 -07:00
David Turner
e4778e6ab8 am 4272b32a: Merge "Clean up of X86 build flags"
* commit '4272b32a86bd22ce560e41816cece950a7af4e51':
  Clean up of X86 build flags
2011-06-06 11:33:04 -07:00
Jean-Baptiste Queru
679432ab1b Fix typo
Change-Id: I45e5fbe272f837e751eea14162432de1af1c67a2
2011-06-06 10:20:04 -07:00
Jean-Baptiste Queru
45f9c0e34e Tweak apps in "full" configs.
Add new apps. Also move VoiceDialer to only appear in
telephony-enabled builds.

Change-Id: I3560c19f841296be0c7438553e870df12a4c8cda
2011-06-06 09:50:18 -07:00
Jean-Baptiste Queru
78e7f1f014 am 536938e0: am 978f86ea: Merge "Increase the Java heap size for droiddoc"
* commit '536938e01195a2ee279a6652e0b88c50d5f4c2a8':
  Increase the Java heap size for droiddoc
2011-06-06 08:23:09 -07:00
Jean-Baptiste Queru
536938e011 am 978f86ea: Merge "Increase the Java heap size for droiddoc"
* commit '978f86ea5439ce192e9c343fc2565f1ec4e2e6d2':
  Increase the Java heap size for droiddoc
2011-06-06 08:19:48 -07:00
Jean-Baptiste Queru
978f86ea54 Merge "Increase the Java heap size for droiddoc" 2011-06-06 08:12:31 -07:00
The Android Automerger
1e285b22af HTJ67
Change-Id: I7ff92bfcaf4afee08e41f0dc4b9941f56f0e3517
2011-06-06 07:10:52 -07:00