Commit graph

752 commits

Author SHA1 Message Date
Colin Cross
57b03f7613 Use ARCH_ARM_HAVE_ARMV7A to select qemu kernel for dexpreopt
Change-Id: I440d944e87324038e465415b1b71613b31052f99
2010-03-10 16:07:26 -08:00
Doug Zongker
b87e0e1d17 Merge commit '27bb6f5f' into manualmerge 2010-03-01 12:36:07 -08:00
Doug Zongker
27bb6f5f23 add signing checker script to releasetools
The check_target_files_signatures determines what key was used to sign
every .apk in a given target_files.  It can compare that signature to
that of another target_files (eg, the previous release for that
device) and flag any problems such as .apks signed with a different
key.

(This is a backport of a change in froyo.  It does not affect device
code, only the scripts that sign images and OTA packages.)
2010-03-01 12:26:17 -08:00
David 'Digit' Turner
171e0d0003 Temporary fix for ARMv7 -user builds.
This switches the emulator to "single step" emulation mode which is
slower but seems to work-around the current ARMv7 emulation bug.

This allows the dexreopt passes to go through normally.
2010-02-25 14:05:05 -08:00
Doug Zongker
c8d446bcde pass blobs to applypatch in incremental OTAs
applypatch now takes patches as blob-valued arguments instead of just
filenames, eliminating the need to unpack all patches to /tmp before
starting to apply them.

Revert the last change I made where sha1_check(read_file(...)) was
substituted for apply_patch_check(...).  apply_patch_check() knows to
check /cache/saved.file if the original source file is missing or has
a bad checksum, which is important if the device loses power or
otherwise restarts during patching.

Change-Id: Ia5b761474b0f809a5a5eed29455b1b145145699e
2010-02-22 15:41:53 -08:00
Doug Zongker
5a48209541 relocate applypatch; check patch integrity
- Delete the applypatch code (it's being moved to bootable/recovery).

- Change the OTA script generator to verify the sha1sum of all the
  patch files after they are unpacked into /tmp.

b/2361316 - VZW Issue PP628: Continuous reset to Droid logo:
            framework-res.apk update failed (CR LIBtt59130)

Change-Id: I5858d48f10127f72e708d50d3de844569d1aff27
2010-02-19 12:14:53 -08:00
Doug Zongker
7431dac607 allow java eventlogtags to be generated for packages that aren't included
If there are packages that specify logtags being built that aren't
included in the product, their logtags won't be included in the merged
file.  Assign an arbitrary tag number to them so they can be built
anyway.

Change-Id: I4929016bf289b7a814b48bc51f324c09f500fab1
2010-02-17 09:07:55 -08:00
Doug Zongker
abfbbe2e1d allow EventLog tag numbers to be auto-assigned
With this change, you can specify "?" in place of a tag number in a
.logtags file and the build system will assign numbers to these tags.
(The numbers used shouldn't matter since we translate them back to tag
names whenever the logs are read back.)

This is pretty straightforward to do:

- make merge-event-log-tags.py assign numbers to any tags that specify
  "?"

- make the generated java files depend on the merged output

- make java-event-log-tags.py read both the original .logtags and the
  merged output, and fill in tag numbers for any "?" using the merged
  version.

Change-Id: Icc6ccd705db461d570fc929922a830aa6deaca48
2010-02-16 14:32:08 -08:00
Doug Zongker
42265390d9 change incremental OTA file install order
(Cherry-pick from donut.)

Delete the old recovery-from-boot patch before patching system files,
then install the new one at the end of the process.  Also fix an issue
with applypatch returning the wrong status.

Change-Id: I614fce39f307eded696ba792912b863f9fb0580b
2010-02-12 12:20:49 -08:00
Scott Main
ee629d9c9d revise script and styles for the expandable widget in the dev
guide side nav to allow nested toggle lists. This is necessary
for the new resources docs that have an expandable list nested
in an expandable list.
2010-02-05 14:37:58 -08:00
Doug Zongker
14833605d2 add UnmountAll function to OTA script; support radio images w/path
Three unrelated changes:

- change the add-radio-file makefile function to support adding files
  with paths.  (The path part of the pathname is stripped off.)

- add an UnmountAll function to the OTA script generation code, so
  that we can explicitly unmount everything we've mounted (in addition
  to doing it automatically at the end of the script).

- add the updater API version to the info object passed to
  device-specific code.

Change-Id: Ia62b15403c1cc8fce8d9910f291450c8077e49f4
2010-02-03 09:21:22 -08:00
Doug Zongker
30f1d2cf29 am 20d93db1: am cdb621bf: retry patch using cache if in-place write fails
Merge commit '20d93db18de9001dcb5af46e4d1d2bac10aa2eca'

* commit '20d93db18de9001dcb5af46e4d1d2bac10aa2eca':
  retry patch using cache if in-place write fails
2010-02-02 09:38:39 -08:00
Doug Zongker
20d93db18d am cdb621bf: retry patch using cache if in-place write fails
Merge commit 'cdb621bfea3083afbea238dbf374826742aca6d0' into eclair-plus-aosp

* commit 'cdb621bfea3083afbea238dbf374826742aca6d0':
  retry patch using cache if in-place write fails
2010-02-02 08:53:17 -08:00
Doug Zongker
cdb621bfea retry patch using cache if in-place write fails
[cherry-pick from donut branch]

Instead of failing outright when yaffs lies about how much space is
free on the filesystem, delete the partially-written output file and
retry using the copy-source-to-cache method instead.

Change all the log statements to printf; mixing stdout and stderr
logging just makes the logs hard to read because they're buffered
differently.
2010-02-02 08:44:12 -08:00
Bjorn Bringert
76a72277c9 Generate write<TAG> methods in logtags-generated Java code
Change-Id: Iebca77f2f710ee4c15bf7089647f8d79fe79f33a
2010-02-02 10:40:06 +00:00
Scott Main
80ec85cc47 am 5729dbfa: am e6fed880: Merge "docs: accept the enter key on key-down, rather than key-up, in order to be sure we capture this key before anything else. Fixes case where highlighted suggestions don\'t get executed when pressed. Bug: 1909300" into eclair
Merge commit '5729dbfa00ffb659c5758195b617af4349c0ef75'

* commit '5729dbfa00ffb659c5758195b617af4349c0ef75':
  docs: accept the enter key on key-down, rather than key-up,
2010-01-28 15:06:03 -08:00
Jesse Wilson
98647acd91 Merge "Suppress the annoying "XML missing method" warnings from the doc build." 2010-01-28 13:33:29 -08:00
Jesse Wilson
b127997b14 Suppress the annoying "XML missing method" warnings from the doc build. 2010-01-28 10:50:58 -08:00
Dirk Dougherty
7260470e76 am 262e8214: am 6339cfe8: Merge "doc change: add announce for developer lab at mwc." into eclair
Merge commit '262e821409fbd59b593e56cb75a339e8a2364533'

* commit '262e821409fbd59b593e56cb75a339e8a2364533':
  doc change: add announce for developer lab at mwc.
2010-01-28 10:48:00 -08:00
Scott Main
5729dbfa00 am e6fed880: Merge "docs: accept the enter key on key-down, rather than key-up, in order to be sure we capture this key before anything else. Fixes case where highlighted suggestions don\'t get executed when pressed. Bug: 1909300" into eclair
Merge commit 'e6fed8807f469a91e10b64990a7709482378dfa9' into eclair-plus-aosp

* commit 'e6fed8807f469a91e10b64990a7709482378dfa9':
  docs: accept the enter key on key-down, rather than key-up,
2010-01-26 15:01:13 -08:00
Scott Main
e6fed8807f Merge "docs: accept the enter key on key-down, rather than key-up, in order to be sure we capture this key before anything else. Fixes case where highlighted suggestions don't get executed when pressed. Bug: 1909300" into eclair 2010-01-25 15:39:40 -08:00
Scott Main
9033c12688 docs: accept the enter key on key-down, rather than key-up,
in order to be sure we capture this key before anything else.
Fixes case where highlighted suggestions don't get executed
when pressed.
Bug: 1909300
2010-01-25 15:26:10 -08:00
Dirk Dougherty
262e821409 am 6339cfe8: Merge "doc change: add announce for developer lab at mwc." into eclair
Merge commit '6339cfe89b62bfa7803ff93c4fc13c9be759f47a' into eclair-plus-aosp

* commit '6339cfe89b62bfa7803ff93c4fc13c9be759f47a':
  doc change: add announce for developer lab at mwc.
2010-01-22 14:27:55 -08:00
Dirk Dougherty
6339cfe89b Merge "doc change: add announce for developer lab at mwc." into eclair 2010-01-22 14:23:07 -08:00
Dirk Dougherty
781a636aed doc change: add announce for developer lab at mwc.
Bug: 2160782
Change-Id: I363e964f0d35eaf7b2d7593d6a3630196ed6de33
2010-01-22 13:24:55 -08:00
Scott Main
a1a93b35e9 am daa3b7a4: am 945ed36e: docs: add the ability to exclude PRE elements from being prettified by adding the class "no-pretty-print" (needs to hyphenate \'prettyprint\', otherwise the prettify script will parse "no-prettyprint" the same as "prettyprint")
Merge commit 'daa3b7a46958206cdac5d21e4235a6dfabb6829a'

* commit 'daa3b7a46958206cdac5d21e4235a6dfabb6829a':
  docs: add the ability to exclude PRE elements from being prettified
2010-01-22 09:43:09 -08:00
Scott Main
daa3b7a469 am 945ed36e: docs: add the ability to exclude PRE elements from being prettified by adding the class "no-pretty-print" (needs to hyphenate \'prettyprint\', otherwise the prettify script will parse "no-prettyprint" the same as "prettyprint")
Merge commit '945ed36ec486f83c4546cac8d6bed954dfe32c4e' into eclair-plus-aosp

* commit '945ed36ec486f83c4546cac8d6bed954dfe32c4e':
  docs: add the ability to exclude PRE elements from being prettified
2010-01-19 11:13:44 -08:00
Scott Main
945ed36ec4 docs: add the ability to exclude PRE elements from being prettified
by adding the class "no-pretty-print" (needs to hyphenate 'prettyprint',
otherwise the prettify script will parse "no-prettyprint" the same as
"prettyprint")
2010-01-19 10:59:16 -08:00
Scott Main
923d541486 am 4bd6c862: am 3556305e: Merge "docs: hide the "back to top" link when there\'s no vertical scroll also use local variables for DOM objects (in a slow effort to eventually remove all non-essential global vars)" into eclair
Merge commit '4bd6c862f0897f99abc227611822e1dace03b6e0'

* commit '4bd6c862f0897f99abc227611822e1dace03b6e0':
  docs: hide the "back to top" link when there's no vertical scroll
2010-01-13 12:17:08 -08:00
Scott Main
4bd6c862f0 am 3556305e: Merge "docs: hide the "back to top" link when there\'s no vertical scroll also use local variables for DOM objects (in a slow effort to eventually remove all non-essential global vars)" into eclair
Merge commit '3556305eb00cd63ce75bc5ef4a84fd1b454c50fb' into eclair-plus-aosp

* commit '3556305eb00cd63ce75bc5ef4a84fd1b454c50fb':
  docs: hide the "back to top" link when there's no vertical scroll
2010-01-13 11:18:02 -08:00
Doug Zongker
28763e3513 Merge "update ro.build.tags when signing release builds" 2010-01-13 09:22:22 -08:00
Scott Main
13b79b2eb1 docs: hide the "back to top" link when there's no vertical scroll
also use local variables for DOM objects (in a slow effort to eventually
remove all non-essential global vars)
2010-01-13 08:22:27 -08:00
Scott Main
685e9f3ec3 am 29bec3f7: am 7e680c89: Merge "docs: make the Resources docs use the same clearsilver template as the Dev Guide. This removes the custom resourcespage.cs file and routes resources pages to use docpage.cs, while still setting the resource hdf flag true (in order to h
Merge commit '29bec3f707401630e6ad93dcaa3e9a620f0d9bbb'

* commit '29bec3f707401630e6ad93dcaa3e9a620f0d9bbb':
  docs: make the Resources docs use the same clearsilver template
2010-01-12 13:11:58 -08:00
Scott Main
29bec3f707 am 7e680c89: Merge "docs: make the Resources docs use the same clearsilver template as the Dev Guide. This removes the custom resourcespage.cs file and routes resources pages to use docpage.cs, while still setting the resource hdf flag true (in order to highlight the
Merge commit '7e680c89ae01ca30c411f32e2e7ca1c093db0336' into eclair-plus-aosp

* commit '7e680c89ae01ca30c411f32e2e7ca1c093db0336':
  docs: make the Resources docs use the same clearsilver template
2010-01-12 12:23:50 -08:00
Scott Main
7e680c89ae Merge "docs: make the Resources docs use the same clearsilver template as the Dev Guide. This removes the custom resourcespage.cs file and routes resources pages to use docpage.cs, while still setting the resource hdf flag true (in order to highlight the Resources tab)." into eclair 2010-01-12 12:19:57 -08:00
Doug Zongker
c09abc8103 update ro.build.tags when signing release builds
Apply the same changes to tags to ro.build.tags that we do for the
tags in the fingerprint (ro.build.fingerprint) and the description
(ro.build.description).

Change-Id: Ie5a057d8f04cbc32d849f91e1f9d2ea7832e81f6
http://b/2363735 - release-key user builds ship with property ro.build.tags == test-keys
2010-01-11 13:14:04 -08:00
Dirk Dougherty
f3538b21aa am bd4fcbfb: am 5b395224: Merge "SDK doc change: css styling for blockquote." into eclair
Merge commit 'bd4fcbfb03758cca84b6ce0041cfa77e178f6135'

* commit 'bd4fcbfb03758cca84b6ce0041cfa77e178f6135':
  SDK doc change: css styling for blockquote.
2010-01-07 12:47:15 -08:00
Dirk Dougherty
bd4fcbfb03 am 5b395224: Merge "SDK doc change: css styling for blockquote." into eclair
Merge commit '5b3952249ccf7e41ac6a0ac1490cf150bca3a80f' into eclair-plus-aosp

* commit '5b3952249ccf7e41ac6a0ac1490cf150bca3a80f':
  SDK doc change: css styling for blockquote.
2010-01-07 12:43:47 -08:00
Dirk Dougherty
5b3952249c Merge "SDK doc change: css styling for blockquote." into eclair 2010-01-07 12:39:47 -08:00
Dirk Dougherty
a16e79c8b0 SDK doc change: css styling for blockquote.
Bug: 2160782
Change-Id: I99a9494feb8b754636745f979db27380ae623c96
2010-01-07 12:23:01 -08:00
Scott Main
554d1fa649 am 91533402: am b6da4808: update for change Ia39d3bb0, which regressed a resizing hack for IE6.
Merge commit '915334025e0c7a5b77c387315118e687461e4842'

* commit '915334025e0c7a5b77c387315118e687461e4842':
  update for change Ia39d3bb0, which regressed a resizing hack for IE6.
2010-01-07 10:08:48 -08:00
Scott Main
915334025e am b6da4808: update for change Ia39d3bb0, which regressed a resizing hack for IE6.
Merge commit 'b6da4808699180c608bccef88ddb843411e663c7' into eclair-plus-aosp

* commit 'b6da4808699180c608bccef88ddb843411e663c7':
  update for change Ia39d3bb0, which regressed a resizing hack for IE6.
2010-01-07 10:06:00 -08:00
Scott Main
b6da480869 update for change Ia39d3bb0, which regressed a resizing hack for IE6.
This now will avoid writing the cookie for the width when IE6 calls
resizeWidth() in order to properly resize the doc-content div (other
browsers to not call resizeWidth() for resizing doc-content because it
has auto width, which IE6 does not perform).
2010-01-06 16:58:52 -08:00
Scott Main
9776131af8 am 83e85549: am a39d3bb0: docs: fix resizeAll script for IE6 so that the resizeWidth function is only called when the side navigation is actually resizable
Merge commit '83e855494b0b4215c78593efdf69b98c115288f1'

* commit '83e855494b0b4215c78593efdf69b98c115288f1':
  docs: fix resizeAll script for IE6 so that the resizeWidth function
2010-01-06 16:57:28 -08:00
Scott Main
83e855494b am a39d3bb0: docs: fix resizeAll script for IE6 so that the resizeWidth function is only called when the side navigation is actually resizable
Merge commit 'a39d3bb0c9001c79f93ae829d564e5fef27a573a' into eclair-plus-aosp

* commit 'a39d3bb0c9001c79f93ae829d564e5fef27a573a':
  docs: fix resizeAll script for IE6 so that the resizeWidth function
2010-01-06 16:55:15 -08:00
Scott Main
a39d3bb0c9 docs: fix resizeAll script for IE6 so that the resizeWidth function
is only called when the side navigation is actually resizable

This stops 'width' cookies from being written for the SDK docs
(and any other page that doesn't have resizable nav) and also adds
some security to the init() function to be sure we properly read
cookie names.
2010-01-06 14:33:20 -08:00
Scott Main
3669072b81 docs: make the Resources docs use the same clearsilver template
as the Dev Guide. This removes the custom resourcespage.cs file
and routes resources pages to use docpage.cs, while still
setting the resource hdf flag true (in order to highlight the
Resources tab).
2009-12-17 12:52:54 -08:00
Scott Main
c5aea0ebcd am b0c21911: am 99a25fba: Merge change I92c7fe59 into eclair
Merge commit 'b0c219115533fe94056d4498603ce8e474e1b9a0'

* commit 'b0c219115533fe94056d4498603ce8e474e1b9a0':
  docs: change DOCTYPE to html5 format
2009-12-16 21:43:46 -08:00
Scott Main
b0c2191155 am 99a25fba: Merge change I92c7fe59 into eclair
Merge commit '99a25fbaa50a077c5d62b9ae204677c176534d8b' into eclair-plus-aosp

* commit '99a25fbaa50a077c5d62b9ae204677c176534d8b':
  docs: change DOCTYPE to html5 format
2009-12-16 21:40:55 -08:00
Android (Google) Code Review
99a25fbaa5 Merge change I92c7fe59 into eclair
* changes:
  docs: change DOCTYPE to html5 format
2009-12-16 21:38:02 -08:00
Scott Main
92c7fe59a7 docs: change DOCTYPE to html5 format 2009-12-16 21:36:15 -08:00
Scott Main
b8143d2f0a am d79b160d: am ab32fed6: docs for esr: add support for breadcrumbing in the resource docs
Merge commit 'd79b160d90450068237282393be0d7456cb14bc1'

* commit 'd79b160d90450068237282393be0d7456cb14bc1':
  docs for esr: add support for breadcrumbing in the resource docs
2009-12-16 15:52:41 -08:00
Scott Main
d79b160d90 am ab32fed6: docs for esr: add support for breadcrumbing in the resource docs
Merge commit 'ab32fed6a8efbdb8640f6f6b355b751fd6c7eb53' into eclair-plus-aosp

* commit 'ab32fed6a8efbdb8640f6f6b355b751fd6c7eb53':
  docs for esr: add support for breadcrumbing in the resource docs
2009-12-16 15:44:37 -08:00
Scott Main
ab32fed6a8 docs for esr: add support for breadcrumbing in the resource docs 2009-12-16 15:36:20 -08:00
Dirk Dougherty
36b5ae6597 am 930ca65a: am 8c627b04: Merge change Ib471b5b2 into eclair
Merge commit '930ca65a3cde0bf0817e38efee5772338abbf0c0'

* commit '930ca65a3cde0bf0817e38efee5772338abbf0c0':
  sdk doc change for esr: Add left nav highlight for interior files in resources tab.
2009-12-15 23:31:15 -08:00
Dirk Dougherty
930ca65a3c am 8c627b04: Merge change Ib471b5b2 into eclair
Merge commit '8c627b04898cab723e0df8666a7cc11d5d1c70f1' into eclair-plus-aosp

* commit '8c627b04898cab723e0df8666a7cc11d5d1c70f1':
  sdk doc change for esr: Add left nav highlight for interior files in resources tab.
2009-12-15 19:29:52 -08:00
Android (Google) Code Review
8c627b0489 Merge change Ib471b5b2 into eclair
* changes:
  sdk doc change for esr: Add left nav highlight for interior files in resources tab.
2009-12-15 19:26:48 -08:00
Dirk Dougherty
f32c5acb2e sdk doc change for esr: Add left nav highlight for interior files in resources tab.
Bug:2160782
Change-Id: Ib471b5b28f599447e77294c8dcc23d24a18c3436
2009-12-15 18:48:38 -08:00
Doug Zongker
decf995c59 map -e with no cert to PRESIGNED
Needed for backwards compatibility with scripts that use -e.
2009-12-15 17:27:49 -08:00
Android (Google) Code Review
5125e441b1 Merge change If6a53aa5
* changes:
  add "EXTERNAL" as special value of LOCAL_CERTIFICATE
2009-12-15 15:51:10 -08:00
Doug Zongker
f6a53aa5f2 add "EXTERNAL" as special value of LOCAL_CERTIFICATE
Setting LOCAL_CERTIFICATE to "EXTERNAL" now marks an apk (either a
prebuilt or otherwise) as needing the default test key within the
system, but one that should be signed after the target_files is
produced but before sign_target_files_apks does the rest of the
signing.  (We use this to ship apps on the system that are signed by
third parties, like Facebook.)
2009-12-15 15:06:55 -08:00
Xavier Ducrohet
e035d596cd am 374909f6: am fac84b56: Merge change Icb5cf14e into eclair
Merge commit '374909f68a78941909ecd0b6a329822fdd01cac5'

* commit '374909f68a78941909ecd0b6a329822fdd01cac5':
  Add feature list support to DroidDoc.
2009-12-15 15:03:19 -08:00
Dirk Dougherty
12b61a9824 am 7b0e85e1: am 502c498f: sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Merge commit '7b0e85e1814376286c7d036f73241f9a19f70b08'

* commit '7b0e85e1814376286c7d036f73241f9a19f70b08':
  sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
2009-12-15 15:03:11 -08:00
Xavier Ducrohet
374909f68a am fac84b56: Merge change Icb5cf14e into eclair
Merge commit 'fac84b561193a62b3e9bc7a50b8948a6356be92c' into eclair-plus-aosp

* commit 'fac84b561193a62b3e9bc7a50b8948a6356be92c':
  Add feature list support to DroidDoc.
2009-12-15 07:42:24 -08:00
Dirk Dougherty
7b0e85e181 am 502c498f: sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Merge commit '502c498fec23cb28d16f5e86e981400f76da36ea' into eclair-plus-aosp

* commit '502c498fec23cb28d16f5e86e981400f76da36ea':
  sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
2009-12-15 07:38:57 -08:00
Xavier Ducrohet
f9b6d38d07 Add feature list support to DroidDoc.
Similarly to intent actions/categories, DroidDoc look
for the FEATURE-type SdkConstant annotation and builds
a list of optional features for the platform.

This is then packaged with the SDK to be used by the
custom editors (manifest editor in this case)

Change-Id: Icb5cf14ebd8251017cd850eacfdbb889219b3697
2009-12-14 17:55:05 -08:00
Doug Zongker
a660e48ea7 am 4cac8afc: am 714111cb: include pre-signed prebuilt .apks in apkcerts.txt
Merge commit '4cac8afc21a356ce3ca074f12383cf1526d44156'

* commit '4cac8afc21a356ce3ca074f12383cf1526d44156':
  include pre-signed prebuilt .apks in apkcerts.txt
2009-12-14 15:33:14 -08:00
Doug Zongker
4cac8afc21 am 714111cb: include pre-signed prebuilt .apks in apkcerts.txt
Merge commit '714111cbdde0fd5c4f276d4666ddb99cbf0c5008' into eclair-mr2-plus-aosp

* commit '714111cbdde0fd5c4f276d4666ddb99cbf0c5008':
  include pre-signed prebuilt .apks in apkcerts.txt
2009-12-14 15:24:22 -08:00
Doug Zongker
714111cbdd include pre-signed prebuilt .apks in apkcerts.txt 2009-12-14 10:14:46 -08:00
Dirk Dougherty
502c498fec sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Bug: 2160782
Change-Id: I5c45bdf4861ba2dc150e95d5523367a14b401304
2009-12-11 20:54:08 -08:00
Scott Main
1e99d1688e am be4eca18: am f7b3211e: am 1dd6ff63: Merge change I483cf38d into eclair
Merge commit 'be4eca189416ca9578d6d35ae3c7e89ff9e4aa38'

* commit 'be4eca189416ca9578d6d35ae3c7e89ff9e4aa38':
  docs: add "figure" class for DIV elements that contain
2009-12-10 23:41:29 -08:00
Scott Main
be4eca1894 am f7b3211e: am 1dd6ff63: Merge change I483cf38d into eclair
Merge commit 'f7b3211e089a2b243938f5e3101d40cbdaf8b8bb' into eclair-mr2-plus-aosp

* commit 'f7b3211e089a2b243938f5e3101d40cbdaf8b8bb':
  docs: add "figure" class for DIV elements that contain
2009-12-10 17:52:19 -08:00
Scott Main
f7b3211e08 am 1dd6ff63: Merge change I483cf38d into eclair
Merge commit '1dd6ff638f14e3c583eaa89d0b7341a3811293da' into eclair-mr2

* commit '1dd6ff638f14e3c583eaa89d0b7341a3811293da':
  docs: add "figure" class for DIV elements that contain
2009-12-10 17:44:38 -08:00
Doug Zongker
8517366a7a am c9806cfd: am bbfb96f4: remove shared_uid cert check from sign_targt_file_apks
Merge commit 'c9806cfd31ee660d0fa01c88c42a374c9a9ae8bd'

* commit 'c9806cfd31ee660d0fa01c88c42a374c9a9ae8bd':
  remove shared_uid cert check from sign_targt_file_apks
2009-12-10 14:41:49 -08:00
Doug Zongker
f928dd7af0 am a492ecce: am fe8ff19a: Merge change Ief993a27 into eclair-mr2
Merge commit 'a492ecce759417b965f93edcc40919866240d581'

* commit 'a492ecce759417b965f93edcc40919866240d581':
  add signing checker script to releasetools
2009-12-10 14:41:20 -08:00
Doug Zongker
0235b4d595 am 23c1f0ca: am 5ae770fc: add option to @hide classes generated from .logtags files
Merge commit '23c1f0ca7d629af4de06fb2b05ee9add2bf0a4d5'

* commit '23c1f0ca7d629af4de06fb2b05ee9add2bf0a4d5':
  add option to @hide classes generated from .logtags files
2009-12-10 14:38:10 -08:00
Doug Zongker
c9806cfd31 am bbfb96f4: remove shared_uid cert check from sign_targt_file_apks
Merge commit 'bbfb96f46472c74e2dbdd190fb67cdda13347eb4' into eclair-mr2-plus-aosp

* commit 'bbfb96f46472c74e2dbdd190fb67cdda13347eb4':
  remove shared_uid cert check from sign_targt_file_apks
2009-12-10 11:44:09 -08:00
Doug Zongker
bbfb96f464 remove shared_uid cert check from sign_targt_file_apks
This check (and others) are now done by the separate script
check_target_files_signatures; the one here is redundant.
2009-12-10 11:22:57 -08:00
Doug Zongker
a492ecce75 am fe8ff19a: Merge change Ief993a27 into eclair-mr2
Merge commit 'fe8ff19a2a0698d43868c86b5cead0553bdef8ea' into eclair-mr2-plus-aosp

* commit 'fe8ff19a2a0698d43868c86b5cead0553bdef8ea':
  add signing checker script to releasetools
2009-12-10 09:42:10 -08:00
Android (Google) Code Review
fe8ff19a2a Merge change Ief993a27 into eclair-mr2
* changes:
  add signing checker script to releasetools
2009-12-10 09:37:19 -08:00
Scott Main
8625adde23 am 1dd6ff63: Merge change I483cf38d into eclair
Merge commit '1dd6ff638f14e3c583eaa89d0b7341a3811293da' into eclair-plus-aosp

* commit '1dd6ff638f14e3c583eaa89d0b7341a3811293da':
  docs: add "figure" class for DIV elements that contain
2009-12-09 18:17:50 -08:00
Scott Main
483cf38d8d docs: add "figure" class for DIV elements that contain
a figure image with caption text.

needed (but not a dependency) by I1cd5c8282ba45d79da854db43d741b6fa049812b
2009-12-09 18:08:32 -08:00
Doug Zongker
23c1f0ca7d am 5ae770fc: add option to @hide classes generated from .logtags files
Merge commit '5ae770fc0e43172e1efc5146a38e7d1f452143e2' into eclair-mr2-plus-aosp

* commit '5ae770fc0e43172e1efc5146a38e7d1f452143e2':
  add option to @hide classes generated from .logtags files
2009-12-09 16:01:33 -08:00
Doug Zongker
5ae770fc0e add option to @hide classes generated from .logtags files
Generate a javadoc @hide comment on the class when "option
javadoc_hide true" is specified in the input .logtags file.
2009-12-09 12:31:00 -08:00
Doug Zongker
75f1736469 add signing checker script to releasetools
The check_target_files_signatures determines what key was used to sign
every .apk in a given target_files.  It can compare that signature to
that of another target_files (eg, the previous release for that
device) and flag any problems such as .apks signed with a different
key.
2009-12-09 09:36:41 -08:00
Scott Main
e79b9dfc06 am 0be5c863: am a2496682: am 9b0ad4c7: Merge change I79580117 into eclair
Merge commit '0be5c863a204cc37fda35574c3111ac363b26b17'

* commit '0be5c863a204cc37fda35574c3111ac363b26b17':
  docs: add context coloring to code snippets with prettify script
2009-12-08 14:51:26 -08:00
Scott Main
0be5c863a2 am a2496682: am 9b0ad4c7: Merge change I79580117 into eclair
Merge commit 'a2496682f9c6f9311199df7300bb8e16298cf40d' into eclair-mr2-plus-aosp

* commit 'a2496682f9c6f9311199df7300bb8e16298cf40d':
  docs: add context coloring to code snippets with prettify script
2009-12-07 16:39:04 -08:00
Scott Main
a2496682f9 am 9b0ad4c7: Merge change I79580117 into eclair
Merge commit '9b0ad4c7258b586f1763bc497e8ed33f42ce446e' into eclair-mr2

* commit '9b0ad4c7258b586f1763bc497e8ed33f42ce446e':
  docs: add context coloring to code snippets with prettify script
2009-12-07 16:34:01 -08:00
Scott Main
7fd7dc46f5 am 9b0ad4c7: Merge change I79580117 into eclair
Merge commit '9b0ad4c7258b586f1763bc497e8ed33f42ce446e' into eclair-plus-aosp

* commit '9b0ad4c7258b586f1763bc497e8ed33f42ce446e':
  docs: add context coloring to code snippets with prettify script
2009-12-07 16:33:18 -08:00
Android (Google) Code Review
9b0ad4c725 Merge change I79580117 into eclair
* changes:
  docs: add context coloring to code snippets with prettify script
2009-12-07 16:29:47 -08:00
Doug Zongker
e6ffd9d8be am e81271f5: Merge change Id97eba9f into eclair
Merge commit 'e81271f526db01af84eabdd99d309c9425d3f1a3' into eclair-plus-aosp

* commit 'e81271f526db01af84eabdd99d309c9425d3f1a3':
  don't add "ota-rel-keys" tag to build fingerprints
2009-12-04 10:41:05 -08:00
Android (Google) Code Review
e81271f526 Merge change Id97eba9f into eclair
* changes:
  don't add "ota-rel-keys" tag to build fingerprints
2009-12-04 10:36:44 -08:00
Doug Zongker
0d5eb0b7e4 am af830d39: am 485847e4: Merge change I6f85805b into eclair-mr2
Merge commit 'af830d3999ac1670b92207f6c1201d297913b9a9'

* commit 'af830d3999ac1670b92207f6c1201d297913b9a9':
  break up event-log-tags; generate java source files with constants
2009-12-04 04:31:16 -08:00
Doug Zongker
5705a6bebf am 2f07ff1d: am e4ea0ab8: am ae91c7f8: Merge change I5ecba70c into eclair
Merge commit '2f07ff1d4b0e1772c03dc7d12fb113759e58e18b'

* commit '2f07ff1d4b0e1772c03dc7d12fb113759e58e18b':
  add missing comma
2009-12-04 04:31:06 -08:00
Doug Zongker
d97eba9f39 don't add "ota-rel-keys" tag to build fingerprints
This tag is obsolete; we no longer need to distinguish the OTA keys
from the app keys.

This change does not affect device code.
2009-12-03 17:38:11 -08:00
Doug Zongker
af830d3999 am 485847e4: Merge change I6f85805b into eclair-mr2
Merge commit '485847e4c47e1504ddf8b830d557211d02a76e57' into eclair-mr2-plus-aosp

* commit '485847e4c47e1504ddf8b830d557211d02a76e57':
  break up event-log-tags; generate java source files with constants
2009-12-03 17:05:52 -08:00
Android (Google) Code Review
485847e4c4 Merge change I6f85805b into eclair-mr2
* changes:
  break up event-log-tags; generate java source files with constants
2009-12-03 16:58:40 -08:00
Doug Zongker
2f07ff1d4b am e4ea0ab8: am ae91c7f8: Merge change I5ecba70c into eclair
Merge commit 'e4ea0ab8bd1ceef94399ac028e4fed1c18333b98' into eclair-mr2-plus-aosp

* commit 'e4ea0ab8bd1ceef94399ac028e4fed1c18333b98':
  add missing comma
2009-12-03 16:57:45 -08:00
Doug Zongker
9bd4962af8 break up event-log-tags; generate java source files with constants
Construct the /system/etc/event-log-tags file by unioning together any
*.logtags files included in LOCAL_SRC_FILES throughout the system (with
appropriate error checking for dup tag numbers, etc.)

For java packages, generate a java source file from the logtags file for
that package that contains static integer constants for each tag name.
2009-12-03 16:47:52 -08:00
Doug Zongker
a94dc8097c am ae91c7f8: Merge change I5ecba70c into eclair
Merge commit 'ae91c7f8d1962e7c0ba7aa0d57453fe359e2e2d8' into eclair-plus-aosp

* commit 'ae91c7f8d1962e7c0ba7aa0d57453fe359e2e2d8':
  add missing comma
2009-12-03 16:44:47 -08:00
Doug Zongker
e4ea0ab8bd am ae91c7f8: Merge change I5ecba70c into eclair
Merge commit 'ae91c7f8d1962e7c0ba7aa0d57453fe359e2e2d8' into eclair-mr2

* commit 'ae91c7f8d1962e7c0ba7aa0d57453fe359e2e2d8':
  add missing comma
2009-12-03 16:43:37 -08:00
Doug Zongker
5ecba70ce5 add missing comma
A missing comma is breaking the option parsing for the signing tools
(this doesn't affect any device code, only the signing tools).
2009-12-03 16:36:20 -08:00
Scott Main
f8af887a06 docs: add context coloring to code snippets with prettify script 2009-12-03 10:52:30 -08:00
Doug Zongker
114b6d7e0e am db8e83ec: am d816500c: am 8bec09ee: add \'extras\' mechanism to OTA and signing tools
Merge commit 'db8e83ecee6393f19c1d8adbb2ef3eb08b8e3158'

* commit 'db8e83ecee6393f19c1d8adbb2ef3eb08b8e3158':
  add 'extras' mechanism to OTA and signing tools
2009-12-01 17:38:18 -08:00
Doug Zongker
db8e83ecee am d816500c: am 8bec09ee: add \'extras\' mechanism to OTA and signing tools
Merge commit 'd816500cdd5ca4e017f2fe16fa9ec27205dc2e28' into eclair-mr2-plus-aosp

* commit 'd816500cdd5ca4e017f2fe16fa9ec27205dc2e28':
  add 'extras' mechanism to OTA and signing tools
2009-12-01 17:30:37 -08:00
Doug Zongker
d816500cdd am 8bec09ee: add \'extras\' mechanism to OTA and signing tools
Merge commit '8bec09ee7264160e4e08973a0efcc6bd2c898925' into eclair-mr2

* commit '8bec09ee7264160e4e08973a0efcc6bd2c898925':
  add 'extras' mechanism to OTA and signing tools
2009-12-01 17:14:51 -08:00
Doug Zongker
0526b1b465 am 8bec09ee: add \'extras\' mechanism to OTA and signing tools
Merge commit '8bec09ee7264160e4e08973a0efcc6bd2c898925' into eclair-plus-aosp

* commit '8bec09ee7264160e4e08973a0efcc6bd2c898925':
  add 'extras' mechanism to OTA and signing tools
2009-11-30 16:00:07 -08:00
Doug Zongker
8bec09ee72 add 'extras' mechanism to OTA and signing tools
Add the -x option which allows arbitrary key-value pairs to be passed
into the device-specific module for doing signing and OTA packaging.
2009-11-30 15:37:14 -08:00
Scott Main
f7161130f0 am 33c5806e: am 3bfb5192: am 0086ab50: am 1a177879: Merge change I06c40454 into eclair-sdk
Merge commit '33c5806e3e19ed95eca664b4798c1e819fbaade7'

* commit '33c5806e3e19ed95eca664b4798c1e819fbaade7':
  droiddoc change: revise the sample code generating script so that
2009-11-23 13:16:02 -08:00
Scott Main
33c5806e3e am 3bfb5192: am 0086ab50: am 1a177879: Merge change I06c40454 into eclair-sdk
Merge commit '3bfb5192cb2abb725d75dcbea4b58a6cbb2903fc' into eclair-mr2-plus-aosp

* commit '3bfb5192cb2abb725d75dcbea4b58a6cbb2903fc':
  droiddoc change: revise the sample code generating script so that
2009-11-23 13:10:35 -08:00
Scott Main
3bfb5192cb am 0086ab50: am 1a177879: Merge change I06c40454 into eclair-sdk
Merge commit '0086ab50631cfc6abb0f591871f5bb5da74e4606' into eclair-mr2

* commit '0086ab50631cfc6abb0f591871f5bb5da74e4606':
  droiddoc change: revise the sample code generating script so that
2009-11-23 13:06:55 -08:00
Scott Main
7f927afdd6 am 0086ab50: am 1a177879: Merge change I06c40454 into eclair-sdk
Merge commit '0086ab50631cfc6abb0f591871f5bb5da74e4606' into eclair-plus-aosp

* commit '0086ab50631cfc6abb0f591871f5bb5da74e4606':
  droiddoc change: revise the sample code generating script so that
2009-11-23 13:06:10 -08:00
Scott Main
0086ab5063 am 1a177879: Merge change I06c40454 into eclair-sdk
Merge commit '1a177879281ac6ed541a8f875c0130c3355ab6f9' into eclair

* commit '1a177879281ac6ed541a8f875c0130c3355ab6f9':
  droiddoc change: revise the sample code generating script so that
2009-11-23 13:02:17 -08:00
Android (Google) Code Review
1a17787928 Merge change I06c40454 into eclair-sdk
* changes:
  droiddoc change: revise the sample code generating script so that all the source code pages are NOT generated for the offline version of the docs (only show source in html for online docs).
2009-11-23 12:55:36 -08:00
Scott Main
431e43d655 am 31493fc3: am ff17131e: am c3467e43: am 4cdb7149: docs: change the ADP image for the homepage carousel
Merge commit '31493fc3a0f8ff736b07033fc46dc2d60089a450'

* commit '31493fc3a0f8ff736b07033fc46dc2d60089a450':
  docs: change the ADP image for the homepage carousel
2009-11-20 16:51:31 -08:00
Scott Main
31493fc3a0 am ff17131e: am c3467e43: am 4cdb7149: docs: change the ADP image for the homepage carousel
Merge commit 'ff17131e6c45337663ec8c086185cdbd2c8ca10a' into eclair-mr2-plus-aosp

* commit 'ff17131e6c45337663ec8c086185cdbd2c8ca10a':
  docs: change the ADP image for the homepage carousel
2009-11-20 16:47:22 -08:00
Scott Main
ff17131e6c am c3467e43: am 4cdb7149: docs: change the ADP image for the homepage carousel
Merge commit 'c3467e43febbc39cbb43afe25dd988641e2f0218' into eclair-mr2

* commit 'c3467e43febbc39cbb43afe25dd988641e2f0218':
  docs: change the ADP image for the homepage carousel
2009-11-20 16:42:55 -08:00
Scott Main
41225c49b9 am c3467e43: am 4cdb7149: docs: change the ADP image for the homepage carousel
Merge commit 'c3467e43febbc39cbb43afe25dd988641e2f0218' into eclair-plus-aosp

* commit 'c3467e43febbc39cbb43afe25dd988641e2f0218':
  docs: change the ADP image for the homepage carousel
2009-11-20 16:42:44 -08:00
Scott Main
c3467e43fe am 4cdb7149: docs: change the ADP image for the homepage carousel
Merge commit '4cdb7149127d9527411ed73e26604a2cf2292435' into eclair

* commit '4cdb7149127d9527411ed73e26604a2cf2292435':
  docs: change the ADP image for the homepage carousel
2009-11-20 16:38:47 -08:00
Scott Main
4cdb714912 docs: change the ADP image for the homepage carousel
Change-Id: I6141f32e18918d51d72cfa645f0ceea709002cc6
2009-11-20 16:22:14 -08:00
Scott Main
2fa99f1dd6 droiddoc change: revise the sample code generating script so that
all the source code pages are NOT generated for the offline version
of the docs (only show source in html for online docs).

This won't work until a companion change from framwork/base/Android.mk
is submitted (but shouldn't break the build).

Change-Id: I06c404540870071c2a5a8aa460e156506fd975cb
2009-11-20 10:41:49 -08:00
Scott Main
f8d8feb884 am 5a5631f5: am 7bcb88ff: am c00b2cf9: am 91ed9bbb: Merge change Id8115ffb into eclair-sdk
Merge commit '5a5631f5c06e2ce8087f0c0668d21f4b6361125d'

* commit '5a5631f5c06e2ce8087f0c0668d21f4b6361125d':
  docs: revise user agent detection to use lower case
2009-11-20 10:08:53 -08:00
Scott Main
5a5631f5c0 am 7bcb88ff: am c00b2cf9: am 91ed9bbb: Merge change Id8115ffb into eclair-sdk
Merge commit '7bcb88ff08564dba5f9e41d8fea3914a49e4e5d8' into eclair-mr2-plus-aosp

* commit '7bcb88ff08564dba5f9e41d8fea3914a49e4e5d8':
  docs: revise user agent detection to use lower case
2009-11-20 10:04:01 -08:00
Scott Main
7bcb88ff08 am c00b2cf9: am 91ed9bbb: Merge change Id8115ffb into eclair-sdk
Merge commit 'c00b2cf9c606cbdb2a5e9f871d3fc23962af78cd' into eclair-mr2

* commit 'c00b2cf9c606cbdb2a5e9f871d3fc23962af78cd':
  docs: revise user agent detection to use lower case
2009-11-20 09:59:46 -08:00
Scott Main
e31f151464 am c00b2cf9: am 91ed9bbb: Merge change Id8115ffb into eclair-sdk
Merge commit 'c00b2cf9c606cbdb2a5e9f871d3fc23962af78cd' into eclair-plus-aosp

* commit 'c00b2cf9c606cbdb2a5e9f871d3fc23962af78cd':
  docs: revise user agent detection to use lower case
2009-11-20 09:59:25 -08:00
Scott Main
c00b2cf9c6 am 91ed9bbb: Merge change Id8115ffb into eclair-sdk
Merge commit '91ed9bbbdce1990782b4ac86650f9c79bb94d961' into eclair

* commit '91ed9bbbdce1990782b4ac86650f9c79bb94d961':
  docs: revise user agent detection to use lower case
2009-11-20 09:55:08 -08:00
Android (Google) Code Review
91ed9bbbdc Merge change Id8115ffb into eclair-sdk
* changes:
  docs: revise user agent detection to use lower case for string comparisons and add 'webos' as a mobile device
2009-11-20 09:38:18 -08:00
Dirk Dougherty
7d729b7512 am f94ea5eb: am 952ea818: am aefcbfcf: Merge change Ib5817a3a into eclair
Merge commit 'f94ea5ebe4f26db253d9e6f6baee485f378e6344'

* commit 'f94ea5ebe4f26db253d9e6f6baee485f378e6344':
  sdk doc change for esr: update version refs to 2.0.1.
2009-11-19 17:39:01 -08:00
Dirk Dougherty
f94ea5ebe4 am 952ea818: am aefcbfcf: Merge change Ib5817a3a into eclair
Merge commit '952ea81886d2e0b8c5f66504db01b0b1cb3a4ef3' into eclair-mr2-plus-aosp

* commit '952ea81886d2e0b8c5f66504db01b0b1cb3a4ef3':
  sdk doc change for esr: update version refs to 2.0.1.
2009-11-19 11:48:16 -08:00
Dirk Dougherty
952ea81886 am aefcbfcf: Merge change Ib5817a3a into eclair
Merge commit 'aefcbfcf6ebdb4ac44ff338d577d67bfdee2249d' into eclair-mr2

* commit 'aefcbfcf6ebdb4ac44ff338d577d67bfdee2249d':
  sdk doc change for esr: update version refs to 2.0.1.
2009-11-19 11:42:29 -08:00
Dirk Dougherty
d9a916e3e2 am aefcbfcf: Merge change Ib5817a3a into eclair
Merge commit 'aefcbfcf6ebdb4ac44ff338d577d67bfdee2249d' into eclair-plus-aosp

* commit 'aefcbfcf6ebdb4ac44ff338d577d67bfdee2249d':
  sdk doc change for esr: update version refs to 2.0.1.
2009-11-19 11:28:26 -08:00
Android (Google) Code Review
aefcbfcf6e Merge change Ib5817a3a into eclair
* changes:
  sdk doc change for esr: update version refs to 2.0.1.
2009-11-19 11:24:29 -08:00
Dirk Dougherty
b5817a3a93 sdk doc change for esr: update version refs to 2.0.1.
Bug: 2160782
2009-11-18 23:15:13 -08:00
Scott Main
8f35bce3ac am 2570dac3: am 7239d522: am ec9baf22: am 9a5c8402: docs: make all javadoc reference links use <code> and remove some unused CSS
Merge commit '2570dac37bea232ed28b2322beb0407ed19b15f1'

* commit '2570dac37bea232ed28b2322beb0407ed19b15f1':
  docs: make all javadoc reference links use <code>
2009-11-18 18:00:55 -08:00
Scott Main
2570dac37b am 7239d522: am ec9baf22: am 9a5c8402: docs: make all javadoc reference links use <code> and remove some unused CSS
Merge commit '7239d522c59661129850d818fe6986074b6aa002' into eclair-mr2-plus-aosp

* commit '7239d522c59661129850d818fe6986074b6aa002':
  docs: make all javadoc reference links use <code>
2009-11-18 17:54:57 -08:00
Scott Main
ce9badf1bd am ec9baf22: am 9a5c8402: docs: make all javadoc reference links use <code> and remove some unused CSS
Merge commit 'ec9baf22a959af85f77f56360e95a738f360c4f0' into eclair-plus-aosp

* commit 'ec9baf22a959af85f77f56360e95a738f360c4f0':
  docs: make all javadoc reference links use <code>
2009-11-18 17:47:46 -08:00
Scott Main
7239d522c5 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>
2009-11-18 17:17:43 -08:00
Scott Main
ec9baf22a9 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>
2009-11-18 17:11:50 -08:00
Jean-Baptiste Queru
8a9098d4fb am 905da31a: merge from open-source master
Merge commit '905da31a24479c559f88dfb46fb6dc94fb5c42b3'

* commit '905da31a24479c559f88dfb46fb6dc94fb5c42b3':
  Cosmetic fixes in css/js
2009-11-15 11:30:42 -08:00
Jean-Baptiste Queru
905da31a24 merge from open-source master 2009-11-15 10:58:56 -08:00
David 'Digit' Turner
579e12bb6e am e870a487: am 002d1c24: am 31597999: Merge change I2edfb71d into eclair
Merge commit 'e870a487d6679eecca1f19524807cc2215922fb5'

* commit 'e870a487d6679eecca1f19524807cc2215922fb5':
  Support secondary CPU ABI in build.prop
2009-11-11 18:19:48 -08:00
David 'Digit' Turner
e870a487d6 am 002d1c24: am 31597999: Merge change I2edfb71d into eclair
Merge commit '002d1c24b4dee2582e660f80669176c4a3e2db33' into eclair-mr2-plus-aosp

* commit '002d1c24b4dee2582e660f80669176c4a3e2db33':
  Support secondary CPU ABI in build.prop
2009-11-11 18:15:08 -08:00
David 'Digit' Turner
0464bc49e1 am 31597999: Merge change I2edfb71d into eclair
Merge commit '31597999a61c6b58b8f8b903f5f228a6ca07183f' into eclair-plus-aosp

* commit '31597999a61c6b58b8f8b903f5f228a6ca07183f':
  Support secondary CPU ABI in build.prop
2009-11-11 18:13:01 -08:00
David 'Digit' Turner
002d1c24b4 am 31597999: Merge change I2edfb71d into eclair
Merge commit '31597999a61c6b58b8f8b903f5f228a6ca07183f' into eclair-mr2

* commit '31597999a61c6b58b8f8b903f5f228a6ca07183f':
  Support secondary CPU ABI in build.prop
2009-11-11 18:12:06 -08:00
Android (Google) Code Review
31597999a6 Merge change I2edfb71d into eclair
* changes:
  Support secondary CPU ABI in build.prop
2009-11-11 18:08:03 -08:00
Jean-Baptiste Queru
96c3892fc0 merge from open-source master 2009-11-11 08:19:07 -08:00
Doug Zongker
fec674d99c am 4cc57b40: am d628eaca: am f17e6387: allow use of unzip version 6.0
Merge commit '4cc57b40fc6d7e5ee3692dac790254fdb0d2dd5e'

* commit '4cc57b40fc6d7e5ee3692dac790254fdb0d2dd5e':
  allow use of unzip version 6.0
2009-11-10 15:22:49 -08:00
Doug Zongker
4cc57b40fc am d628eaca: am f17e6387: allow use of unzip version 6.0
Merge commit 'd628eacae7af10c520df98323250b385212270ca' into eclair-mr2-plus-aosp

* commit 'd628eacae7af10c520df98323250b385212270ca':
  allow use of unzip version 6.0
2009-11-10 14:52:07 -08:00
Doug Zongker
d628eacae7 am f17e6387: allow use of unzip version 6.0
Merge commit 'f17e63879c9356d107bda7f8d599f7ce5f449051' into eclair-mr2

* commit 'f17e63879c9356d107bda7f8d599f7ce5f449051':
  allow use of unzip version 6.0
2009-11-10 12:33:31 -08:00
Doug Zongker
baa5760a51 am f17e6387: allow use of unzip version 6.0
Merge commit 'f17e63879c9356d107bda7f8d599f7ce5f449051' into eclair-plus-aosp

* commit 'f17e63879c9356d107bda7f8d599f7ce5f449051':
  allow use of unzip version 6.0
2009-11-10 12:32:59 -08:00