OSDN Git Service
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
The Android Automerger [Wed, 17 Mar 2010 16:08:26 +0000 (09:08 -0700)]
Merge branch 'master' into froyo-release
Scott Main [Wed, 17 Mar 2010 00:04:22 +0000 (17:04 -0700)]
docs: style tweaks to sidebox and qv classes
Removes extra whitespace from above the sidebox class and
adjusts the inner padding.
Removes extra whitespace from the right side of the quickview box
to align with the document margin.
Change-Id: I3d37ecc9a251a2c5c4e8d2c2942d05848c698faa
Ying Wang [Tue, 16 Mar 2010 23:13:56 +0000 (16:13 -0700)]
Support to override instr target package in inherit-package
http://b/issue?id=
2451361
With this CL, you can inherit a testing package to test a inheriting package.
Note: we change the meaning of $(5), so we need to change any existing calls
to inherit-package in other projects.
Change-Id: I673155d1b8b6006953d14e1ab87066536ebd1e54
The Android Automerger [Tue, 16 Mar 2010 15:13:09 +0000 (08:13 -0700)]
FRE75
Change-Id: I25a5d5416f37b1cbda6c529afc59430d1856c7bc
The Android Automerger [Tue, 16 Mar 2010 15:12:53 +0000 (08:12 -0700)]
Merge branch 'master' into froyo-release
Doug Zongker [Tue, 16 Mar 2010 00:52:32 +0000 (17:52 -0700)]
store filesystem config info in target files at build time
Store a dump of the desired uid/gid/mode for every system file in the
target_files zip. Modify ota_from_target_files to use this stored
information when it is available, instead of running fs_config from
the current client (which might be out of sync from the one where the
target_files zip was built).
b/
2516887 - New android_filesystem_config.h needed
Change-Id: I8409a0265d1d50daad9c2bc033c99b74b8931b20
The Android Automerger [Mon, 15 Mar 2010 17:10:08 +0000 (10:10 -0700)]
FRE74
Change-Id: I318c6b1f79e889f4f0c522a2654d8af1f4c48737
The Android Automerger [Mon, 15 Mar 2010 17:10:00 +0000 (10:10 -0700)]
Merge branch 'master' into froyo-release
android-build SharedAccount [Fri, 12 Mar 2010 18:41:22 +0000 (10:41 -0800)]
FRE70D, but should be ERE71 :-)
Change-Id: I3eca568e6d8e547e271a552f89bbd78f35e825e1
android-build SharedAccount [Fri, 12 Mar 2010 02:29:12 +0000 (18:29 -0800)]
FRE70C
Change-Id: I8377c12fa0e115a86e65623e68754e65d414c074
The Android Automerger [Thu, 11 Mar 2010 18:03:11 +0000 (10:03 -0800)]
FRE70B
Change-Id: I296572951462f74f0962dd3ccc6c493f0eb95190
The Android Automerger [Thu, 11 Mar 2010 16:12:56 +0000 (08:12 -0800)]
FRE70
Change-Id: I69828a69fc21e856ff7d7f7aa7d5a82623bc332c
The Android Automerger [Thu, 11 Mar 2010 16:12:43 +0000 (08:12 -0800)]
Merge branch 'master' into froyo-release
Dianne Hackborn [Thu, 11 Mar 2010 00:02:58 +0000 (16:02 -0800)]
Car mode is now a standard part of the platform.
The car mode switcher should be on every device, as should the standard
car home app.
Change-Id: I88bdb3a8b3fc0e748f010ac6592d088bcc0022b0
Colin Cross [Thu, 11 Mar 2010 02:14:31 +0000 (18:14 -0800)]
Merge "Use ARCH_ARM_HAVE_ARMV7A to select qemu kernel for dexpreopt"
Colin Cross [Thu, 11 Mar 2010 02:14:03 +0000 (18:14 -0800)]
Merge changes Ib3b44e83,I70d50928
* changes:
Add a new build target armv7-a-neon
Modify the armv7-a target arch to not use NEON
Marco Nelissen [Thu, 11 Mar 2010 00:34:15 +0000 (16:34 -0800)]
Merge "Update warn.py with more warnings"
Ying Wang [Thu, 11 Mar 2010 00:20:32 +0000 (16:20 -0800)]
Merge "Don't force localization for package tagged as tests."
Marco Nelissen [Thu, 11 Mar 2010 00:16:02 +0000 (16:16 -0800)]
Update warn.py with more warnings
Change-Id: Ic65e6effe2be60d6a6c2a53c6acf356ad9e7ea94
Colin Cross [Tue, 9 Mar 2010 03:07:40 +0000 (19:07 -0800)]
Use ARCH_ARM_HAVE_ARMV7A to select qemu kernel for dexpreopt
Change-Id: I440d944e87324038e465415b1b71613b31052f99
Colin Cross [Tue, 9 Mar 2010 02:32:43 +0000 (18:32 -0800)]
Add a new build target armv7-a-neon
Change-Id: Ib3b44e839b093974aff0d595950e6b691beee7a5
Colin Cross [Tue, 9 Mar 2010 03:07:26 +0000 (19:07 -0800)]
Modify the armv7-a target arch to not use NEON
To build for a target with NEON, use armv7-a-neon
Change-Id: I70d509287b04c0faebe44faf6c8ebb28a7360ff9
Ying Wang [Thu, 11 Mar 2010 00:02:42 +0000 (16:02 -0800)]
Don't force localization for package tagged as tests.
Change-Id: I612598443371fc388cf08ddde7ebdd1d3dec9c7e
Ying Wang [Wed, 10 Mar 2010 21:36:42 +0000 (13:36 -0800)]
Merge "Let Proguard load emma jar if it's enabled."
The Android Automerger [Wed, 10 Mar 2010 16:13:02 +0000 (08:13 -0800)]
FRE69
Change-Id: I4865703a23a3ec4fe9d38d2707eb1c4680f5bf12
The Android Automerger [Wed, 10 Mar 2010 16:12:44 +0000 (08:12 -0800)]
Merge branch 'master' into froyo-release
Ying Wang [Wed, 10 Mar 2010 01:24:32 +0000 (17:24 -0800)]
Let Proguard load emma jar if it's enabled.
Change-Id: I57a0bcfb486339f48dc25f5fc5d44a1178dee678
See: http://b/issue?id=
2502181
The Android Automerger [Tue, 9 Mar 2010 16:13:17 +0000 (08:13 -0800)]
FRE68
Change-Id: I72c18298dbc6116282bd7df73ae4b90e27b06a76
The Android Automerger [Tue, 9 Mar 2010 16:12:53 +0000 (08:12 -0800)]
Merge branch 'master' into froyo-release
Bjorn Bringert [Tue, 9 Mar 2010 14:37:21 +0000 (14:37 +0000)]
Make ProGuard keep @VisibleForTesting classes and methods
Change-Id: I7f5d14fd4188859c52ab85c33af1ac275888611c
Jean-Baptiste Queru [Tue, 9 Mar 2010 02:04:03 +0000 (18:04 -0800)]
Add an empty CleanSpec.mk
Change-Id: Idc6adae88917383b19af0a7cfec88526cd6ac176
The Android Open Source Project [Tue, 9 Mar 2010 01:16:23 +0000 (17:16 -0800)]
merge from open-source master
Change-Id: I9fedeb014c946b53bfdd424b00c0cb5fc08f8333
Andy McFadden [Mon, 8 Mar 2010 20:42:46 +0000 (12:42 -0800)]
Added -lpthread to target LDFLAGS for sim-eng.
This adds "-lpthread" to TARGET_GLOBAL_LDFLAGS when TARGET_SIMULATOR
is true. This is much easier than inserting it into individual
makefiles as needed. Has no effect on other builds.
Should fix the sim-eng build breakage in libcameraservice.
Change-Id: I4dcd7d54b93d1be1622b8ce78a1662d28ca9f9f2
The Android Automerger [Mon, 8 Mar 2010 17:16:30 +0000 (09:16 -0800)]
FRE67
Change-Id: I34266bae07be0d7ca676b20227a539ef458ebded
The Android Automerger [Mon, 8 Mar 2010 17:16:08 +0000 (09:16 -0800)]
Merge branch 'master' into froyo-release
Dan Egnor [Fri, 5 Mar 2010 23:31:49 +0000 (15:31 -0800)]
Cleanspec rules to take care of old (pre-static) libraries.
(The build system doesn't react gracefully when something is switched
from a shared library to a static library.)