Commit Graph

6329 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
ee69da5b4e am 5aa44e2d: Merge bb41d06d
* commit '5aa44e2d7a15a743113aab386e465492d101e2bd':
  Update version to 2.3.5.
2011-06-16 07:46:17 -07:00
Jean-Baptiste Queru
5aa44e2d7a Merge bb41d06d
Change-Id: Ieeeec2e835e3e7eb223a5f62927111db24295ccf
2011-06-16 07:19:44 -07:00
The Android Automerger
b8f2f58733 HTJ76B
Change-Id: Ib7926f3add431484d3071e9539c95f4c8e015d19
2011-06-15 23:02:51 -07:00
The Android Automerger
b9da0bc914 merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-06-15 23:02:45 -07:00
David 'Digit' Turner
5f5056f503 emulator: Build emulator platform images as ARMv7-A
Now that the emulator supports proper ARMv7 emulation, switch to
building all emulator-specific platform images using this instruction
set, in order to benefit from the noticeable speed boost provided by
Thumb-2 instructions.

Note that we don't build with NEON support because emulated NEON
instructions are currently slow, though they work.

IMPORTANT: You need to have the following emulator patch in your tree
           in order to start these platform builds easily:

           https://review.source.android.com//#change,23798

Otherwise, the alternative is to do these things:

   1/ Telling the emulator to emulate an ARMv7-A CPU, instead of
      an ARMv5TE one. This is normally done with "-qemu cortex-a8"

   2/ Using an ARMv7-A capable kernel image, which is available and
      usable with -kernel prebuilt/android-arm/kernel-qemu-armv7

Note that the emulator has a special hack that automatically enables
1/ if 2/ is being used (i.e. if the kernel image name ends with -armv7,
then emulate an ARMv7-A CPU automatically).

So in reality, only 2/ is required.

Change-Id: I5c0245ba5e6a2bc34d0d49b2c024fffd317a5eed
2011-06-16 00:27:26 +02:00
The Android Automerger
23f871c4ac HTJ76
Change-Id: I9ec04b52382dda4e0ac50864c1ad3f927c4da5b5
2011-06-15 15:20:01 -07:00
The Android Automerger
87782850de merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-06-15 15:19:53 -07:00
The Android Open Source Project
258cd1da2c Reconcile with honeycomb-mr2-release honeycomb-LTE-release
Change-Id: I865fe646706016836a842a75057bc79b3989ac89
2011-06-15 15:09:39 -07:00
The Android Automerger
5ad18aeb15 HLJ76
Change-Id: Ia1fc20871a8b7c0093cdb94df8cd97e4cd7dfe40
2011-06-15 06:13:44 -07:00
The Android Automerger
0ede5d84e4 merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-06-15 06:13:27 -07:00
The Android Automerger
0a0c09516e HTJ75
Change-Id: I30acf132246efd577b50464be65af8b5a7a34e81
2011-06-14 16:49:19 -07:00
The Android Automerger
ff0e5a39db merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-06-14 16:49:14 -07:00
Gloria Wang
68755c997b Enable Forward Lock DRM plugin.
Change-Id: Ida8694bad0b68e1941e00145b85fabb42d92fd72
2011-06-14 10:42:16 -07:00
The Android Automerger
b460e146ff HLJ75
Change-Id: I42a8af65dc5225b8824552010f4ceff13ccc2a2f
2011-06-14 06:12:05 -07:00
The Android Automerger
6db44c415a merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-06-14 06:12:00 -07:00
Ying Wang
dc31d76b5d Use TARGET_BOARD_INFO_FILE to locate board-info.txt
So board-info.txt can be inherited from the parent device.

Change-Id: I5d99a2483b9a325e475f3c602d9e0f5d2b95e80c
2011-06-13 17:36:08 -07:00
The Android Automerger
3bb33f6ff1 HTJ74
Change-Id: I140395c208581dd63cefca52c1cc1bad13c017e1
2011-06-13 14:39:56 -07:00
The Android Automerger
e9e9ba3840 merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-06-13 14:39:51 -07:00
The Android Open Source Project
8bfaa68b53 Reconcile with honeycomb-LTE-release
Change-Id: I420737faef935997dfb149805ab7f9ba45a3d9db
2011-06-13 13:52:55 -07:00
Jean-Baptiste Queru
cb0e8c41ee Merge "Add DRM libraries" 2011-06-13 10:19:23 -07:00
The Android Automerger
f8fa897c52 HLJ74
Change-Id: I8232fc1cf252df8ddca19c939979411559b349cd
2011-06-13 06:12:47 -07:00
The Android Automerger
364dbb65fd merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-06-13 06:12:34 -07:00
The Android Open Source Project
3141afa916 Reconcile with gingerbread-release
Change-Id: Ib78aa2a68601dace481a67c2c310fe8f9d170c5c
2011-06-10 15:42:37 -07:00
Jean-Baptiste Queru
d057285063 Add DRM libraries
They're used in all products

Change-Id: I125e693df2ec012ca3e5461ba9ada8c21c529ef7
2011-06-10 15:13:52 -07:00
android-merger
470770bc76 GRJ71B
Change-Id: I7cc782c78cf18df07949011ef9427063cafa3c94
2011-06-10 15:04:31 -07:00
The Android Automerger
f78c2d0166 GRJ71
Change-Id: I7d5674396d8792e21cc3b39532abf895b48f46a0
2011-06-10 14:57:26 -07:00
The Android Automerger
4d027e91e6 merge in gingerbread-release history after reset to gingerbread 2011-06-10 14:57:20 -07:00
Jean-Baptiste Queru
997c2596f8 Merge "Remove photo and video editors from full builds" 2011-06-10 14:27:08 -07:00
The Android Open Source Project
28648b6d3b Reconcile with honeycomb-mr2-release honeycomb-LTE-release
Change-Id: I3a2411dbab421bbf1d007c73ec729b4ca58dba48
2011-06-10 14:23:34 -07:00
Jean-Baptiste Queru
91a5e65123 Remove photo and video editors from full builds
Change-Id: I5541fee3cd28a550945414510bc1e8141bc818fd
2011-06-10 14:22:27 -07:00
Dianne Hackborn
8edd7f9a35 resolved conflicts for merge of 3f72af13 to master
Change-Id: I675df80f6e4435e6fb275c8c1527fdc966c0322c
2011-06-10 14:00:55 -07:00
Dianne Hackborn
3f72af1370 Merge cb5b6d16
Change-Id: I95670014aa3e8b83713169e4f414ef058b15f870
2011-06-10 07:29:48 -07:00
The Android Automerger
61f4c178e5 HLJ71
Change-Id: If0e8a5253c93b20ffecc95e9270eebabf7e12a7e
2011-06-10 06:13:03 -07:00
The Android Automerger
607e7470ff merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-06-10 06:12:57 -07:00
The Android Automerger
94249fc6ee HTJ70C
Change-Id: Ic3c9b56e449fe6cf2e29b6fe07020f777311e98b
2011-06-09 17:43:30 -07:00
The Android Automerger
4309d483e5 merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-06-09 17:43:25 -07:00
Dianne Hackborn
cb5b6d1690 am 0b22d93b: Welcome, Android 3.2.
* commit '0b22d93be32eeff06e6626ad766b040057b931a5':
  Welcome, Android 3.2.
2011-06-09 17:25:43 -07:00
Dianne Hackborn
0b22d93be3 Welcome, Android 3.2.
Change-Id: Iedf0f75a3338aca09647779f3cbfb4a94f615493
2011-06-09 16:40:02 -07:00
Mike Lockwood
aef9309b4e Merge "Add support for products overriding properties in /default.prop" 2011-06-09 15:46:00 -07:00
The Android Automerger
169c7111e9 HTJ70B
Change-Id: Icd599536fb254861629e968461bc146c6fd0be7c
2011-06-09 15:26:08 -07:00
The Android Automerger
4225535c46 merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-06-09 15:25:57 -07:00
Jean-Baptiste Queru
c96db7f454 Reconcile with gingerbread-release honeycomb-mr2-release honeycomb-LTE-release
Change-Id: I3da699139b9c67b09c8076f3fdef0c7c115ffbcc
2011-06-09 15:00:56 -07:00
Mike Lockwood
0d23fec792 Add support for products overriding properties in /default.prop
We need this to allow products to specify the default USB configuration,
and allow the build system to add adb to this configuration
for eng and userdebug builds.

For example:

PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
	persist.sys.usb.config=mtp

Change-Id: I83d7d918e57a8117eb96919e17d8ad52afdc0388
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-09 14:54:40 -07:00
android-merger
28966abd44 GRJ70B
Change-Id: I4142cfae1378d46c6ee9ae795bcf21af91039505
2011-06-09 13:55:16 -07:00
The Android Automerger
675b73417d GRJ70
Change-Id: If43e3bcca9e61825d1a7f3287b233d1e9f5e32ad
2011-06-09 13:45:46 -07:00
The Android Automerger
565d3c5b4c merge in gingerbread-release history after reset to gingerbread 2011-06-09 13:45:18 -07:00
Dan Morrill
bb41d06d96 Update version to 2.3.5.
Change-Id: I310c09c6f2d1c0e0067bf4a44bed5958664c1591
2011-06-09 13:20:55 -07:00
The Android Automerger
461e080ad7 HTJ70
Change-Id: I77af93ce68f43904414ecd92f39882f88f8f9c57
2011-06-09 07:11:24 -07:00
The Android Automerger
e4affc87b2 merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-06-09 07:11:19 -07:00
The Android Automerger
92adf7b7f3 HLJ70
Change-Id: I1894d3be0640212779cbeb7e57fea7c63d4af66b
2011-06-09 06:08:38 -07:00