OSDN Git Service
android-build SharedAccount [Mon, 3 May 2010 22:15:03 +0000 (15:15 -0700)]
FRF33B
Change-Id: I43e4e71d977ff530cc36565a0450edded231a34b
The Android Automerger [Mon, 3 May 2010 15:10:21 +0000 (08:10 -0700)]
FRF33
Change-Id: I7991b820eb9ef0671dbbef2729dbfc3efd21e3af
The Android Automerger [Mon, 3 May 2010 15:10:08 +0000 (08:10 -0700)]
Merge branch 'froyo' into froyo-release
android-build SharedAccount [Fri, 30 Apr 2010 01:00:16 +0000 (18:00 -0700)]
FRF29B
Change-Id: Ib1d0b8236ef81f4c4e2fa4b97ed9be776b5602d1
The Android Automerger [Thu, 29 Apr 2010 20:34:27 +0000 (13:34 -0700)]
FRF29
Change-Id: I420d44a306f38461d0443142ce1ee0ea426d5cc0
Doug Zongker [Wed, 28 Apr 2010 23:05:21 +0000 (16:05 -0700)]
add metadata to OTA package in easily-parsed form
This is only for use by the tools that manipulate OTA packages; it
doesn't touch device code.
Change-Id: I1e21b24b86340d8f86c9d15b2aeb79c461f75d18
The Android Automerger [Wed, 28 Apr 2010 19:21:35 +0000 (12:21 -0700)]
FRF28
Change-Id: I73b82507a9c4bd71e678771c9e0135806617857a
The Android Automerger [Wed, 28 Apr 2010 19:21:08 +0000 (12:21 -0700)]
Merge branch 'froyo' into froyo-release
Scott Main [Tue, 27 Apr 2010 21:23:04 +0000 (14:23 -0700)]
Merge "support a few more header levels for sidebox so the sidebox can be placed at any level and be semantically correct" into froyo
The Android Automerger [Mon, 26 Apr 2010 18:45:10 +0000 (11:45 -0700)]
FRF26
Change-Id: Ia56baf9d3ec4d1836cc41b13841ad7d5299cdb87
The Android Automerger [Mon, 26 Apr 2010 18:44:47 +0000 (11:44 -0700)]
Merge branch 'froyo' into froyo-release
android-build SharedAccount [Fri, 23 Apr 2010 22:00:19 +0000 (15:00 -0700)]
FRF23B
Change-Id: Ieac192af4ede1c43949e9a25825382a8f5cc4b38
Raphael [Sat, 17 Apr 2010 00:50:09 +0000 (17:50 -0700)]
Support building Windows SDK under Linux.
- envsetup.mk & config.mk: we define a new BUILD_OS and a minimal set
of things like BUILD_OUT to be able to use some local tools when
doing cross-compilation. This allows us to use the Linux version of
ACP when cross-compiling the tools to Windows.
- Makfile: include windows_sdk.mk when needed to build a Windows SDK.
- main.mk: support a win_sdk target (e.g. PRODUCT-sdk-win_sdk)
(Merge master Change I9d08d0df)
Raphael [Wed, 14 Apr 2010 19:19:12 +0000 (12:19 -0700)]
Make zipalign build for the Win SDK under Linux.
(Merge master Change Ibd667437)
The Android Automerger [Fri, 23 Apr 2010 18:55:17 +0000 (11:55 -0700)]
FRF23
Change-Id: I11369ad3f740a7f32924666a2be2d2324892d468
Scott Main [Fri, 23 Apr 2010 18:41:30 +0000 (11:41 -0700)]
support a few more header levels for sidebox so the sidebox can
be placed at any level and be semantically correct
Change-Id: I51b77e82a701e1898986698d3a58a1b8367ec5c6
The Android Automerger [Thu, 22 Apr 2010 23:16:49 +0000 (16:16 -0700)]
FRF22
Change-Id: Id599e3f330ee19ce3c521b618406a399fc05cc30
android-build SharedAccount [Wed, 21 Apr 2010 22:49:51 +0000 (15:49 -0700)]
FRF21B
Change-Id: I81caf83e64aeb793df87132a2b70105cfc37cf6f
The Android Automerger [Wed, 21 Apr 2010 17:46:53 +0000 (10:46 -0700)]
FRF21
Change-Id: I0a48513425a3b5d327fc4baca48d660e1e7f3d51
The Android Automerger [Wed, 21 Apr 2010 17:46:41 +0000 (10:46 -0700)]
Merge branch 'froyo' into froyo-release
Scott Main [Thu, 15 Apr 2010 23:34:41 +0000 (16:34 -0700)]
docs: misc css changes
make sidebox size match qv
make figure align with right margin
remove margins from the last <p> in a table cell
Change-Id: Ie655dac45728f782fb309f3c11c1b7ee56bc5660
Scott Main [Tue, 20 Apr 2010 22:34:22 +0000 (15:34 -0700)]
Merge "docs: add script to capture the ctrl+f key event (initiates 'find' search on the page) and expand all inherited members." into froyo
Roman Nurik [Tue, 13 Apr 2010 23:23:42 +0000 (16:23 -0700)]
cherry-pick from master:
42092024ebd81896e741829c50f37a7e0095392e
Enable query highlighting and result ranking for search autocomplete on d.a.c. Also make it case-insensitive.
Change-Id: I3dd0e4edd7efae5a5758952699c08f1a46bdfeda
The Android Automerger [Mon, 19 Apr 2010 19:50:36 +0000 (12:50 -0700)]
FRF19
Change-Id: I0001f872e23dafac03eea530997403dc924398ea
The Android Automerger [Mon, 19 Apr 2010 19:50:23 +0000 (12:50 -0700)]
Merge branch 'froyo' into froyo-release
Brad Fitzpatrick [Fri, 16 Apr 2010 23:55:41 +0000 (16:55 -0700)]
For userdebug builds, enable Dalvik lock contention sampling.
Change-Id: I75cca6fc0ac0d0adfc059a8f82b2f6ae584361f3
android-build SharedAccount [Fri, 16 Apr 2010 20:29:19 +0000 (13:29 -0700)]
FRF15D
Change-Id: Ie9d5588da5e7ba40af0aa59380dbefdb2ae2190d
android-build SharedAccount [Fri, 16 Apr 2010 18:44:21 +0000 (11:44 -0700)]
FRF15C
Change-Id: I18c1bcf6c5dafcab5fddfac9c91f2cb719989955
Scott Main [Fri, 16 Apr 2010 16:00:29 +0000 (09:00 -0700)]
docs: add script to capture the ctrl+f key event (initiates 'find' search
on the page) and expand all inherited members.
Also move the appropriate methods from -docs.js into -reference.js where
they belong and add some function documentation.
Change-Id: I421bbf27d3b41d377776b3d64a97380458fcebd6
android-build SharedAccount [Thu, 15 Apr 2010 22:43:06 +0000 (15:43 -0700)]
FRF15B
Change-Id: Ie0b692ab96a598d5ce86151bc189bfd1ec339ae3
The Android Automerger [Thu, 15 Apr 2010 15:12:44 +0000 (08:12 -0700)]
FRF15
Change-Id: Ieb6a3aa05ecac44676e1f9af2ff42cb7b0982a7a
The Android Automerger [Wed, 14 Apr 2010 18:28:38 +0000 (11:28 -0700)]
FRF14
Change-Id: I029b56662620274c63afb26239cd3aa982626bd7
The Android Automerger [Wed, 14 Apr 2010 18:28:25 +0000 (11:28 -0700)]
Merge branch 'froyo' into froyo-release
Wu-cheng Li [Sun, 4 Apr 2010 09:14:23 +0000 (17:14 +0800)]
Fix the check of double quoted @see tag.
Originally \n was not discarded so a balanced quoted string still
has compile error.
bug:
2553570
Change-Id: I073c0c0ba370d55493d3ee6d17c7ebe9f42afe7a
The Android Automerger [Tue, 13 Apr 2010 15:08:05 +0000 (08:08 -0700)]
FRF13
Change-Id: I42ad464136133700fb6e727bbb8d5c68899ede5f
The Android Automerger [Mon, 12 Apr 2010 22:45:43 +0000 (15:45 -0700)]
FRF12B
Change-Id: I35a7addef84c4f4f1b31e6f3185155f44915f4b6
The Android Automerger [Mon, 12 Apr 2010 16:45:42 +0000 (09:45 -0700)]
FRF12
Change-Id: I83a967378dddbdf116e41ebe1b8f2d667151d4ea
The Android Automerger [Mon, 12 Apr 2010 16:45:29 +0000 (09:45 -0700)]
Merge branch 'froyo' into froyo-release
Scott Main [Sat, 10 Apr 2010 00:03:42 +0000 (17:03 -0700)]
Merge "cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444 docs: various stylesheet changes indent tables revise figure class add caption classes for tables and images add styles for xml reference docs (used by resource types docs) tweak styles for the icon tables to eliminate obscure 'caption' class" into froyo
Xavier Ducrohet [Fri, 9 Apr 2010 01:07:27 +0000 (18:07 -0700)]
Add camera sounds to the emulator system image build.
Bug:
2538315
Change-Id: I30c477ecbe5f0c0a64ca7c3796e72642df0002bf
Scott Main [Mon, 29 Mar 2010 16:50:34 +0000 (09:50 -0700)]
cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444
docs: various stylesheet changes
indent tables
revise figure class
add caption classes for tables and images
add styles for xml reference docs (used by resource types docs)
tweak styles for the icon tables to eliminate obscure 'caption' class
Change-Id: I23f53d884f39a5f6a4b45172186e0d1c7619da30
Daniel Sandler [Thu, 8 Apr 2010 23:54:50 +0000 (16:54 -0700)]
Merge "Add Protips to all builds." into froyo
The Android Automerger [Thu, 8 Apr 2010 15:27:32 +0000 (08:27 -0700)]
FRF08
Change-Id: I11fef9bff647fb2cebe3f1377c2b36a1f75c4ea3
The Android Automerger [Thu, 8 Apr 2010 15:27:19 +0000 (08:27 -0700)]
Merge branch 'froyo' into froyo-release
Dianne Hackborn [Wed, 7 Apr 2010 21:13:47 +0000 (14:13 -0700)]
Add clean step for SDK version change.
Change-Id: I2ea85496af49572115dbbd9a98787b1fd54adc50
Daniel Sandler [Wed, 7 Apr 2010 20:48:47 +0000 (16:48 -0400)]
Add Protips to all builds.
Bug:
2559083
Change-Id: Ibd6333516a798f88e4d4ef08a6246812b1009a76
The Android Automerger [Wed, 7 Apr 2010 15:12:13 +0000 (08:12 -0700)]
FRF07
Change-Id: Ic2c57d9f58c7a79b44462f3f2350fef99da8acb4
The Android Automerger [Wed, 7 Apr 2010 15:12:01 +0000 (08:12 -0700)]
Merge branch 'froyo' into froyo-release
The Android Automerger [Tue, 6 Apr 2010 15:07:50 +0000 (08:07 -0700)]
FRF06
Change-Id: Ie3ed548f504bcb99828210310b12a18e709a2af5
Dianne Hackborn [Mon, 5 Apr 2010 19:33:11 +0000 (12:33 -0700)]
It's beginning to look a lot like release time!
Everywhere we build...
Froyo is now Android 2.2, API 8.
This breaks the YouTube prebuilt (yay prebuilts!) but little else.
Does this mean we are becoming mature?
Change-Id: I15d228d57853a0dfabc47dda253d55339a5b3d17
The Android Automerger [Mon, 5 Apr 2010 19:26:32 +0000 (12:26 -0700)]
FRF05B
Change-Id: I7ab57347ccfd76674fdbcd9b5879c0a68f1abf72
The Android Automerger [Mon, 5 Apr 2010 15:03:01 +0000 (08:03 -0700)]
FRF05
Change-Id: I35bfa4963157b395365fe0b5bcf64e448de244be
The Android Automerger [Mon, 5 Apr 2010 15:02:49 +0000 (08:02 -0700)]
Merge branch 'froyo' into froyo-release
android-build SharedAccount [Thu, 1 Apr 2010 20:36:40 +0000 (13:36 -0700)]
FRF01B
Change-Id: Ib9adba6d4da02287673c97267f479ecc3f1a308a
Xavier Ducrohet [Thu, 1 Apr 2010 20:20:21 +0000 (13:20 -0700)]
Package the proper vold config file in SDK system image.
Change-Id: I7698c76d8d704837106450a32cba7b9c8f5b4446
Xavier Ducrohet [Thu, 1 Apr 2010 17:50:01 +0000 (10:50 -0700)]
Merge "Add CarHome to the SDK." into froyo
The Android Automerger [Thu, 1 Apr 2010 15:07:49 +0000 (08:07 -0700)]
FRF01
Change-Id: If4b7c952f5213ed766aa2360ff47f379b4156d47
The Android Automerger [Thu, 1 Apr 2010 15:07:37 +0000 (08:07 -0700)]
Merge branch 'froyo' into froyo-release
Ying Wang [Thu, 1 Apr 2010 00:29:04 +0000 (17:29 -0700)]
Add symbols.zip and build.prop to sdk dist.
Change-Id: I667f5ef847a6e8e78c6b3df5c2b092bb5d863955
http://b/issue?id=
2394164
android-build SharedAccount [Wed, 31 Mar 2010 22:25:11 +0000 (15:25 -0700)]
FRE90B
Change-Id: I988b5b158dc10093c05df77a7ac6d5254a11d778
The Android Automerger [Wed, 31 Mar 2010 15:07:38 +0000 (08:07 -0700)]
FRE90
Change-Id: I7102ec597dab436550826238e06fea33c54f29c3
The Android Automerger [Wed, 31 Mar 2010 15:07:17 +0000 (08:07 -0700)]
Merge branch 'froyo' into froyo-release
Ying Wang [Tue, 30 Mar 2010 23:42:15 +0000 (16:42 -0700)]
Add comments for ANDROID_BUILD_SHELL
Change-Id: I71f0a1a08b097cd179bbcb684a9114267f9bf0db
Ying Wang [Tue, 30 Mar 2010 19:55:13 +0000 (12:55 -0700)]
Allow use of alternative to bash as the build shell.
Change-Id: Ib92217f90c98e04a1d16efd4904d9d7ba9dda3cf
http://b/issue?id=
2557214
Xavier Ducrohet [Tue, 30 Mar 2010 18:42:55 +0000 (11:42 -0700)]
Add CarHome to the SDK.
Bug:
2526512
Change-Id: Ia4f127a4b5ac3bf52ff9664cfbca6fdbda3aa154
The Android Automerger [Tue, 30 Mar 2010 15:05:29 +0000 (08:05 -0700)]
FRE89
Change-Id: I05edf6916bcaaae3ba09177558fac3a55fd92a4a
The Android Automerger [Mon, 29 Mar 2010 16:25:26 +0000 (09:25 -0700)]
FRE88B
Change-Id: I849dad0ea5c86f9c63b0929f83fd8b166270780a
The Android Automerger [Mon, 29 Mar 2010 16:25:17 +0000 (09:25 -0700)]
Merge branch 'froyo' into froyo-release
android-build SharedAccount [Mon, 29 Mar 2010 16:19:04 +0000 (09:19 -0700)]
burn FRE88
Change-Id: I67c228bb4f3a7885164406f4b68bdb89e810de86
Dirk Dougherty [Tue, 9 Mar 2010 01:31:26 +0000 (17:31 -0800)]
cherry-pick
db00a226071878ae9bd821d28903dca8f6071140 to froyo.
Change-Id: I2ba25432014c7f04748cd6502d6ded997ef21f48
Dirk Dougherty [Wed, 3 Mar 2010 22:34:51 +0000 (14:34 -0800)]
cherry-pick
fe0104041858046a0aa649c791869d7eb1a5c175 to froyo.
Change-Id: I9c95ebc6f735cb6abc2b0920c2274e0b5ce0ef70
Jean-Baptiste Queru [Fri, 26 Mar 2010 18:22:03 +0000 (11:22 -0700)]
Add separate language packs, for extra flexibility.
This way, languages can be managed more carefully through
the inheritance chain.
Bug:
2546758
Change-Id: I14e3d4d60716355fa702cc77128e9da04e30a612
Jean-Baptiste Queru [Fri, 26 Mar 2010 00:41:04 +0000 (17:41 -0700)]
Add Gallery3D in all builds.
Bug:
2546464
Change-Id: I110de0fe56bcc7128f490b3ed516637786777773
android-build SharedAccount [Fri, 26 Mar 2010 00:20:45 +0000 (17:20 -0700)]
FRE84C
Change-Id: If85e995e1cba0a474a44100548e0531cccd40ec8
android-build SharedAccount [Thu, 25 Mar 2010 21:17:16 +0000 (14:17 -0700)]
FRE84B
Change-Id: I42723190742008a3ab8f85634352da77acbe29e6
The Android Automerger [Thu, 25 Mar 2010 15:26:21 +0000 (08:26 -0700)]
FRE84
Change-Id: I018affe8ed004e4cf22193df23a7a23c86c6b2b4
The Android Automerger [Thu, 25 Mar 2010 15:25:54 +0000 (08:25 -0700)]
Merge branch 'master' into froyo-release
Ying Wang [Thu, 25 Mar 2010 06:22:33 +0000 (23:22 -0700)]
Cherry-pick
6f1c75849c4b101b55ae624755e43293724ce76e from eclair
Change-Id: I21a69669935d838595b2fa01c5be10e6c1975da9
Scott Main [Thu, 25 Mar 2010 00:20:39 +0000 (17:20 -0700)]
docs: remove sidebox-inner style
Change-Id: Ia1e1b10e6756ecf6c9154c2cc25d0dbd58c1907f
Scott Main [Wed, 24 Mar 2010 20:49:49 +0000 (13:49 -0700)]
docs: stylesheet change for figure class
Change-Id: I1f47fc70382daf9f14e057a83375cf727fb8afa7
Scott Main [Wed, 24 Mar 2010 20:47:22 +0000 (13:47 -0700)]
Merge "docs: style tweaks to sidebox and qv classes"
android-build SharedAccount [Wed, 24 Mar 2010 15:09:48 +0000 (08:09 -0700)]
FRE83
Change-Id: Ieaf684bc9a117c688297c66cd3127d7ae23a2fdc
android-build SharedAccount [Tue, 23 Mar 2010 23:33:51 +0000 (16:33 -0700)]
FRE82C
Change-Id: I79c7a557d3807ab59cf83f6d9dc8854361edc557
The Android Automerger [Tue, 23 Mar 2010 20:08:31 +0000 (13:08 -0700)]
FRE82B
Change-Id: I599c2e65ff72e8351ba14bfacffc85d7690ab59f
The Android Automerger [Tue, 23 Mar 2010 16:22:15 +0000 (09:22 -0700)]
FRE82
Change-Id: I07b94ffc268e4bfad9c2adf51e3281c66a37d343
The Android Automerger [Tue, 23 Mar 2010 16:22:04 +0000 (09:22 -0700)]
Merge branch 'master' into froyo-release
Jean-Baptiste Queru [Mon, 22 Mar 2010 17:59:08 +0000 (10:59 -0700)]
Source vendorsetup.sh from the device tree.
This way, individual open-source device configurations can
publish device-specific configurations without having
to maintain those centrally in envsetup.sh
Bug:
2533998
Change-Id: I1377846d4d3ebe7abcd2f8279a08abe54039cdbb
Jean-Baptiste Queru [Mon, 22 Mar 2010 17:55:26 +0000 (10:55 -0700)]
Add a "full" build config.
While the generic config is limited by its need to be inherited
by various configurations, the full config can afford some extra
settings by virtue of being essentially a "leaf" config (though
obviously it can be conbined with hardware-specific configurations
to run on specific devices).
Bug:
2533998
Change-Id: Ia95f0ce5305ada4ae6cdf69911fa9a0eeabf0900
The Android Automerger [Mon, 22 Mar 2010 14:55:22 +0000 (07:55 -0700)]
FRE81
Change-Id: I7023dae62426962bc6b28d5f2726af77c3f7758b
android-build SharedAccount [Fri, 19 Mar 2010 21:54:28 +0000 (14:54 -0700)]
FRE77D
Change-Id: I3b8aabf3fb3d66599ad81e69e625e04cd698eb6e
android-build SharedAccount [Fri, 19 Mar 2010 03:58:17 +0000 (20:58 -0700)]
FRE77C
Change-Id: Id4d4ab104715c3654eb2ff83657e231fd18295c4
android-build SharedAccount [Thu, 18 Mar 2010 19:10:12 +0000 (12:10 -0700)]
FRE77B
Change-Id: Ie0142e45511a7472b7d94e7fc8b1572206eee9ef
The Android Automerger [Thu, 18 Mar 2010 15:08:03 +0000 (08:08 -0700)]
FRE77
Change-Id: I584397aae843f1c42ebb4164a3e2b2fc1ee844d8
The Android Automerger [Thu, 18 Mar 2010 15:07:26 +0000 (08:07 -0700)]
Merge branch 'master' into froyo-release
Doug Zongker [Thu, 18 Mar 2010 00:46:58 +0000 (17:46 -0700)]
Merge "fix typo (leftover from some debugging code)"
Dan Egnor [Thu, 18 Mar 2010 00:13:29 +0000 (17:13 -0700)]
Merge "Allow explicit and implicit numbering of the same tag."
Ying Wang [Thu, 18 Mar 2010 00:07:39 +0000 (17:07 -0700)]
Add android-info.txt to the dist dir.
Change-Id: I735655205085b0baf490b0dd011eb59cb6d4c45b
http://b/issue?id=
2524072
Dan Egnor [Wed, 17 Mar 2010 23:59:12 +0000 (16:59 -0700)]
Allow explicit and implicit numbering of the same tag.
Change-Id: I59c24cc211250da7e0aed9e0b0aa16517fd72d55
Doug Zongker [Wed, 17 Mar 2010 23:39:30 +0000 (16:39 -0700)]
fix typo (leftover from some debugging code)
Change-Id: I29a42820ccf8567508f1aeefcc89c2462e9ad43c
The Android Automerger [Wed, 17 Mar 2010 16:08:38 +0000 (09:08 -0700)]
FRE76
Change-Id: I1104e0b95d3f6fee2c6e9ce6ea180a736c0ab94d