OSDN Git Service
Xavier Ducrohet [Thu, 19 Nov 2009 01:17:47 +0000 (17:17 -0800)]
am
258b2b45: am
1ae98804: Change where makefile looks for sdk_clean.sh
Merge commit '
258b2b4504949fa95b733b149dd5f8146bfb7887' into eclair-mr2
* commit '
258b2b4504949fa95b733b149dd5f8146bfb7887':
Change where makefile looks for sdk_clean.sh
Scott Main [Thu, 19 Nov 2009 01:17:43 +0000 (17:17 -0800)]
am
ec9baf22: am
9a5c8402: docs: make all javadoc reference links use <code> and remove some unused CSS
Merge commit '
ec9baf22a959af85f77f56360e95a738f360c4f0' into eclair-mr2
* commit '
ec9baf22a959af85f77f56360e95a738f360c4f0':
docs: make all javadoc reference links use <code>
Xavier Ducrohet [Thu, 19 Nov 2009 01:11:53 +0000 (17:11 -0800)]
am
1ae98804: Change where makefile looks for sdk_clean.sh
Merge commit '
1ae988040777f88f766fc421af79a61175e917af' into eclair
* commit '
1ae988040777f88f766fc421af79a61175e917af':
Change where makefile looks for sdk_clean.sh
Scott Main [Thu, 19 Nov 2009 01:11:50 +0000 (17:11 -0800)]
am
9a5c8402: docs: make all javadoc reference links use <code> and remove some unused CSS
Merge commit '
9a5c84020595eac7e20fce036a9afd7c06766457' into eclair
* commit '
9a5c84020595eac7e20fce036a9afd7c06766457':
docs: make all javadoc reference links use <code>
Brett Chabot [Wed, 18 Nov 2009 22:46:22 +0000 (14:46 -0800)]
am
2779fa7d: Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
Merge commit '
2779fa7d9fea6f61392135a231e69a3e9b89768e' into eclair-mr2
* commit '
2779fa7d9fea6f61392135a231e69a3e9b89768e':
Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
Brett Chabot [Thu, 12 Nov 2009 21:29:07 +0000 (13:29 -0800)]
Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
Bug
2099347
Change-Id: Ica876daca8993e8f6eefda6f1a733dcadc92f292
Android (Google) Code Review [Wed, 18 Nov 2009 21:26:15 +0000 (13:26 -0800)]
Merge change I4414f233 into eclair-mr2
* changes:
Remove references to com.google.android.gtalkservice.xml.
Jeff Hamilton [Wed, 18 Nov 2009 07:39:52 +0000 (23:39 -0800)]
Remove references to com.google.android.gtalkservice.xml.
Dan Egnor [Wed, 18 Nov 2009 05:11:08 +0000 (21:11 -0800)]
Remove external/googleclient (the code moved elsewhere)
Dan Bornstein [Wed, 18 Nov 2009 00:27:02 +0000 (16:27 -0800)]
resolved conflicts for merge of
c3d9645e to eclair-mr2
Android (Google) Code Review [Tue, 17 Nov 2009 23:39:46 +0000 (15:39 -0800)]
Merge change I392672f1 into eclair
* changes:
Add the example test to the CTS.
Xavier Ducrohet [Tue, 17 Nov 2009 23:10:41 +0000 (15:10 -0800)]
Change where makefile looks for sdk_clean.sh
Dan Bornstein [Tue, 17 Nov 2009 22:27:40 +0000 (14:27 -0800)]
Add the example test to the CTS.
Change-Id: I392672f1767bf72a18058de49c8658dabdc93a4d
Adam Bliss [Tue, 17 Nov 2009 03:56:34 +0000 (19:56 -0800)]
am
580cdbe0: Enables nodpi drawables in the framework.
Merge commit '
580cdbe0fe0dd794c7035d8a406353f88aad827e' into eclair-mr2
* commit '
580cdbe0fe0dd794c7035d8a406353f88aad827e':
Enables nodpi drawables in the framework.
Adam Bliss [Tue, 17 Nov 2009 01:18:40 +0000 (17:18 -0800)]
Enables nodpi drawables in the framework.
Christopher Tate [Fri, 13 Nov 2009 17:08:38 +0000 (09:08 -0800)]
am
eb71bf7b: Merge change I01d9d733 into eclair
Merge commit '
eb71bf7b743c94796dd6a93f8fa11e0fa6b8996b' into eclair-mr2
* commit '
eb71bf7b743c94796dd6a93f8fa11e0fa6b8996b':
Add a host shell function to generate system_server stack traces
Dianne Hackborn [Fri, 13 Nov 2009 17:08:34 +0000 (09:08 -0800)]
am
d0b22902: Merge change I847e8ab8 into eclair
Merge commit '
d0b229025792977fe668cd636c7875d954b80b82' into eclair-mr2
* commit '
d0b229025792977fe668cd636c7875d954b80b82':
Fix issue #
2258571: Fix build versions
Xavier Ducrohet [Fri, 13 Nov 2009 17:08:30 +0000 (09:08 -0800)]
am
c725b6ee: Merge change I4d3d08a1 into eclair
Merge commit '
c725b6ee0c192c134a9ce4d74ecda9cbcd2c1275' into eclair-mr2
* commit '
c725b6ee0c192c134a9ce4d74ecda9cbcd2c1275':
Add the sdk overlay to the build.
Android (Google) Code Review [Fri, 13 Nov 2009 00:46:35 +0000 (16:46 -0800)]
Merge change I01d9d733 into eclair
* changes:
Add a host shell function to generate system_server stack traces
Android (Google) Code Review [Fri, 13 Nov 2009 00:28:03 +0000 (16:28 -0800)]
Merge change I847e8ab8 into eclair
* changes:
Fix issue #
2258571: Fix build versions
Android (Google) Code Review [Fri, 13 Nov 2009 00:20:00 +0000 (16:20 -0800)]
Merge change I4d3d08a1 into eclair
* changes:
Add the sdk overlay to the build.
Dianne Hackborn [Thu, 12 Nov 2009 23:35:35 +0000 (15:35 -0800)]
Fix issue #
2258571: Fix build versions
Change-Id: I847e8ab8080d5a0716e913da8e176e7dfcd966eb
Christopher Tate [Thu, 12 Nov 2009 23:33:08 +0000 (15:33 -0800)]
Add a host shell function to generate system_server stack traces
For debugging non-ANR weird states in the system server, it is incredibly handy
to be able to force a complete thread-stack dump of that process. Here's a
shell function that does so (creating the /data/anr/traces.txt file with the
usual permissions if it does not yet exist).
Depends on adb having been configured to run as root.
Change-Id: I01d9d733ef08ffefb00cb61968df36ecf62087f0
Android (Google) Code Review [Thu, 12 Nov 2009 22:10:31 +0000 (14:10 -0800)]
Merge change I0c33d697 into eclair-mr2
* changes:
Clean old DropBoxService.java generated class
Dan Egnor [Thu, 12 Nov 2009 19:42:15 +0000 (11:42 -0800)]
Clean old DropBoxService.java generated class
David 'Digit' Turner [Thu, 12 Nov 2009 02:12:06 +0000 (18:12 -0800)]
am
31597999: Merge change I2edfb71d into eclair
Merge commit '
31597999a61c6b58b8f8b903f5f228a6ca07183f' into eclair-mr2
* commit '
31597999a61c6b58b8f8b903f5f228a6ca07183f':
Support secondary CPU ABI in build.prop
Android (Google) Code Review [Thu, 12 Nov 2009 02:08:03 +0000 (18:08 -0800)]
Merge change I2edfb71d into eclair
* changes:
Support secondary CPU ABI in build.prop
Xavier Ducrohet [Wed, 11 Nov 2009 01:52:55 +0000 (17:52 -0800)]
Add the sdk overlay to the build.
Change-Id: I4d3d08a13d23194a84fdd822a130f9aa71bb6360
Android (Google) Code Review [Tue, 10 Nov 2009 22:54:04 +0000 (14:54 -0800)]
Merge change I2bba1884 into eclair-mr2
* changes:
Clean libwebkit, libjs and libv8 after WebKit merge.
Doug Zongker [Tue, 10 Nov 2009 20:33:31 +0000 (12:33 -0800)]
am
f17e6387: allow use of unzip version 6.0
Merge commit '
f17e63879c9356d107bda7f8d599f7ce5f449051' into eclair-mr2
* commit '
f17e63879c9356d107bda7f8d599f7ce5f449051':
allow use of unzip version 6.0
Doug Zongker [Tue, 10 Nov 2009 02:19:48 +0000 (18:19 -0800)]
allow use of unzip version 6.0
Unzip 6.0 changes the name of the fourth column in the "unzip -lv"
output from "Ratio" to "Cmpr". Allow either name so that
dump-package-stats works with both unzip 5 and unzip 6.
Steve Block [Tue, 10 Nov 2009 02:15:49 +0000 (02:15 +0000)]
Clean libwebkit, libjs and libv8 after WebKit merge.
Change-Id: I2bba18843aa31b849de53e047dceb40de5eccc8a
Xavier Ducrohet [Mon, 9 Nov 2009 19:59:56 +0000 (11:59 -0800)]
am
216faf3f: Add Livewallpapers picker to SDK.
Merge commit '
216faf3f1c2c8857ad7e88e860897766c830ce31' into eclair-mr2
* commit '
216faf3f1c2c8857ad7e88e860897766c830ce31':
Add Livewallpapers picker to SDK.
Xavier Ducrohet [Mon, 9 Nov 2009 19:59:51 +0000 (11:59 -0800)]
am
58302409: Add CertInstaller to the SDK.
Merge commit '
58302409dd88d10e5c0ab03e5c5b5729ca41111a' into eclair-mr2
* commit '
58302409dd88d10e5c0ab03e5c5b5729ca41111a':
Add CertInstaller to the SDK.
Xavier Ducrohet [Sun, 8 Nov 2009 23:42:25 +0000 (15:42 -0800)]
Add Livewallpapers picker to SDK.
Change-Id: If14c073c13b13bdd042e2a48aa867f4fa2be7572
Xavier Ducrohet [Thu, 29 Oct 2009 23:40:03 +0000 (16:40 -0700)]
Add CertInstaller to the SDK.
Change-Id: I1e680d24080a6514e2dc049d64e570f8cd759dd7
David 'Digit' Turner [Fri, 6 Nov 2009 23:12:00 +0000 (15:12 -0800)]
Support secondary CPU ABI in build.prop
BoardConfig.mk typically defines TARGET_CPU_ABI to the name of the
native machine code CPU ABI supported by the target device. For example,
existing devices today use the value 'armeabi' corresponding to an
ARMv5TE instruction set with soft-float implementation.
This patch allows this file to also define TARGET_CPU_ABI2 to name
a secondary (minor) CPU ABI also supported by the device. This is useful
when the main ABI is ARMv7-A (identified as 'armeabi-v7a') which also
supports ARMv5TE. Such devices should have TARGET_CPU_ABI defined to
'armeabi-v7a' and TARGET_CPU_ABI2 defined to 'armeabi'.
TARGET_CPU_ABI2 will be translated into the ro.product.cpu.abi2 property
in build.prop. This value will be used by the PackageManager to handle
"fat-binaries" generated with the NDK.
Android (Google) Code Review [Fri, 6 Nov 2009 19:16:37 +0000 (14:16 -0500)]
Merge change I8dd26ee4 into eclair-mr2
* changes:
remove reference to SK_RELEASE, since that is automatically set based on NDEBUG (or its absence)
Fred Quintana [Thu, 5 Nov 2009 19:23:44 +0000 (11:23 -0800)]
am
357f5bc8: Merge change I7397e6fe into eclair
Merge commit '
357f5bc804fc80f06776e1da141e4b322d7e3248' into eclair-mr2
* commit '
357f5bc804fc80f06776e1da141e4b322d7e3248':
add the new accounts and sync package to the generic target and enable sync for all builds
Android (Google) Code Review [Thu, 5 Nov 2009 19:15:58 +0000 (14:15 -0500)]
Merge change I7397e6fe into eclair
* changes:
add the new accounts and sync package to the generic target and enable sync for all builds
Steve Block [Tue, 3 Nov 2009 21:10:45 +0000 (21:10 +0000)]
WebKit clean required by move of V8 to external/v8.
Change-Id: Idc425e143c928a7da39af9a002705699e3e12901
Scott Main [Wed, 4 Nov 2009 23:02:30 +0000 (15:02 -0800)]
docs: make all javadoc reference links use <code>
and remove some unused CSS
Scott Main [Wed, 4 Nov 2009 03:12:40 +0000 (19:12 -0800)]
am
24fbbfaa: am
3f7d1df1: docs: revise resizing scripts to better organize the tasks into chunks that are only executed when necessary.
Merge commit '
24fbbfaa80ce17481e695c001b66c0176b8f0f00' into eclair-mr2
* commit '
24fbbfaa80ce17481e695c001b66c0176b8f0f00':
docs: revise resizing scripts to better organize the
Scott Main [Wed, 4 Nov 2009 03:04:40 +0000 (19:04 -0800)]
am
3f7d1df1: docs: revise resizing scripts to better organize the tasks into chunks that are only executed when necessary.
Merge commit '
3f7d1df12938b6db9849b03c05d5a56784ee147b' into eclair
* commit '
3f7d1df12938b6db9849b03c05d5a56784ee147b':
docs: revise resizing scripts to better organize the
Fred Quintana [Tue, 3 Nov 2009 23:04:59 +0000 (15:04 -0800)]
add the new accounts and sync package to the generic target and enable sync for all builds
Scott Main [Mon, 2 Nov 2009 23:31:04 +0000 (15:31 -0800)]
docs: revise resizing scripts to better organize the
tasks into chunks that are only executed when necessary.
Move the stuff that does the reference panel resizing
into a separate method because this should only happen when
literally resizing the panels. This thus resolves the problem
in which an invalid cookie would sometimes be written during
a normal window resize event -- there's no need to write that
cookie unless the user literally resizes the panel.
There's no need to call resizeWidth all the time, the doc-content
div can manage its width by inheritence and should only ever have
to resize its left margin when the side nav is manually resized or
when the page is loaded (in order to account for a saved side nav
width). This vastly improves the performance and visual quality
when resizing. However, IE6 still requires this in order for the scrollbars
to be visible in the content area. So a flag is now set when IE6 is
the browser, it has its own onresize method
and the width is defined only for IE6.
Inside resizeHeight, check what the href path is before doing any
resizing, just to make sure we don't do unecessary work and to
make the code more readable.
Scott Main [Tue, 3 Nov 2009 02:50:09 +0000 (18:50 -0800)]
am
ec4194ef: am
64b879ac: docs: fix js error when there\'s no api level cookie saved.
Merge commit '
ec4194ef1baa2906f916a01e368bb5d6805ba245' into eclair-mr2
* commit '
ec4194ef1baa2906f916a01e368bb5d6805ba245':
docs: fix js error when there's no api level cookie saved.
Scott Main [Tue, 3 Nov 2009 02:40:23 +0000 (18:40 -0800)]
am
64b879ac: docs: fix js error when there\'s no api level cookie saved.
Merge commit '
64b879ac5bbabe0489869f76b3a20f26aca6ce22' into eclair
* commit '
64b879ac5bbabe0489869f76b3a20f26aca6ce22':
docs: fix js error when there's no api level cookie saved.
Scott Main [Tue, 3 Nov 2009 02:05:41 +0000 (18:05 -0800)]
docs: fix js error when there's no api level cookie saved.
currently, if there's no api level cookie saved, then
the selectedLevelItem variable will be undefined and will
throw an error at the end of the buildApilevelSelector function.
Now, userApiLevel is set to the max level in this case.
Scott Main [Fri, 30 Oct 2009 22:15:14 +0000 (15:15 -0700)]
am
32b505d9: am
8e44ae9c: docs: fix IE6 bug in which tabs are not focusable while in the reference. also increase the minimum width for the header to avoid line-wrapping of the tabs.
Merge commit '
32b505d984ed15156b87482f849b865892b57ac2' into eclair-mr2
* commit '
32b505d984ed15156b87482f849b865892b57ac2':
docs: fix IE6 bug in which tabs are not focusable
Scott Main [Fri, 30 Oct 2009 22:04:17 +0000 (15:04 -0700)]
am
8e44ae9c: docs: fix IE6 bug in which tabs are not focusable while in the reference. also increase the minimum width for the header to avoid line-wrapping of the tabs.
Merge commit '
8e44ae9c762785d80e54bc75e2ba353f486414ec' into eclair
* commit '
8e44ae9c762785d80e54bc75e2ba353f486414ec':
docs: fix IE6 bug in which tabs are not focusable
Scott Main [Fri, 30 Oct 2009 20:33:39 +0000 (13:33 -0700)]
docs: fix IE6 bug in which tabs are not focusable
while in the reference. also increase the minimum
width for the header to avoid line-wrapping of the tabs.
Mike Reed [Fri, 30 Oct 2009 12:32:28 +0000 (08:32 -0400)]
remove reference to SK_RELEASE, since that is automatically set based on NDEBUG (or its absence)
i.e. if NDEBUG is defined, then SK_RELEASE will get defined in the skia config headers
Dan Egnor [Thu, 29 Oct 2009 20:05:27 +0000 (13:05 -0700)]
Fix incremental build break in openssl.
Scott Main [Thu, 29 Oct 2009 08:25:23 +0000 (01:25 -0700)]
am
a7d1eaf5: am
9b5fdb9c: docs: add checkbox to toggle the api level filter on and off; this includes some function renaming for the related scripts.
Merge commit '
a7d1eaf572e391ed0e4ba6c39c02804ad0c1e14e' into eclair-mr2
* commit '
a7d1eaf572e391ed0e4ba6c39c02804ad0c1e14e':
docs: add checkbox to toggle the api level filter on and off;
Dan Egnor [Wed, 28 Oct 2009 01:46:27 +0000 (18:46 -0700)]
Clean frameworks after replacing IDropBox.aidl with
IDropBoxService.aidl, which causes some build confusion
with dependencies and Parcelables and so on.
(Will be checked in immediately after the change in question)
android-build SharedAccount [Wed, 28 Oct 2009 23:12:11 +0000 (16:12 -0700)]
resolved conflicts for merge of
3fa11599 to eclair-mr2
Scott Main [Wed, 28 Oct 2009 17:30:34 +0000 (10:30 -0700)]
am
836a695f: am
f1bac52f: fix search for offline docs. again.
Merge commit '
836a695f01799566969c12d5c83459bdb5d8b2c2' into eclair-mr2
* commit '
836a695f01799566969c12d5c83459bdb5d8b2c2':
fix search for offline docs. again.
Dirk Dougherty [Wed, 28 Oct 2009 17:26:52 +0000 (10:26 -0700)]
am
ee3a3c1f: am
c2c5e505: doc change: include SDK Tools in notice to 1.6 developers.
Merge commit '
ee3a3c1f59f6d0d50edce5b0f0f33c02eb3c53d7' into eclair-mr2
* commit '
ee3a3c1f59f6d0d50edce5b0f0f33c02eb3c53d7':
doc change: include SDK Tools in notice to 1.6 developers.
Scott Main [Wed, 28 Oct 2009 00:39:37 +0000 (17:39 -0700)]
am
9b5fdb9c: docs: add checkbox to toggle the api level filter on and off; this includes some function renaming for the related scripts.
Merge commit '
9b5fdb9c23f9301d1a963a6e9be4b46ad70922d7' into eclair
* commit '
9b5fdb9c23f9301d1a963a6e9be4b46ad70922d7':
docs: add checkbox to toggle the api level filter on and off;
Scott Main [Tue, 27 Oct 2009 22:09:15 +0000 (15:09 -0700)]
docs: add checkbox to toggle the api level filter on and off;
this includes some function renaming for the related scripts.
the checkbox will be unchecked by default, so any users
that currently have an api level filter selected will now
see all apis until they click the checkbox. the old api level
cookie is still saved the same, but the selected value will only
be applied if the checkbox is selected, which has its own cookie
for on or off.
Dianne Hackborn [Fri, 23 Oct 2009 19:17:45 +0000 (12:17 -0700)]
Bump version to 2.1 API 6.
Change-Id: Ic607952dfaa96d8735c83bb26bae4f2f4161fcbc
Scott Main [Mon, 26 Oct 2009 22:41:42 +0000 (15:41 -0700)]
am
f1bac52f: fix search for offline docs. again.
Merge commit '
f1bac52fe28ba503c63c929d9d0711671273635f' into eclair
* commit '
f1bac52fe28ba503c63c929d9d0711671273635f':
fix search for offline docs. again.
Scott Main [Mon, 26 Oct 2009 21:44:48 +0000 (14:44 -0700)]
fix search for offline docs. again.
Dirk Dougherty [Mon, 26 Oct 2009 18:18:47 +0000 (11:18 -0700)]
am
c2c5e505: doc change: include SDK Tools in notice to 1.6 developers.
Merge commit '
c2c5e505ac5eda38eb7be4e2ce8f094e5c0e1259' into eclair
* commit '
c2c5e505ac5eda38eb7be4e2ce8f094e5c0e1259':
doc change: include SDK Tools in notice to 1.6 developers.
Dirk Dougherty [Sat, 24 Oct 2009 21:38:58 +0000 (14:38 -0700)]
doc change: include SDK Tools in notice to 1.6 developers.
Bug:
2160782
Change-Id: Ib70255c889495df7dbb958fe51977735554a0912
Scott Main [Sat, 24 Oct 2009 04:13:32 +0000 (21:13 -0700)]
am
3af366dd: am
462cc377: docs: implement sdk announcement in a collapsible box and revise the \'special\' box color and add rounded corners.
Merge commit '
3af366ddb2634f97f440b1437bbd21d00101c93b' into eclair-mr2
* commit '
3af366ddb2634f97f440b1437bbd21d00101c93b':
docs: implement sdk announcement in a collapsible box
Scott Main [Sat, 24 Oct 2009 04:04:02 +0000 (21:04 -0700)]
am
462cc377: docs: implement sdk announcement in a collapsible box and revise the \'special\' box color and add rounded corners.
Merge commit '
462cc37742b4e7d8e348ac9264eb3e5e35cbfeef' into eclair
* commit '
462cc37742b4e7d8e348ac9264eb3e5e35cbfeef':
docs: implement sdk announcement in a collapsible box
Scott Main [Sat, 24 Oct 2009 00:08:14 +0000 (17:08 -0700)]
am
e0ac5c3e: am
0d8872e6: docs: change javascript so that SDK docs that are not listed in the left nav do not highlight parent index documents
Merge commit '
e0ac5c3e86bf9980ab9181b1cebdf937a8eb36e9' into eclair-mr2
* commit '
e0ac5c3e86bf9980ab9181b1cebdf937a8eb36e9':
docs: change javascript so that SDK docs that are not
Scott Main [Sat, 24 Oct 2009 00:00:25 +0000 (17:00 -0700)]
am
0d8872e6: docs: change javascript so that SDK docs that are not listed in the left nav do not highlight parent index documents
Merge commit '
0d8872e6f2462a947c1543b88a7a353072b808e3' into eclair
* commit '
0d8872e6f2462a947c1543b88a7a353072b808e3':
docs: change javascript so that SDK docs that are not
Scott Main [Fri, 23 Oct 2009 23:19:37 +0000 (16:19 -0700)]
docs: implement sdk announcement in a collapsible box
and revise the 'special' box color and add rounded corners.
Scott Main [Fri, 23 Oct 2009 20:10:12 +0000 (13:10 -0700)]
am
f963ee63: am
60dba894: docs: add eclair logo for homepage
Merge commit '
f963ee638c974942ad99ff4ca9ec985d489e5388' into eclair-mr2
* commit '
f963ee638c974942ad99ff4ca9ec985d489e5388':
docs: add eclair logo for homepage
Scott Main [Fri, 23 Oct 2009 20:04:31 +0000 (13:04 -0700)]
docs: change javascript so that SDK docs that are not
listed in the left nav do not highlight parent index documents
Scott Main [Fri, 23 Oct 2009 20:02:29 +0000 (13:02 -0700)]
am
60dba894: docs: add eclair logo for homepage
Merge commit '
60dba89451e4ee489720436a9a3f3de4823da7d2' into eclair
* commit '
60dba89451e4ee489720436a9a3f3de4823da7d2':
docs: add eclair logo for homepage
Scott Main [Fri, 23 Oct 2009 19:22:42 +0000 (12:22 -0700)]
docs: add eclair logo for homepage
Doug Zongker [Thu, 22 Oct 2009 23:09:34 +0000 (16:09 -0700)]
stop adding ota-rel-keys tag when signing
ota-rel-keys is now redundant with release-keys, since there are no
"half-signed" builds any more.
Brett Chabot [Thu, 22 Oct 2009 21:12:09 +0000 (14:12 -0700)]
am
5449e457: Merge change I3fb149d2 into eclair
Merge commit '
5449e457534a619f7b2aaa008024095023b801ba' into eclair-mr2
* commit '
5449e457534a619f7b2aaa008024095023b801ba':
Remove 'cd top' step from envsetup runtest shortcut.
Android (Google) Code Review [Thu, 22 Oct 2009 21:04:56 +0000 (17:04 -0400)]
Merge change I3fb149d2 into eclair
* changes:
Remove 'cd top' step from envsetup runtest shortcut.
Dirk Dougherty [Thu, 22 Oct 2009 18:31:55 +0000 (11:31 -0700)]
am
f03f574a: am
3d3d7b7e: doc change: template changes for new SDK doc structure.
Merge commit '
f03f574a021e412b2060116c1112b62b4c21c2fe' into eclair-mr2
* commit '
f03f574a021e412b2060116c1112b62b4c21c2fe':
doc change: template changes for new SDK doc structure.
Dirk Dougherty [Thu, 22 Oct 2009 18:31:51 +0000 (11:31 -0700)]
am
51da2c57: am
fce6b45f: doc change: template/asset changes for sdk package.
Merge commit '
51da2c573d945d17890e519e7e26a89b2d2f7b51' into eclair-mr2
* commit '
51da2c573d945d17890e519e7e26a89b2d2f7b51':
doc change: template/asset changes for sdk package.
Dirk Dougherty [Thu, 22 Oct 2009 18:22:00 +0000 (11:22 -0700)]
am
3d3d7b7e: doc change: template changes for new SDK doc structure.
Merge commit '
3d3d7b7efd755d13c7e70f01b1ba00ba0742a354' into eclair
* commit '
3d3d7b7efd755d13c7e70f01b1ba00ba0742a354':
doc change: template changes for new SDK doc structure.
Dirk Dougherty [Thu, 22 Oct 2009 18:21:51 +0000 (11:21 -0700)]
am
fce6b45f: doc change: template/asset changes for sdk package.
Merge commit '
fce6b45f629e59b79beed1c18486530c00769bbf' into eclair
* commit '
fce6b45f629e59b79beed1c18486530c00769bbf':
doc change: template/asset changes for sdk package.
Owen Lin [Thu, 22 Oct 2009 13:44:28 +0000 (06:44 -0700)]
am
64d5a807: Add OVERRIDE_PACKAGES support for prebuild modules.
Merge commit '
64d5a8070630e816e62fc2d3fdcbe820f50ec924' into eclair-mr2
* commit '
64d5a8070630e816e62fc2d3fdcbe820f50ec924':
Add OVERRIDE_PACKAGES support for prebuild modules.
Brandon Ballinger [Thu, 22 Oct 2009 13:43:04 +0000 (06:43 -0700)]
am
36f349ac: Merge change Ied29246e into eclair
Merge commit '
36f349acc9c976cf3966ebde5df6410a09a3d7a5' into eclair-mr2
* commit '
36f349acc9c976cf3966ebde5df6410a09a3d7a5':
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
Doug Zongker [Thu, 22 Oct 2009 05:22:32 +0000 (22:22 -0700)]
am
decdbd79: (-s ours) Merge change I5e98e6f0 into eclair
Merge commit '
decdbd7956c34895f73001cfa2018a27c8702ad0' into eclair-mr2
* commit '
decdbd7956c34895f73001cfa2018a27c8702ad0':
use aapt to build jar files instead of the system zip (DO NOT MERGE)
Brett Chabot [Thu, 22 Oct 2009 03:05:26 +0000 (20:05 -0700)]
Remove 'cd top' step from envsetup runtest shortcut.
Instead, execute runtest as an absolute path. Ths is necessary to support
relative path based arguments in runtest. Bug
2133198
Dirk Dougherty [Thu, 22 Oct 2009 02:52:52 +0000 (19:52 -0700)]
doc change: template changes for new SDK doc structure.
Bug:
2160782
Owen Lin [Fri, 16 Oct 2009 09:43:05 +0000 (02:43 -0700)]
Add OVERRIDE_PACKAGES support for prebuild modules.
So that some prebuild module can override existing packages.
Change-Id: I4f0d019e07b84d24cf0234903bd4b06104e0ed27
Android (Google) Code Review [Wed, 21 Oct 2009 02:28:45 +0000 (22:28 -0400)]
Merge change Ied29246e into eclair
* changes:
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
Brandon Ballinger [Wed, 21 Oct 2009 00:41:16 +0000 (17:41 -0700)]
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
Android (Google) Code Review [Tue, 20 Oct 2009 20:28:14 +0000 (16:28 -0400)]
Merge change I5e98e6f0 into eclair
* changes:
use aapt to build jar files instead of the system zip (DO NOT MERGE)
Owen Lin [Tue, 20 Oct 2009 16:57:53 +0000 (09:57 -0700)]
am
0a7b54de: Add package Gallery into default build.
Merge commit '
0a7b54de3a7b3a13d8bcc1a11286f374ae51dc21' into eclair-mr2
* commit '
0a7b54de3a7b3a13d8bcc1a11286f374ae51dc21':
Add package Gallery into default build.
Owen Lin [Thu, 15 Oct 2009 09:09:18 +0000 (02:09 -0700)]
Add package Gallery into default build.
Change-Id: Ia4447fdb6c4c26a5419ef59cc9d8276838a95854
Doug Zongker [Tue, 20 Oct 2009 00:05:46 +0000 (17:05 -0700)]
use aapt to build jar files instead of the system zip (DO NOT MERGE)
By using 'aapt add' instead of whatever 'zip' utility happens to be
installed on the machine, we get files that are imgdiff-friendly,
which makes for smaller incremental OTAs.
(This is a cherry-pick of a change already submitted to eclair-mr2;
the change was approved for mr1.)
Steve Block [Mon, 19 Oct 2009 17:41:07 +0000 (18:41 +0100)]
WebKit clean required by merge with new WebKit version.
Change-Id: I59377d6a0420bfb13b25b4ed7240b47e8aae6114
Dirk Dougherty [Sat, 17 Oct 2009 00:14:33 +0000 (17:14 -0700)]
doc change: template/asset changes for sdk package.
Android (Google) Code Review [Tue, 13 Oct 2009 21:12:59 +0000 (17:12 -0400)]
Merge change I04432db5 into eclair-mr2
* changes:
use aapt to build jar files instead of the system zip
Raphael [Tue, 13 Oct 2009 19:17:40 +0000 (12:17 -0700)]
am
aa569862: Windows SDK: support tools/sdklauncher and tools/layoutopt
Merge commit '
aa569862dee45bfa72d342e9982cb5205df9bf04' into eclair-mr2
* commit '
aa569862dee45bfa72d342e9982cb5205df9bf04':
Windows SDK: support tools/sdklauncher and tools/layoutopt
Raphael [Mon, 12 Oct 2009 23:16:02 +0000 (16:16 -0700)]
Windows SDK: support tools/sdklauncher and tools/layoutopt
Change-Id: Iac7d7a0cdc439b2bb1e334e82fe0f354b14d7001
Doug Zongker [Fri, 9 Oct 2009 19:11:30 +0000 (12:11 -0700)]
use aapt to build jar files instead of the system zip
By using 'aapt add' instead of whatever 'zip' utility happens to be
installed on the machine, we get files that are imgdiff-friendly,
which makes for smaller incremental OTAs.