Merge commit 'daffeb333e7965eff58161a42de53ca157da4da9'
* commit 'daffeb333e7965eff58161a42de53ca157da4da9':
new image diffing tool and support for image patches in applypatch
Images (like boot and recovery) consist of large sections of gzipped
data interspersed with other data. To do effective binary patching of
these files, we need to apply patches to the gzipped parts in
'uncompressed space', that is, we decompress, apply a patch, then
recompress to obtain the desired output.
This change defines a new format with these patches, which is
basically a description of how the source and target files are to be
divided up into chunks and a bsdiff patch for each chunk. We add a
new host executable, "imgdiff", for generating these patches from
source and target images, and add support in applypatch for
recognizing this format and applying it on the device.
Merge commit '8ce7c25e905bc14382359e1cd45d41832bcc7ffa'
* commit '8ce7c25e905bc14382359e1cd45d41832bcc7ffa':
improve password entry for signing keys
Modified the image and index URLs to point to guide/index.html now
Allow the user to set ANDROID_PW_FILE to the name of a file for
storing password keys. When the tools need additional passwords, they
will rewrite this file and invoke the user's editor for the new
passwords to be added. This allows passwords to be reused across
invocations of the signing tools, without making the user reenter them
every time.
Paranoid users can use a file stored in a ramdisk, or not use this
feature at all (the code will prompt for passwords in the ordinary way
when ANDROID_PW_FILE is not set).
Merge commit 'eb338efd2eae20962c7ca75baf161be540b3d664'
* commit 'eb338efd2eae20962c7ca75baf161be540b3d664':
make sure package keys are consistent with shared users
All APKs that want to share a given user id must be signed with the
same key. Look inside each APK for what (if any) shared user id it
requests, and error out if any with the same shared user are being
signed with different keys.
Merge commit '87fc0fdc53b5998a36e0a305518525c28db7f35f'
* commit '87fc0fdc53b5998a36e0a305518525c28db7f35f':
add -e option to add extra commands to OTA script
Merge commit 'cb08f15bf48f070c0bc2925846cd7ef7b1dc4c55'
* commit 'cb08f15bf48f070c0bc2925846cd7ef7b1dc4c55':
AI 148870: Pinging Ryan for Dr No approval.
Merge commit 'ee6df9b4fe6e1a7431ff77d81fb8c164ee99f31d' into donut
* commit 'ee6df9b4fe6e1a7431ff77d81fb8c164ee99f31d':
AI 148870: Pinging Ryan for Dr No approval.
---
Cloned from CL 147240 by 'g4 patch'.
Original change by dwarren@dwarren-pdk on 2009/04/21 14:59:50.
"Making PDK work in SDK environment."
This CL should be pretty straight forward and should be touching only PDK
related templates, etc. Turns out we no longer need to touch the highlightNav
code.
Automated import of CL 148870
Merge commit 'cdc13d717b016c61592e34dacabf24c09c3bca4c'
* commit 'cdc13d717b016c61592e34dacabf24c09c3bca4c':
AI 148820: adjust the "nolist" class to add bottom-spacing and refine list item padding;
Merge commit '9b54792d7044125126a9765d1baf3ff0e59efcb4' into donut
* commit '9b54792d7044125126a9765d1baf3ff0e59efcb4':
AI 148820: adjust the "nolist" class to add bottom-spacing and refine list item padding;
add vertical padding to quickview list items so that items are distinguishable when the text wraps-around the line
BUG=1790235
Automated import of CL 148820
Merge commit 'e27db38fdd6b29ae470a7d296a4de07002f23acb'
* commit 'e27db38fdd6b29ae470a7d296a4de07002f23acb':
allow separate source and target files for applypatch
Allow applypatch to use different filenames for the source and target.
(Using the same filename is still fine; in fact the target filename
can be specified as "-" to mean "same as the source file.) This will
allow us to still use diffs in the case of files being renamed, and
will allow us to use diffs for the boot and recovery images.
Merge commit '9537884b0dabe81bf612c79d12c7b4bf40de10a5'
* commit '9537884b0dabe81bf612c79d12c7b4bf40de10a5':
Add new property for dev codename, update version to Donut.
Merge commit '40a06d89406a3e928a5e0d41a3077f59d8f5345d' into donut
* commit '40a06d89406a3e928a5e0d41a3077f59d8f5345d':
AI 148314: Remove droiddoc code that applies the deprecated state of superclasses to subclasses. This change was originally made in Gerrit 7655. https://review.source.android.com/Gerrit#change,7655
Merge commit 'a19801e0600b9016149f56cff05da5a699bf09cc'
* commit 'a19801e0600b9016149f56cff05da5a699bf09cc':
AI 148186: Add support for using custom pdk templates. The make rule for pdk docs should set LOCAL_DROIDDOC_OPTIONS += -hdf android.whichdoc online-pdk
Merge commit 'c521e266406d0393313e17ba29ae519315a5cf6e' into donut
* commit 'c521e266406d0393313e17ba29ae519315a5cf6e':
AI 148186: Add support for using custom pdk templates. The make rule for pdk docs should set LOCAL_DROIDDOC_OPTIONS += -hdf android.whichdoc online-pdk
Merge commit 'b4abfb91bf1519af1e2826cc2246f324c06a983c'
* commit 'b4abfb91bf1519af1e2826cc2246f324c06a983c':
AI 147874: Fix format and link errors in docs.
Merge commit 'ee1e5a3da8b50c92d0fb2a28211bf71b93f9d1f5'
* commit 'ee1e5a3da8b50c92d0fb2a28211bf71b93f9d1f5':
AI 147808: add "current sdk" link using the new sdk.current variable
Merge commit '9f7d4f2351bf59e7a77d4377add18ffb511bcc55'
* commit '9f7d4f2351bf59e7a77d4377add18ffb511bcc55':
AI 147796: Add widget design guidelines to new UI Guidelines area in dev guide.
Merge commit '3bc74303857538055b906d1f01077d77e6776248'
* commit '3bc74303857538055b906d1f01077d77e6776248':
AI 147615: remove sdk version in parentheses from page title
Merge commit 'c33670e1b6961da1d7121b16ef23d10b9f6289d6'
* commit 'c33670e1b6961da1d7121b16ef23d10b9f6289d6':
add -n option to turn off prereq check when build OTA packages
Merge commit '12741f56acf0a8a4feccea537d066ae6882499ce' into donut
* commit '12741f56acf0a8a4feccea537d066ae6882499ce':
AI 147874: Fix format and link errors in docs.
Merge commit '6b894c8cec676cf0811743c864bcb1937714f2c0' into donut
* commit '6b894c8cec676cf0811743c864bcb1937714f2c0':
AI 147808: add "current sdk" link using the new sdk.current variable
Merge commit '099403d15d1f87e7a17f8e2aa3d9a8bc4afa4500' into donut
* commit '099403d15d1f87e7a17f8e2aa3d9a8bc4afa4500':
AI 147796: Add widget design guidelines to new UI Guidelines area in dev guide.
Merge commit '19a4bd164eec255f62cde30f4afc39f0aeb35c04' into donut
* commit '19a4bd164eec255f62cde30f4afc39f0aeb35c04':
AI 147710: Add redirects for sdk/preview pages.
Merge commit '6190dfe937d9972637129f86858272adcd83bd93' into donut
* commit '6190dfe937d9972637129f86858272adcd83bd93':
AI 147615: remove sdk version in parentheses from page title
Please let me know if you have other "known issues", "resolved issues", or
"highlights".
Also, note that the installing and upgrading docs are being updated in
a different CL, so the new version is not displayed on my staging server.
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 147303
Please let me know if you have other "known issues", "resolved issues", or
"highlights".
Also, note that the installing and upgrading docs are being updated in
a different CL, so the new version is not displayed on my staging server.
Original author: ddougherty
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147305
Please let me know if you have other "known issues", "resolved issues", or
"highlights".
Also, note that the installing and upgrading docs are being updated in
a different CL, so the new version is not displayed on my staging server.
BUG=1790234
Automated import of CL 147297
To support devphone and holiday builds we need more control over the
build fingerprint tags; generalize the -t option so we can arbitrarily
add and remove tags.
Currently, the docs that are specific to each SDK release -- downloading, installing, upgrading, requirements -- are stored in a directory with release-derived name, such as "1.1_r1". This change lets documents use generic links to point into the most recent version specific docs, eg href="{@docRoot}sdk/{sdkCurrent}/installing.html" instead of href="{@docRoot}sdk/1.1_r1/installing.html".
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 147054
Currently, the docs that are specific to each SDK release -- downloading, installing, upgrading, requirements -- are stored in a directory with release-derived name, such as "1.1_r1". This change lets documents use generic links to point into the most recent version specific docs, eg href="{@docRoot}sdk/{sdkCurrent}/installing.html" instead of href="{@docRoot}sdk/1.1_r1/installing.html".
Original author: ddougherty
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147058
Currently, the docs that are specific to each SDK release -- downloading, installing, upgrading, requirements -- are stored in a directory with release-derived name, such as "1.1_r1". This change lets documents use generic links to point into the most recent version specific docs, eg href="{@docRoot}sdk/{sdkCurrent}/installing.html" instead of href="{@docRoot}sdk/1.1_r1/installing.html".
BUG=1790234
Automated import of CL 147053
remove preliminary watermark;
remove red color text for warnings;
delete the caution class;
use 1em top-margin only for elements nested in a DD, elements nested in regular
LIs should only be a half em.
Original author: smain
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146955
remove preliminary watermark;
remove red color text for warnings;
delete the caution class;
use 1em top-margin only for elements nested in a DD, elements nested in regular
LIs should only be a half em.
Original author: smain
Merged from: //branches/cupcake/...
Automated import of CL 146953
remove preliminary watermark;
remove red color text for warnings;
delete the caution class;
use 1em top-margin only for elements nested in a DD, elements nested in regular
LIs should only be a half em.
BUG=1798190
Automated import of CL 146951
all of the builds. Fix that.
We really need to get this generic_with_google product out of
build/target and into vendor/google, but that can come later.
Original author: joeo
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146824
through the key map. Clarify the help for the -e option to
make clear this should happen.
(This change doesn't affect device code.)
Original author: dougz
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146544
all of the builds. Fix that.
We really need to get this generic_with_google product out of
build/target and into vendor/google, but that can come later.
Original author: joeo
Merged from: //branches/cupcake/...
Automated import of CL 146738
Adds the -t option to sign_target_files_apks, which lets the user
specify extra tags that should be added to the build fingerprint
during the signing process.
all of the builds. Fix that.
We really need to get this generic_with_google product out of
build/target and into vendor/google, but that can come later.
BUG=1786404
Automated import of CL 146687
through the key map. Clarify the help for the -e option to
make clear this should happen.
(This change doesn't affect device code.)
Original author: dougz
Merged from: //branches/cupcake/...
Automated import of CL 146194
through the key map. Clarify the help for the -e option to
make clear this should happen.
(This change doesn't affect device code.)
Automated import of CL 146193
The build system now (in donut) produces builds that use the testkey
cert for OTA package verification. Change the app-signing script to
also optionally substitute the "real" cert in both the recovery and
system images. Also fix bug where the build fingerprint and
description were not getting properly updated in the recovery
partition.
building images & OTA packages out of vendor/google.
No device code is touched by this change.
Original author: dougz
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 144399
building images & OTA packages out of vendor/google.
No device code is touched by this change.
Original author: dougz
Merged from: //branches/cupcake/...
Automated import of CL 144270
It makes no sense that a class would become deprecated because its superclass
became deprecated - this resulted in nonsensical deprecation warnings for
classes that weren't actually deprecated, like WebView, simply because they
inherited from something that was.
