OSDN Git Service
Xavier Ducrohet [Tue, 4 Oct 2011 02:42:07 +0000 (19:42 -0700)]
Also package xhdpi res in the SDK image.
Change-Id: I39977f70b63353d1d61bbbef6207973ba2876ff9
Scott Main [Mon, 3 Oct 2011 22:34:32 +0000 (15:34 -0700)]
docs: fix visual bug in the search tabs.
I assume this was introduced by a change in the CSE implementation
Change-Id: I776e385fd6c0d738a4bbf8372911b205c1f98123
Scott Main [Mon, 3 Oct 2011 20:01:43 +0000 (13:01 -0700)]
docs: add 'reference' class for use with 'special' to refine the headings
used within the 'special' div when in the reference.
Change-Id: Iebf84484e2eda104b2247aefc5a539f2a62c5102
The Android Open Source Project [Mon, 3 Oct 2011 14:41:03 +0000 (07:41 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I51b4b8d176ec0513747cded7d63a45ab0c527abd
The Android Automerger [Mon, 3 Oct 2011 13:30:22 +0000 (06:30 -0700)]
IFL03
The Android Automerger [Mon, 3 Oct 2011 13:27:14 +0000 (06:27 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Open Source Project [Fri, 30 Sep 2011 21:31:56 +0000 (14:31 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I07c391b65a870c4d557a51cc4ed00a5f9474cfed
The Android Automerger [Fri, 30 Sep 2011 21:08:49 +0000 (14:08 -0700)]
IFK92C
The Android Automerger [Fri, 30 Sep 2011 21:08:26 +0000 (14:08 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Open Source Project [Fri, 30 Sep 2011 20:24:17 +0000 (13:24 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I859743c56d3721278fed7e22b7d41d0592b00118
The Android Automerger [Fri, 30 Sep 2011 20:14:43 +0000 (13:14 -0700)]
IFK92B
The Android Automerger [Fri, 30 Sep 2011 20:11:02 +0000 (13:11 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Open Source Project [Fri, 30 Sep 2011 14:09:52 +0000 (07:09 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Iec2a62de9ec37e871999a0580a83947080274bc7
The Android Automerger [Fri, 30 Sep 2011 13:34:29 +0000 (06:34 -0700)]
IFK92
The Android Automerger [Fri, 30 Sep 2011 13:31:24 +0000 (06:31 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
David Turner [Fri, 30 Sep 2011 04:10:43 +0000 (21:10 -0700)]
am
ff33471b: (-s ours) am
4c02d76b: (-s ours) am
719051f9: Merge "core/binary.mk: Add missing Objective-C objects to the build. DO NOT MERGE" into gingerbread
* commit '
ff33471b8bb548643bb9624ee4866ad6e4713bf8':
core/binary.mk: Add missing Objective-C objects to the build. DO NOT MERGE
David Turner [Fri, 30 Sep 2011 04:04:41 +0000 (21:04 -0700)]
am
4c02d76b: (-s ours) am
719051f9: Merge "core/binary.mk: Add missing Objective-C objects to the build. DO NOT MERGE" into gingerbread
* commit '
4c02d76b8fd47d66896c9d133e8e7dbeb6dbb266':
core/binary.mk: Add missing Objective-C objects to the build. DO NOT MERGE
David Turner [Fri, 30 Sep 2011 04:00:32 +0000 (21:00 -0700)]
am
719051f9: Merge "core/binary.mk: Add missing Objective-C objects to the build. DO NOT MERGE" into gingerbread
* commit '
719051f9878f85b57470d9047e8156320f31c98a':
core/binary.mk: Add missing Objective-C objects to the build. DO NOT MERGE
David Turner [Fri, 30 Sep 2011 03:17:38 +0000 (20:17 -0700)]
Merge "core/binary.mk: Add missing Objective-C objects to the build. DO NOT MERGE" into gingerbread
The Android Automerger [Fri, 30 Sep 2011 01:48:16 +0000 (18:48 -0700)]
IFK91C
The Android Automerger [Fri, 30 Sep 2011 01:45:07 +0000 (18:45 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Thu, 29 Sep 2011 22:23:39 +0000 (15:23 -0700)]
IFK91B
The Android Automerger [Thu, 29 Sep 2011 22:20:05 +0000 (15:20 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Open Source Project [Thu, 29 Sep 2011 21:24:43 +0000 (14:24 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I255db04bfa6c81e1317f578cb0c05be25f3500d8
Doug Zongker [Thu, 29 Sep 2011 21:09:38 +0000 (14:09 -0700)]
am
6e69feed: Merge "allow APKs to be signed with multiple certs" into ics-factoryrom
* commit '
6e69feed1a3d57d3206f7dabe32e06e8b07189e2':
allow APKs to be signed with multiple certs
Doug Zongker [Thu, 29 Sep 2011 21:08:06 +0000 (14:08 -0700)]
Merge "allow APKs to be signed with multiple certs" into ics-factoryrom
Doug Zongker [Thu, 29 Sep 2011 20:22:57 +0000 (13:22 -0700)]
allow APKs to be signed with multiple certs
The Package Manager handles this now. To share a UID, all packages
must be signed with exactly the same set of certs.
Change-Id: I2fd08923f55f02ae2f1d503266ab124be2472921
David 'Digit' Turner [Fri, 11 Feb 2011 15:19:31 +0000 (16:19 +0100)]
core/binary.mk: Add missing Objective-C objects to the build. DO NOT MERGE
NOTE: This is a back-port from AOSP into the internal gingerbread branch.
For some reason, all_objects was not listing objects generated from
objective-C sources. We need these for the emulator (which builds its
own version of SDL which uses Quartz on OS X).
+ Fix a typo in transform-host-m-to-o definition.
This also explains why https://review.source.android.com/#change,21074
had to be reverted, since it gets rid of the prebuilt SDL libraries when
building the emulator.
Change-Id: I03e179f3216ed95908bf8e8011d34109accff1b9
Orig-Change-Id: I173811cf11cdb5b045073aade59364236145bc77
Jean-Baptiste Queru [Thu, 29 Sep 2011 19:37:18 +0000 (12:37 -0700)]
am
d2ecb762: am
fcf0ede1: Ignore
013607f9 from gingerbread (already here)
* commit '
d2ecb7628facb3413ed8dea97c0c388926f225df':
emulator: enable opengl emulation modules
Jean-Baptiste Queru [Thu, 29 Sep 2011 19:35:07 +0000 (12:35 -0700)]
am
fcf0ede1: Ignore
013607f9 from gingerbread (already here)
* commit '
fcf0ede16257136760821976b185c3ac44f961ab':
emulator: enable opengl emulation modules
Jean-Baptiste Queru [Thu, 29 Sep 2011 19:32:32 +0000 (12:32 -0700)]
Ignore
013607f9 from gingerbread (already here)
Change-Id: I550c04403877cd2cf301a496746f1e9fdbb19de1
David 'Digit' Turner [Thu, 29 Sep 2011 17:21:15 +0000 (10:21 -0700)]
Merge "emulator: enable opengl emulation modules" into gingerbread
The Android Automerger [Thu, 29 Sep 2011 13:31:40 +0000 (06:31 -0700)]
IFK91
The Android Automerger [Thu, 29 Sep 2011 13:27:34 +0000 (06:27 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Thu, 29 Sep 2011 00:37:13 +0000 (17:37 -0700)]
IFK90B
The Android Automerger [Thu, 29 Sep 2011 00:34:20 +0000 (17:34 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
David Turner [Wed, 28 Sep 2011 23:45:33 +0000 (16:45 -0700)]
am
17210f0b: (-s ours) Cherrypick 944311 from do not merge.
* commit '
17210f0b8de483ba0d44d8187fc6c69f73fbdd7d':
Cherrypick 944311 from master. do not merge.
David Turner [Wed, 28 Sep 2011 20:54:08 +0000 (22:54 +0200)]
Cherrypick 944311 from master. do not merge.
emulator: Enable dex-preoptimization in emulator-specific builds
This patch re-enables dex preoptimization in emulator-specific
builds. This considerably speeds up the first-boot of SDK AVDs
since the dex optimization pass is performed during the build
instead.
This was enabled in a previous patch, then reverted due to a
bug in the build system that has been fixed since.
This patch doesn't affect any device build.
Change-Id: Ie711fb4e1672993b7f7f4b8c5313a89d0b8734d6
Xavier Ducrohet [Wed, 28 Sep 2011 22:47:29 +0000 (15:47 -0700)]
am
af5e2c7f: Add calendar to the SDK system image.
* commit '
af5e2c7f1c916f6eefe9b90f33287bb8bbac88c4':
Add calendar to the SDK system image.
Xavier Ducrohet [Wed, 28 Sep 2011 22:39:32 +0000 (15:39 -0700)]
Add calendar to the SDK system image.
Change-Id: Iaedb675fd4348744a3efacf9d57d401045aeffa9
David Turner [Wed, 28 Sep 2011 20:54:08 +0000 (22:54 +0200)]
emulator: Enable dex-preoptimization in emulator-specific builds
This patch re-enables dex preoptimization in emulator-specific
builds. This considerably speeds up the first-boot of SDK AVDs
since the dex optimization pass is performed during the build
instead.
This was enabled in a previous patch, then reverted due to a
bug in the build system that has been fixed since.
This patch doesn't affect any device build.
Change-Id: I3be8a9c7f51a86029fde30b7d37584cb40b4db69
The Android Automerger [Wed, 28 Sep 2011 13:12:35 +0000 (06:12 -0700)]
IFK90
The Android Automerger [Wed, 28 Sep 2011 13:07:40 +0000 (06:07 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Tue, 27 Sep 2011 20:34:26 +0000 (13:34 -0700)]
IFK89B
The Android Automerger [Tue, 27 Sep 2011 20:29:33 +0000 (13:29 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Ying Wang [Tue, 27 Sep 2011 18:31:12 +0000 (11:31 -0700)]
Merge "Generate an empty target if there is no packages"
The Android Open Source Project [Tue, 27 Sep 2011 17:10:37 +0000 (10:10 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I4a1591c4e7c75bd09c41545138467fab6d24c78b
The Android Automerger [Tue, 27 Sep 2011 11:21:49 +0000 (04:21 -0700)]
IFK89
The Android Automerger [Tue, 27 Sep 2011 11:18:29 +0000 (04:18 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Tue, 27 Sep 2011 10:56:33 +0000 (03:56 -0700)]
IFK88C
The Android Automerger [Tue, 27 Sep 2011 10:51:01 +0000 (03:51 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Mon, 26 Sep 2011 23:20:08 +0000 (16:20 -0700)]
IFK88B
The Android Automerger [Mon, 26 Sep 2011 23:15:39 +0000 (16:15 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Jean-Baptiste Queru [Mon, 26 Sep 2011 20:24:33 +0000 (13:24 -0700)]
Merge "resolved conflicts for merge of
2f2882a0 to master"
The Android Open Source Project [Mon, 26 Sep 2011 19:11:20 +0000 (12:11 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Idd580f068a34956ba60f34552485123de030ef31
Ying Wang [Mon, 26 Sep 2011 19:05:06 +0000 (12:05 -0700)]
Generate an empty target if there is no packages
Generate an empty target even if there is no packages defined in the
source tree. Such case can happen when building in an unbundled branch.
Change-Id: Id8b94bc00557cd5ea2066859e440427474ced5f5
The Android Automerger [Mon, 26 Sep 2011 13:34:40 +0000 (06:34 -0700)]
IFK88
The Android Automerger [Mon, 26 Sep 2011 13:32:18 +0000 (06:32 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Mon, 26 Sep 2011 01:18:02 +0000 (18:18 -0700)]
IFK87B
The Android Automerger [Mon, 26 Sep 2011 01:14:09 +0000 (18:14 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Sun, 25 Sep 2011 13:32:51 +0000 (06:32 -0700)]
IFK87
The Android Automerger [Sun, 25 Sep 2011 13:27:14 +0000 (06:27 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Sat, 24 Sep 2011 00:57:20 +0000 (17:57 -0700)]
IFK85C
Christopher Tate [Fri, 23 Sep 2011 01:24:30 +0000 (18:24 -0700)]
Add the shared-storage backup component to the build
Oops. Fixes bug
5341264
Change-Id: I99c51226c236c40bf56b1b94917f0eff56502963
Ying Wang [Fri, 23 Sep 2011 23:25:36 +0000 (16:25 -0700)]
am
510df1bb: Add lohit-fonts.
* commit '
510df1bb0904292a23b7f12e06fdf7e9307298e4':
Add lohit-fonts.
Ying Wang [Fri, 23 Sep 2011 21:35:51 +0000 (14:35 -0700)]
Add lohit-fonts.
Change-Id: Idf0641ce2d8f8195520e7e283f985271482b2835
Doug Zongker [Fri, 23 Sep 2011 20:51:54 +0000 (13:51 -0700)]
Merge "fix syntax error in OTA script"
The Android Automerger [Fri, 23 Sep 2011 20:39:09 +0000 (13:39 -0700)]
IFK85B
Christopher Tate [Fri, 23 Sep 2011 20:00:52 +0000 (13:00 -0700)]
am
1014de6c: Merge "Add the shared-storage backup component to the build" into ics-factoryrom
* commit '
1014de6cf3b90c6c531beaf8462c17a5f39a8e35':
Add the shared-storage backup component to the build
Christopher Tate [Fri, 23 Sep 2011 19:59:28 +0000 (12:59 -0700)]
Merge "Add the shared-storage backup component to the build" into ics-factoryrom
Doug Zongker [Fri, 23 Sep 2011 19:48:33 +0000 (12:48 -0700)]
fix syntax error in OTA script
Change-Id: I3a9535acb47fc3960020a390dec8d0294a404c2e
The Android Automerger [Fri, 23 Sep 2011 18:38:53 +0000 (11:38 -0700)]
IFK85
The Android Automerger [Fri, 23 Sep 2011 18:33:21 +0000 (11:33 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
David 'Digit' Turner [Fri, 23 Sep 2011 09:44:29 +0000 (11:44 +0200)]
resolved conflicts for merge of
2f2882a0 to master
Change-Id: Ia07eb9d022a8036c2b1674c591514740aa0d4596
Xavier Ducrohet [Fri, 23 Sep 2011 06:39:44 +0000 (23:39 -0700)]
am
4d2b9bf3: (-s ours) Cherrypick
6de7bc61 from do not merge.
* commit '
4d2b9bf341e7978225d6a305c2524ff79f2d18c5':
Cherrypick
6de7bc61 from master. do not merge.
David 'Digit' Turner [Fri, 23 Sep 2011 06:01:17 +0000 (23:01 -0700)]
am
fdb13fcc: am
0cc5e1ef: Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread
* commit '
fdb13fccfecdf526549ad453a20e8136253edb51':
sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
David 'Digit' Turner [Fri, 23 Sep 2011 05:59:07 +0000 (22:59 -0700)]
am
0cc5e1ef: Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread
* commit '
0cc5e1ef457f0eda3a3dfadc094b0e796ba9f3f2':
sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
David 'Digit' Turner [Fri, 23 Sep 2011 05:58:04 +0000 (22:58 -0700)]
Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread
Christopher Tate [Fri, 23 Sep 2011 01:24:30 +0000 (18:24 -0700)]
Add the shared-storage backup component to the build
Oops. Fixes bug
5341264
Change-Id: I99c51226c236c40bf56b1b94917f0eff56502963
The Android Automerger [Thu, 22 Sep 2011 22:43:11 +0000 (15:43 -0700)]
IFK84B
The Android Open Source Project [Thu, 22 Sep 2011 17:57:14 +0000 (10:57 -0700)]
Reconcile with honeycomb-LTE-release ics-factoryrom-release
Change-Id: I1e685412c0dc344067dbeb698d54b638fe3f5bf5
Doug Zongker [Thu, 22 Sep 2011 17:28:04 +0000 (10:28 -0700)]
change OTA tools to handle variable dev keys
The signing and OTA-building tools now understand the
default_sys_dev_certificate value which may be present in the
META/misc_info.txt file of the target-files packages.
Change-Id: I64f09ec0b77a5184b6ddb74019255518776ee773
The Android Automerger [Thu, 22 Sep 2011 13:31:13 +0000 (06:31 -0700)]
IFK84
The Android Automerger [Thu, 22 Sep 2011 13:27:14 +0000 (06:27 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Scott Main [Thu, 22 Sep 2011 04:07:57 +0000 (21:07 -0700)]
Merge "docs: enable 'updated' tag for resource docs"
Scott Main [Thu, 22 Sep 2011 03:51:54 +0000 (20:51 -0700)]
docs: enable 'updated' tag for resource docs
Change-Id: I070f14247088f6a88dcfdfb352615e588bf3e902
Scott Main [Thu, 22 Sep 2011 01:51:54 +0000 (18:51 -0700)]
Merge "docs: fix javadoc filtering script to not choke on R.styleable class but continue handling provisional api levels"
Scott Main [Thu, 22 Sep 2011 01:38:44 +0000 (18:38 -0700)]
docs: fix javadoc filtering script to not choke on R.styleable class but continue handling provisional api levels
Change-Id: Ia21ea5d4f379fd85d975d1f3fe387c311c7c15aa
Dianne Hackborn [Thu, 22 Sep 2011 01:11:44 +0000 (18:11 -0700)]
Merge "Let's call MR0 4.0.1."
Xavier Ducrohet [Wed, 21 Sep 2011 17:22:19 +0000 (10:22 -0700)]
Cherrypick
6de7bc61 from master. do not merge.
Copy notice file in the new system image folder
Change-Id: I66496f382b2d13b030de569b573630f3abe5b9de
Xavier Ducrohet [Wed, 21 Sep 2011 22:55:04 +0000 (15:55 -0700)]
Merge "Copy notice file in the new system image folder"
Dianne Hackborn [Wed, 21 Sep 2011 22:25:37 +0000 (15:25 -0700)]
Let's call MR0 4.0.1.
Change-Id: Ie55012702e2cfb1eb247941e8b73519ad9b5c547
Xavier Ducrohet [Wed, 21 Sep 2011 17:22:19 +0000 (10:22 -0700)]
Copy notice file in the new system image folder
Change-Id: I4fafe5dc9dc1749de56267206a9b847a97e6a14b
The Android Automerger [Wed, 21 Sep 2011 19:44:06 +0000 (12:44 -0700)]
IFK83B
The Android Automerger [Wed, 21 Sep 2011 18:12:05 +0000 (11:12 -0700)]
HLK75C
Vladimir Chtchetkine [Wed, 21 Sep 2011 14:01:34 +0000 (07:01 -0700)]
Packages media_profiles.xml file into emulated system image
The file is required by the camera framework to properly set it up to work with
emulated camera devices.
Change-Id: I39686841030d21ef23775972aa4ee0ecd7a91c02
The Android Automerger [Wed, 21 Sep 2011 13:32:26 +0000 (06:32 -0700)]
IFK83
The Android Automerger [Wed, 21 Sep 2011 13:28:22 +0000 (06:28 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Open Source Project [Wed, 21 Sep 2011 13:19:08 +0000 (06:19 -0700)]
Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-release ics-factoryrom-release
Change-Id: Ia9e4bd8eeec153bd3ba21c06320b743e60127921
Doug Zongker [Mon, 19 Sep 2011 22:02:03 +0000 (15:02 -0700)]
build the sqlite3 binary for use by the OTA tools
Change-Id: I2c6cc02dec74fdcedd3e2a6f3ddb1dfba657a883
OSDN Git Service
