Commit graph

5140 commits

Author SHA1 Message Date
Doug Zongker
9fc74c7823 don't fail if no required bootloaders are defined
Generic targets don't have a list of defined bootloaders.  Instead of
failing to build an OTA package, just omit the constraint.

Fix bad references to ExternalError.
2009-06-23 16:29:13 -07:00
Android (Google) Code Review
ab81dbd1f4 am bf8a59aa: Merge change 5017 into donut
Merge commit 'bf8a59aa12dd8dd8ceb6eeeec22dd94b8332c228'

* commit 'bf8a59aa12dd8dd8ceb6eeeec22dd94b8332c228':
  Don't install afar and dexpreopt-wrapper on system while building tests.
2009-06-22 22:04:16 -07:00
Sriram Raman
802965380c Don't install afar and dexpreopt-wrapper on system while building tests. 2009-06-22 17:16:37 -07:00
Doug Zongker
05d3dea519 support hooks for device-specific code in OTA package generation
Replace the installation of the "radio image", which is an
HTC-specific notion, with calls to device-specific python modules that
can add whatever additional OTA script commands are necessary.  Add
the -s flag to specify the location of the device-specific script
(replacing the unused -s flag in sign_target_files_apks).
2009-06-22 15:09:22 -07:00
David Warren
66b14d8646 Removing top tabs from PDK navigation because right now we only have one section. 2009-06-19 10:14:37 -07:00
Doug Zongker
ac4920a90b resolved conflicts for merge of c494d7ce to master 2009-06-18 13:42:20 -07:00
Doug Zongker
c494d7cee8 generate OTA packages that use edify
Split the details of generating script syntax into a generator class:
one for amend (whose output should be equivalent to the current
output), and one for edify.

Fix 'otatools' build rule to build imgdiff.
2009-06-18 13:19:07 -07:00
Doug Zongker
d6fb2d40b5 am 602a84e0: fix releasetools for non-linux architectures
Merge commit '602a84e0bbf1807a9403cfa50184241f6fc035c4'

* commit '602a84e0bbf1807a9403cfa50184241f6fc035c4':
  fix releasetools for non-linux architectures
2009-06-18 10:47:13 -07:00
Doug Zongker
602a84e0bb fix releasetools for non-linux architectures
The ota and img building scripts contained some hardcoded 'linux-x86'
paths.  Remove and replace with a slightly redefined -p option.
Modify Makefile to pass correct -p when building.
2009-06-18 10:43:55 -07:00
Android (Google) Code Review
99e5671b15 am 9454b1c8: Merge change 4089 into donut
Merge commit '9454b1c8b6d36e56b749bed06cfe7afb04a32375'

* commit '9454b1c8b6d36e56b749bed06cfe7afb04a32375':
  - Changed page title to show "Android open source"
2009-06-17 15:38:54 -07:00
Android (Google) Code Review
9454b1c8b6 Merge change 4089 into donut
* changes:
  - Changed page title to show "Android open source" - Changed Tab name to "Dev Guide"
2009-06-17 10:00:30 -07:00
Doug Zongker
38a649f873 handle BOARD_KERNEL_BASE in releasetools
Some devices define a BOARD_KERNEL_BASE argument which must be given
as an argument to mkbootimg when building a bootable image.  Store the
value of this var (if any) in the target-files zip and use it when
building images.
2009-06-17 09:07:09 -07:00
Doug Zongker
171f1cde10 don't require some OTA features
Make the following things optional:
 - kernel command lines for bootable images
 - radio images
 - bootloader assertions
These are not all (yet?) defined for some new devices.
2009-06-15 22:36:37 -07:00
Doug Zongker
683baae8c9 am 048e7ca1: fix archive files being created with perms 000
Merge commit '048e7ca15f6391681490ce564bc71194adf146aa'

* commit '048e7ca15f6391681490ce564bc71194adf146aa':
  fix archive files being created with perms 000
2009-06-15 14:55:06 -07:00
Doug Zongker
048e7ca15f fix archive files being created with perms 000
In python 2.5 and earlier, ZipFile.writestr(filename, data) results in
the file being added to the archive with permissions 000.  (See
http://svn.python.org/view?view=rev&revision=65235.)  Work around this
by creating a ZipInfo object and setting the permissions explicitly.
2009-06-15 14:31:53 -07:00
Scott Main
5386f16364 am 398814fa: am 5eb58327: AI 149839: make the home page\'s announcement block expandable... primarily, this is to handle various lengths of text due to translations, but also allows us to be more flexible WRT the content for the top section.
Merge commit '398814fa75ee05ba9e77dd0057c469cc92ffd73e'

* commit '398814fa75ee05ba9e77dd0057c469cc92ffd73e':
  AI 149839: make the home page's announcement block expandable...
2009-06-14 21:13:21 -07:00
Android (Google) Code Review
3f7760eeb1 am e05806cc: Merge change 4057 into donut
Merge commit 'e05806cc152dfa88917ca61843d784bdd34c91ae'

* commit 'e05806cc152dfa88917ca61843d784bdd34c91ae':
  make applypatch into a static library
2009-06-14 20:49:34 -07:00
Scott Main
398814fa75 am 5eb58327: AI 149839: make the home page\'s announcement block expandable... primarily, this is to handle various lengths of text due to translations, but also allows us to be more flexible WRT the content for the top section.
Merge commit '5eb5832751cad87021b9f1ad77f1c26952030884' into donut

* commit '5eb5832751cad87021b9f1ad77f1c26952030884':
  AI 149839: make the home page's announcement block expandable...
2009-06-14 20:45:16 -07:00
Scott Main
5eb5832751 AI 149839: make the home page's announcement block expandable...
primarily, this is to handle various lengths of text due to translations,
  but also allows us to be more flexible WRT the content for the top section.

Automated import of CL 149839
2009-06-12 14:02:40 -07:00
Gaurav Mathur
a0deb0fb7f - Changed page title to show "Android open source"
- Changed Tab name to "Dev Guide"
2009-06-12 13:47:16 -07:00
Android (Google) Code Review
e05806cc15 Merge change 4057 into donut
* changes:
  make applypatch into a static library
2009-06-12 09:45:14 -07:00
Doug Zongker
5a79087638 make applypatch into a static library
Turn the bulk of applypatch into a static library so it can be used
from the updater.  Also build it as a standalone executable for use by
the existing OTA mechanism.
2009-06-12 09:42:43 -07:00
Android (Google) Code Review
f6c53efe10 am 5aa29992: Merge change 3459 into donut
Merge commit '5aa299925d61f9d1e395c3c94f5f1f4566277fa8'

* commit '5aa299925d61f9d1e395c3c94f5f1f4566277fa8':
  make signapk strip other signatures
2009-06-12 08:26:01 -07:00
Android (Google) Code Review
5aa299925d Merge change 3459 into donut
* changes:
  make signapk strip other signatures
2009-06-11 19:25:14 -07:00
Doug Zongker
af482b62e5 make signapk strip other signatures
Change signapk to not propagate other signatures to the output
archive.  Multiple signatures seem to confuse the package manager, as
we saw with Maps, and other partners are checking in prebuilt APKs for
google experience devices signed with random other things.
2009-06-11 19:24:50 -07:00
Scott Main
08d69b0fbc am ed3a2d30: am 88ee3f4e: AI 149729: fix search functionatilty for offline docs... the file references weren\'t using the local root. BUG=1909300
Merge commit 'ed3a2d303de6110ef93d4570fd64550b31b55caa'

* commit 'ed3a2d303de6110ef93d4570fd64550b31b55caa':
  AI 149729: fix search functionatilty for offline docs...
2009-06-11 01:02:46 -07:00
Scott Main
ed3a2d303d am 88ee3f4e: AI 149729: fix search functionatilty for offline docs... the file references weren\'t using the local root. BUG=1909300
Merge commit '88ee3f4e032ba9fd0377b80b916dcc39b2ce1bf1' into donut

* commit '88ee3f4e032ba9fd0377b80b916dcc39b2ce1bf1':
  AI 149729: fix search functionatilty for offline docs...
2009-06-11 00:01:30 -07:00
Scott Main
88ee3f4e03 AI 149729: fix search functionatilty for offline docs...
the file references weren't using the local root.
  BUG=1909300

Automated import of CL 149729
2009-06-10 23:40:24 -07:00
Mathias Agopian
3344b2e9b2 break dependency on utils/ZipEntry.h and utils/ZipFile.h 2009-06-05 14:55:48 -07:00
Scott Main
5b53cd78cd page load perfomance improvements...
remove the lists.js file from the <head>, which slows down page
load a lot (over 300K), and instead load it dynamically on page load.
also remove navtree_data.js from the <head>, which also slows the load
and is only used in the reference when in tree view. This file is now
loaded during the initialization of the nav tree.
2009-06-05 13:54:06 -07:00
Android (Google) Code Review
7cea5343b9 am 39528d6b: Merge change 3004 into donut
Merge commit '39528d6bace1457d21e76824fe94d85c880fe4be'

* commit '39528d6bace1457d21e76824fe94d85c880fe4be':
  fix the SDK build for real this time.
  support incremental updates of boot image
2009-06-02 23:22:21 -07:00
Android (Google) Code Review
39528d6bac Merge change 3004 into donut
* changes:
  fix the SDK build for real this time. the missing macros weren't declared in the proper order last time.
2009-06-02 23:20:15 -07:00
Scott Main
653726a40a fix the SDK build for real this time.
the missing macros weren't declared in the proper order last time.
2009-06-02 20:58:23 -07:00
Android (Google) Code Review
3cbc666362 Merge change 2951 into donut
* changes:
  support incremental updates of boot image
2009-06-02 17:41:30 -07:00
Android (Google) Code Review
ae8c03d9e7 am 34780ee3: Merge change 2982 into donut
Merge commit '34780ee3b6e9958e87e0d192e156806e3f30940f'

* commit '34780ee3b6e9958e87e0d192e156806e3f30940f':
  fix build break by reincluding empty method calls
2009-06-02 17:40:19 -07:00
Android (Google) Code Review
34780ee3b6 Merge change 2982 into donut
* changes:
  fix build break by reincluding empty method calls that were moved to macros.cs
2009-06-02 17:38:23 -07:00
Scott Main
a0f9bd1ef8 fix build break by reincluding empty method calls
that were moved to macros.cs
2009-06-02 17:35:25 -07:00
Doug Zongker
5da317e51d support incremental updates of boot image
Modify applypatch to be able to write MTD partitions as well as read
them.  Make applypatch save a backup copy of the contents of an MTD
partition it reads in cache, to be used in case an update is
interrupted while writing back to MTD.  Modify OTA package creation
script to send boot image updates in patch form.
2009-06-02 14:09:11 -07:00
Android (Google) Code Review
1604b78091 am 31dae454: Merge change 2146 into donut
Merge commit '31dae454b6c2c137f3218d9fa3d25784f4b3f232'

* commit '31dae454b6c2c137f3218d9fa3d25784f4b3f232':
  Implements the basic structure for providing localized documentation;
2009-06-02 11:38:54 -07:00
Android (Google) Code Review
31dae454b6 Merge change 2146 into donut
* changes:
  Implements the basic structure for providing localized documentation; the site tabs are now in a separate file to ease the translation process, the language selection menu has been added to the header, scripts have been added to dynamically switch the language of the site tabs and dev guide side navigation and save the language preference in a browser cookie, and some of the functions in macro.cs have moved into customization.cs.
2009-06-02 11:36:55 -07:00
Scott Main
1043da9c95 Implements the basic structure for providing localized documentation;
the site tabs are now in a separate file to ease the translation process,
the language selection menu has been added to the header,
scripts have been added to dynamically switch the language of the
site tabs and dev guide side navigation and save the language
preference in a browser cookie,
and some of the functions in macro.cs have moved into customization.cs.

patch 2:
revised the logic for changing tab and nav languages so that,
in the event that a SPAN node exists for the newly selected language
but the translation has not actually been put there, it will not be selected
and the previously selected language will remain for that node.

patch 3:
revised the logic introduced in patch 2, which, when loading a new page
would actually reveal all languages if the selected language had no
translation. Now, we must loop through each occurance and check whether
a translation is available. If not, then we hide it and show English.

patch 4:
small error fix
2009-06-02 10:24:41 -07:00
Doug Zongker
7a14d9958d am f6a8bada: add support for reading MTD partitions to applypatch
Merge commit 'f6a8bada5f0966762eadaec96de6430d0cd577e3'

* commit 'f6a8bada5f0966762eadaec96de6430d0cd577e3':
  add support for reading MTD partitions to applypatch
2009-06-02 00:36:31 -07:00
Doug Zongker
f6a8bada5f add support for reading MTD partitions to applypatch
Allow an MTD partition so serve as a source "file" in applypatch,
using a magically-formatted 'filename' that specifies the partition
name, size of data to read, and expected hash.  Build incremental OTAs
that update the recovery image via a patch.
2009-06-01 15:48:24 -07:00
Android (Google) Code Review
b534660b9c am bfeb1936: Merge change 2717 into donut
Merge commit 'bfeb193659412fce01136ce854257cc54fbe8e14'

* commit 'bfeb193659412fce01136ce854257cc54fbe8e14':
  build images with minigzip instead of system gzip
2009-06-01 12:01:16 -07:00
Doug Zongker
32da27a9ff build images with minigzip instead of system gzip
Use minigzip (from the zlib distribution, built in the android tree)
to compress images rather than the system install of gzip.  This will
let us send useful patches for images since we can make zlib available
in the applypatch program.
2009-05-29 11:42:57 -07:00
Android (Google) Code Review
f82b55980b am daffeb33: Merge change 2594 into donut
Merge commit 'daffeb333e7965eff58161a42de53ca157da4da9'

* commit 'daffeb333e7965eff58161a42de53ca157da4da9':
  new image diffing tool and support for image patches in applypatch
2009-05-28 21:21:22 -07:00
Doug Zongker
02d444b07e 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.
2009-05-28 21:18:46 -07:00
Dirk Dougherty
650b20507c am 5d1b9731: am 29eafdea: AI 149251: Add 1.x Icon Guidelines doc and template pack. BUG=1790234
Merge commit '5d1b97315763b8a8882b428885342e0cd2817050'

* commit '5d1b97315763b8a8882b428885342e0cd2817050':
  AI 149251: Add 1.x Icon Guidelines doc and template pack.
2009-05-26 10:11:40 -07:00
Dirk Dougherty
5d1b973157 am 29eafdea: AI 149251: Add 1.x Icon Guidelines doc and template pack. BUG=1790234
Merge commit '29eafdea34a5239b25fe82e5cd6debf1a5157c6b' into donut

* commit '29eafdea34a5239b25fe82e5cd6debf1a5157c6b':
  AI 149251: Add 1.x Icon Guidelines doc and template pack.
2009-05-26 10:02:55 -07:00
Dirk Dougherty
29eafdea34 AI 149251: Add 1.x Icon Guidelines doc and template pack.
BUG=1790234

Automated import of CL 149251
2009-05-26 08:40:40 -07:00
Android (Google) Code Review
4afb4f20fc am 3026e96d: Merge change 2245 into donut
Merge commit '3026e96dcea7893d762d3ad1532c3775dfe01b60'

* commit '3026e96dcea7893d762d3ad1532c3775dfe01b60':
  Define TARGET_CPU_ABI for finding native code in .apks
2009-05-22 16:55:41 -07:00
Android (Google) Code Review
3026e96dce Merge change 2245 into donut
* changes:
  Define TARGET_CPU_ABI for finding native code in .apks
2009-05-22 16:53:05 -07:00
Doug Zongker
c6a5d81c38 am 8ce7c25e: improve password entry for signing keys
Merge commit '8ce7c25e905bc14382359e1cd45d41832bcc7ffa'

* commit '8ce7c25e905bc14382359e1cd45d41832bcc7ffa':
  improve password entry for signing keys
  Modified the image and index URLs to point to guide/index.html now
2009-05-22 15:35:02 -07:00
Doug Zongker
8ce7c25e90 improve password entry for signing keys
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).
2009-05-22 15:31:08 -07:00
Dianne Hackborn
ecc70d705a Define TARGET_CPU_ABI for finding native code in .apks 2009-05-22 14:54:07 -07:00
Gaurav Mathur
89d037eb8c Modified the image and index URLs to point to guide/index.html now 2009-05-22 10:23:58 -07:00
Robert Greenwalt
fbd10d940d Add PRODUCT_DEFAULT_WIFI_CHANNELS build var.
Allows the build to specify the default number of allowed
WIFI channels.  Part of the fix for 1625953.
2009-05-21 18:46:57 -07:00
Gaurav Mathur
f326d14362 Modified the image and index URLs to point to guide/index.html now 2009-05-21 13:35:47 -07:00
Doug Zongker
b4204699a4 am eb338efd: make sure package keys are consistent with shared users
Merge commit 'eb338efd2eae20962c7ca75baf161be540b3d664'

* commit 'eb338efd2eae20962c7ca75baf161be540b3d664':
  make sure package keys are consistent with shared users
2009-05-20 22:44:04 -07:00
Doug Zongker
eb338efd2e 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.
2009-05-20 16:50:49 -07:00
Android (Google) Code Review
6e900ab159 am 87fc0fdc: Merge change 1738 into donut
Merge commit '87fc0fdc53b5998a36e0a305518525c28db7f35f'

* commit '87fc0fdc53b5998a36e0a305518525c28db7f35f':
  add -e option to add extra commands to OTA script
2009-05-20 11:49:42 -07:00
Android (Google) Code Review
87fc0fdc53 Merge change 1738 into donut
* changes:
  add -e option to add extra commands to OTA script
2009-05-20 10:01:00 -07:00
Doug Zongker
1c390a2aa9 add -e option to add extra commands to OTA script 2009-05-14 19:06:36 -07:00
Gaurav Mathur
fe93ea7068 am cb08f15b: am ee6df9b4: 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.
Merge commit 'cb08f15bf48f070c0bc2925846cd7ef7b1dc4c55'

* commit 'cb08f15bf48f070c0bc2925846cd7ef7b1dc4c55':
  AI 148870: Pinging Ryan for Dr No approval.
2009-05-14 16:30:43 -07:00
Gaurav Mathur
cb08f15bf4 am ee6df9b4: 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.
Merge commit 'ee6df9b4fe6e1a7431ff77d81fb8c164ee99f31d' into donut

* commit 'ee6df9b4fe6e1a7431ff77d81fb8c164ee99f31d':
  AI 148870: Pinging Ryan for Dr No approval.
2009-05-14 16:18:20 -07:00
Gaurav Mathur
ee6df9b4fe 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
2009-05-14 16:02:22 -07:00
Scott Main
0cf91e6565 am cdc13d7: am 9b54792: AI 148820: adjust the "nolist" class to add bott
Merge commit 'cdc13d717b016c61592e34dacabf24c09c3bca4c'

* commit 'cdc13d717b016c61592e34dacabf24c09c3bca4c':
  AI 148820: adjust the "nolist" class to add bottom-spacing and refine list item padding;
2009-05-13 17:55:09 -07:00
Scott Main
cdc13d717b am 9b54792: AI 148820: adjust the "nolist" class to add bottom-spacing a
Merge commit '9b54792d7044125126a9765d1baf3ff0e59efcb4' into donut

* commit '9b54792d7044125126a9765d1baf3ff0e59efcb4':
  AI 148820: adjust the "nolist" class to add bottom-spacing and refine list item padding;
2009-05-13 17:52:28 -07:00
Scott Main
9b54792d70 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
2009-05-13 17:50:33 -07:00
Dirk Dougherty
74d2e86902 am e9a96dd: am 4e4c919: AI 148759: Add download page for NDK 1.5 r1.
Merge commit 'e9a96dd92c2577b77d3a5e5a0d04dfab6f4af5f2'

* commit 'e9a96dd92c2577b77d3a5e5a0d04dfab6f4af5f2':
  AI 148759: Add download page for NDK 1.5 r1.
2009-05-12 19:03:27 -07:00
Dirk Dougherty
e9a96dd92c am 4e4c919: AI 148759: Add download page for NDK 1.5 r1.
Merge commit '4e4c919539c5fb2f790143dde9c318501457ce43' into donut

* commit '4e4c919539c5fb2f790143dde9c318501457ce43':
  AI 148759: Add download page for NDK 1.5 r1.
2009-05-12 18:49:27 -07:00
Dirk Dougherty
4e4c919539 AI 148759: Add download page for NDK 1.5 r1.
BUG=1790234

Automated import of CL 148759
2009-05-12 15:32:35 -07:00
Android (Google) Code Review
123834f93c am e27db38: Merge change 1291 into donut
Merge commit 'e27db38fdd6b29ae470a7d296a4de07002f23acb'

* commit 'e27db38fdd6b29ae470a7d296a4de07002f23acb':
  allow separate source and target files for applypatch
2009-05-08 22:48:56 -07:00
Android (Google) Code Review
e27db38fdd Merge change 1291 into donut
* changes:
  allow separate source and target files for applypatch
2009-05-08 16:03:49 -07:00
Doug Zongker
ef85ea6086 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.
2009-05-08 15:43:26 -07:00
Dianne Hackborn
0a6d796829 am 9537884: Add new property for dev codename, update version to Donut.
Merge commit '9537884b0dabe81bf612c79d12c7b4bf40de10a5'

* commit '9537884b0dabe81bf612c79d12c7b4bf40de10a5':
  Add new property for dev codename, update version to Donut.
2009-05-08 13:52:08 -07:00
Dianne Hackborn
9537884b0d Add new property for dev codename, update version to Donut. 2009-05-08 13:03:08 -07:00
Dirk Dougherty
cfb082006b am 40a06d8: AI 148314: Remove droiddoc code that applies the deprecated
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
2009-05-05 17:42:41 -07:00
Dirk Dougherty
40a06d8940 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
BUG=1827730

Automated import of CL 148314
2009-05-05 13:41:56 -07:00
Dirk Dougherty
199eb2f510 am a19801e: am c521e26: AI 148186: Add support for using custom pdk temp
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
2009-05-01 11:58:55 -07:00
Dirk Dougherty
a19801e060 am c521e26: AI 148186: Add support for using custom pdk templates. The m
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
2009-05-01 11:20:14 -07:00
Dirk Dougherty
c521e26640 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
BUG=1646802

Automated import of CL 148186
2009-05-01 11:19:55 -07:00
Dirk Dougherty
dcec263780 am b4abfb9: am 12741f5: AI 147874: Fix format and link errors in docs.
Merge commit 'b4abfb91bf1519af1e2826cc2246f324c06a983c'

* commit 'b4abfb91bf1519af1e2826cc2246f324c06a983c':
  AI 147874: Fix format and link errors in docs.
2009-04-29 11:02:43 -07:00
Scott Main
2d2752fc37 am ee1e5a3: am 6b894c8: AI 147808: add "current sdk" link using the new
Merge commit 'ee1e5a3da8b50c92d0fb2a28211bf71b93f9d1f5'

* commit 'ee1e5a3da8b50c92d0fb2a28211bf71b93f9d1f5':
  AI 147808: add "current sdk" link using the new sdk.current variable
2009-04-29 11:02:43 -07:00
Dirk Dougherty
f4042fa8a5 am 9f7d4f2: am 099403d: AI 147796: Add widget design guidelines to new U
Merge commit '9f7d4f2351bf59e7a77d4377add18ffb511bcc55'

* commit '9f7d4f2351bf59e7a77d4377add18ffb511bcc55':
  AI 147796: Add widget design guidelines to new UI Guidelines area in dev guide.
2009-04-29 11:02:43 -07:00
Dirk Dougherty
1d742186df am 37ca5d1: am 19a4bd1: AI 147710: Add redirects for sdk/preview pages.
Merge commit '37ca5d11b32399b2924f56e5d8e6dc414f8d1018'

* commit '37ca5d11b32399b2924f56e5d8e6dc414f8d1018':
  AI 147710: Add redirects for sdk/preview pages.
2009-04-29 11:02:43 -07:00
Scott Main
0fef90c80e am 3bc7430: am 6190dfe: AI 147615: remove sdk version in parentheses fro
Merge commit '3bc74303857538055b906d1f01077d77e6776248'

* commit '3bc74303857538055b906d1f01077d77e6776248':
  AI 147615: remove sdk version in parentheses from page title
2009-04-29 11:02:43 -07:00
Android (Google) Code Review
209bcb2f64 am c33670e: Merge change 488 into donut
Merge commit 'c33670e1b6961da1d7121b16ef23d10b9f6289d6'

* commit 'c33670e1b6961da1d7121b16ef23d10b9f6289d6':
  add -n option to turn off prereq check when build OTA packages
2009-04-29 11:02:43 -07:00
Dirk Dougherty
b4abfb91bf am 12741f5: AI 147874: Fix format and link errors in docs.
Merge commit '12741f56acf0a8a4feccea537d066ae6882499ce' into donut

* commit '12741f56acf0a8a4feccea537d066ae6882499ce':
  AI 147874: Fix format and link errors in docs.
2009-04-28 21:52:48 -07:00
Scott Main
ee1e5a3da8 am 6b894c8: AI 147808: add "current sdk" link using the new sdk.current
Merge commit '6b894c8cec676cf0811743c864bcb1937714f2c0' into donut

* commit '6b894c8cec676cf0811743c864bcb1937714f2c0':
  AI 147808: add "current sdk" link using the new sdk.current variable
2009-04-28 21:52:48 -07:00
Dirk Dougherty
9f7d4f2351 am 099403d: AI 147796: Add widget design guidelines to new UI Guidelines
Merge commit '099403d15d1f87e7a17f8e2aa3d9a8bc4afa4500' into donut

* commit '099403d15d1f87e7a17f8e2aa3d9a8bc4afa4500':
  AI 147796: Add widget design guidelines to new UI Guidelines area in dev guide.
2009-04-28 21:52:48 -07:00
Dirk Dougherty
37ca5d11b3 am 19a4bd1: AI 147710: Add redirects for sdk/preview pages.
Merge commit '19a4bd164eec255f62cde30f4afc39f0aeb35c04' into donut

* commit '19a4bd164eec255f62cde30f4afc39f0aeb35c04':
  AI 147710: Add redirects for sdk/preview pages.
2009-04-28 21:52:48 -07:00
Scott Main
3bc7430385 am 6190dfe: AI 147615: remove sdk version in parentheses from page title
Merge commit '6190dfe937d9972637129f86858272adcd83bd93' into donut

* commit '6190dfe937d9972637129f86858272adcd83bd93':
  AI 147615: remove sdk version in parentheses from page title
2009-04-28 21:52:48 -07:00
Dirk Dougherty
12741f56ac AI 147874: Fix format and link errors in docs.
BUG=1790234

Automated import of CL 147874
2009-04-27 18:13:09 -07:00
Scott Main
6b894c8cec AI 147808: add "current sdk" link using the new sdk.current variable
BUG=1790234

Automated import of CL 147808
2009-04-26 23:18:20 -07:00
Dirk Dougherty
099403d15d AI 147796: Add widget design guidelines to new UI Guidelines area in dev guide.
BUG=1790234

Automated import of CL 147796
2009-04-25 23:09:51 -07:00
The Android Open Source Project
98dce16df0 Merge commit 'korg/donut' 2009-04-24 13:54:55 -07:00
Dirk Dougherty
19a4bd164e AI 147710: Add redirects for sdk/preview pages.
BUG=1790234

Automated import of CL 147710
2009-04-24 11:30:32 -07:00
Scott Main
6190dfe937 AI 147615: remove sdk version in parentheses from page title
BUG=1790234

Automated import of CL 147615
2009-04-23 23:08:46 -07:00
Doug Zongker
962069ce59 add -n option to turn off prereq check when build OTA packages
Developers might legitimately want to install older builds on their
phones, so add option to build OTA packages that will install over
newer builds.
2009-04-23 11:44:08 -07:00
Jean-Baptiste Queru
a99122a246 Merge donut into master 2009-04-22 17:12:09 -07:00
Dirk Dougherty
6a4d6c9ac5 Merge branch 'readonly-p4-donut' into donut 2009-04-22 13:20:39 -07:00
Dirk Dougherty
7a5b757428 AI 147303: am: CL 147297 Update Android 1.5 SDK Download, Release Notes, Version Notes, Highlights
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
2009-04-22 13:19:29 -07:00
Dirk Dougherty
7addbc6d55 Merge branch 'readonly-p4-master' 2009-04-22 00:47:52 -07:00
Dirk Dougherty
8094a1462d AI 147305: am: CL 147303 am: CL 147297 Update Android 1.5 SDK Download, Release Notes, Version Notes, Highlights
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
2009-04-22 00:46:34 -07:00
Dirk Dougherty
55534c8568 AI 147297: Update Android 1.5 SDK Download, Release Notes, Version Notes, Highlights
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
2009-04-21 18:52:37 -07:00
Doug Zongker
dbfaae5567 add -w option to ota_from_target_files
Add option to make OTA packages that wipe user data.
2009-04-21 17:12:54 -07:00
Android (Google) Code Review
72611ece86 Merge change 362 into donut
* changes:
  generalize -t option to add and remove tags in fingerprints
2009-04-21 16:06:17 -07:00
Doug Zongker
ae877013ab generalize -t option to add and remove tags in fingerprints
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.
2009-04-21 15:56:42 -07:00
Dirk Dougherty
bf6823b468 Merge branch 'readonly-p4-donut' into donut 2009-04-21 01:01:23 -07:00
Dirk Dougherty
8a81cce630 AI 147054: am: CL 147053 Add -hdf primer vars for the platform and release ID associated with the current (most recent) SDK.
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
2009-04-21 01:00:11 -07:00
Dirk Dougherty
e7b6e882e5 Merge branch 'readonly-p4-master' 2009-04-20 17:58:00 -07:00
Dirk Dougherty
911e311e4e AI 147058: am: CL 147054 am: CL 147053 Add -hdf primer vars for the platform and release ID associated with the current (most recent) SDK.
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
2009-04-20 17:56:31 -07:00
Dirk Dougherty
82ed8f8c5e AI 147053: Add -hdf primer vars for the platform and release ID associated with the current (most recent) SDK.
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
2009-04-20 17:54:49 -07:00
Android (Google) Code Review
141f3adb8b Merge change 268 into donut
* changes:
  add option to modify build fingerprint tags when signing
2009-04-20 12:11:35 -07:00
Scott Main
7280e2d2e3 Merge branch 'readonly-p4-master' 2009-04-20 11:19:35 -07:00
Scott Main
9cccd821ca AI 146955: am: CL 146953 am: CL 146951 CSS edits for docs;
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
2009-04-20 11:18:15 -07:00
Scott Main
65504ff4e9 Merge branch 'readonly-p4-donut' into donut 2009-04-20 11:17:51 -07:00
Scott Main
abfeaa094d AI 146953: am: CL 146951 CSS edits for docs;
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
2009-04-20 11:16:42 -07:00
Scott Main
9e54130f3d AI 146951: CSS edits for docs;
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
2009-04-20 11:15:26 -07:00
Joe Onorato
c09cd34bee Merge branch 'readonly-p4-master' 2009-04-18 22:37:32 -07:00
Joe Onorato
7ee52de5c3 AI 146824: am: CL 146738 am: CL 146687 The maps and gtalkservice libraries were still being included in
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
2009-04-18 22:36:21 -07:00
Dirk Dougherty
1c632f9e73 Merge branch 'readonly-p4-master' 2009-04-18 21:16:22 -07:00
Dirk Dougherty
eb1bbbec81 AI 146575: am: CL 146347 am: CL 146344 g4 integrate -t -i -b platform-1_0-to-cupcake @143529,143529 (doc change)
Original author: ddougherty
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146575
2009-04-18 21:15:08 -07:00
Dirk Dougherty
ed214869ec Merge branch 'readonly-p4-master' 2009-04-18 21:13:35 -07:00
Dirk Dougherty
ecfc2c0285 AI 146574: am: CL 146346 am: CL 146342 g4 integrate -t -i -b platform-1_0-to-cupcake @141805,141805 (doc change)
Original author: ddougherty
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146574
2009-04-18 21:12:27 -07:00
Doug Zongker
add1f5e56d Merge branch 'readonly-p4-master' 2009-04-18 15:42:29 -07:00
Doug Zongker
1928af7eb6 AI 146544: am: CL 146194 am: CL 146193 Fix signing script so keys specified in -e options get passed
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
2009-04-18 15:41:18 -07:00
Joe Onorato
a8643300df Merge branch 'readonly-p4-donut' into donut 2009-04-17 11:16:46 -07:00
Joe Onorato
30663a2d1a AI 146738: am: CL 146687 The maps and gtalkservice libraries were still being included in
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
2009-04-17 11:15:32 -07:00
Doug Zongker
17aa944001 add option to modify build fingerprint tags when signing
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.
2009-04-17 10:15:58 -07:00
Joe Onorato
f32686a3e2 AI 146687: The maps and gtalkservice libraries were still being included in
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
2009-04-16 19:15:49 -07:00
Doug Zongker
3f2933b209 add check mode to zipalign
Add a -c flag to zipalign to do nothing but check the input zip file
for alignment (with or without verbosity).
2009-04-16 10:16:38 -07:00
Dirk Dougherty
37640799e6 Merge branch 'readonly-p4-donut' into donut 2009-04-15 11:41:27 -07:00
Dirk Dougherty
f481f53de2 AI 146347: am: CL 146344 g4 integrate -t -i -b platform-1_0-to-cupcake @143529,143529 (doc change)
Original author: ddougherty
  Merged from: //branches/cupcake/...

Automated import of CL 146347
2009-04-15 11:40:10 -07:00
Dirk Dougherty
6080c87c31 Merge branch 'readonly-p4-donut' into donut 2009-04-15 11:37:52 -07:00
Dirk Dougherty
b8f2e76e29 AI 146346: am: CL 146342 g4 integrate -t -i -b platform-1_0-to-cupcake @141805,141805 (doc change)
Original author: ddougherty
  Merged from: //branches/cupcake/...

Automated import of CL 146346
2009-04-15 11:36:34 -07:00
Dirk Dougherty
a744f1b5a5 AI 146344: g4 integrate -t -i -b platform-1_0-to-cupcake @143529,143529 (doc change)
BUG=1675368

Automated import of CL 146344
2009-04-15 11:32:45 -07:00
Dirk Dougherty
18467173e5 AI 146342: g4 integrate -t -i -b platform-1_0-to-cupcake @141805,141805 (doc change)
BUG=1675368

Automated import of CL 146342
2009-04-15 11:31:36 -07:00
The Android Open Source Project
e53ceac5e2 Merge commit 'korg/cupcake' 2009-04-14 18:17:59 -07:00
Doug Zongker
43874f8c86 make unsigned apks explicit
Allow user to explicitly specify that an apk is not to be
re-signed. Fail if we have any apks that for which no key is provided.
2009-04-14 17:12:20 -07:00
Doug Zongker
547c8cfa7d Merge branch 'readonly-p4-donut' into donut 2009-04-14 12:35:46 -07:00
Doug Zongker
ad88c7ce4f AI 146194: am: CL 146193 Fix signing script so keys specified in -e options get passed
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
2009-04-14 12:34:27 -07:00
Doug Zongker
8c61c301b2 AI 146193: Fix signing script so keys specified in -e options get passed
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
2009-04-14 12:33:31 -07:00
Doug Zongker
8e931bf999 update the cert used for OTA verification when signing
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.
2009-04-06 15:21:45 -07:00
Sean McNeil
19ea2a8843 Cleanup output when searching for leaves. Don't want to see things like warnings of looping symlinks. 2009-04-04 18:46:15 +07:00
Doug Zongker
2c7cc50c74 Merge branch 'readonly-p4-master' 2009-04-02 23:00:43 -07:00
Doug Zongker
dbfb20ccd8 AI 144399: am: CL 144270 am: CL 144269 Relocate the new (google-indepedent) tools for signing and
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
2009-04-02 22:59:40 -07:00
Doug Zongker
eef3944eb3 AI 144270: am: CL 144269 Relocate the new (google-indepedent) tools for signing and
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
2009-04-02 12:14:19 -07:00
Doug Zongker
ad44c07ac7 AI 144269: Relocate the new (google-indepedent) tools for signing and
building images & OTA packages out of vendor/google.
  No device code is touched by this change.
  BUG=1753409

Automated import of CL 144269
2009-04-02 12:10:46 -07:00
Mike Ritter
ad22128be8 Merge branch 'readonly-p4-master' 2009-04-02 10:37:54 -07:00
Mike Ritter
c47ae940ee AI 144207: am: CL 144166 am: CL 144164 Adding droiddocs/javadocs usage to Pdk-docs to get correct style.
Original author: mritter
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 144207
2009-04-02 10:36:49 -07:00
Mike Ritter
032e32a012 AI 144166: am: CL 144164 Adding droiddocs/javadocs usage to Pdk-docs to get correct style.
Original author: mritter
  Merged from: //branches/cupcake/...

Automated import of CL 144166
2009-04-02 01:26:29 -07:00
Mike Ritter
6c4cd9e035 AI 144164: Adding droiddocs/javadocs usage to Pdk-docs to get correct style.
BUG=1646802

Automated import of CL 144164
2009-04-01 17:30:12 -07:00
The Android Open Source Project
8ac438f110 Merge branch 'open_source' into google_internal
Conflicts:
	core/build_id.mk
2009-03-29 08:55:26 -07:00
The Android Open Source Project
1379256b55 Merge commit 'korg/cupcake' 2009-03-27 15:30:35 -07:00
Iliyan Malchev
c87cb75a66 Automated import from //branches/master/...@142824,142824 2009-03-25 18:09:52 -07:00
Iliyan Malchev
bafa6ddfc5 Automated import from //branches/donutburger/...@141285,141285 2009-03-24 19:58:48 -07:00
Iliyan Malchev
9020995de4 Automated import from //branches/master/...@141287,141287 2009-03-24 19:58:46 -07:00
Dianne Hackborn
cd44e5400f Automated import from //branches/donutburger/...@140818,140818 2009-03-24 18:36:43 -07:00
Dianne Hackborn
15e0f1afee Automated import from //branches/master/...@140824,140824 2009-03-24 18:36:42 -07:00
The Android Open Source Project
b87fef6336 auto import from //branches/cupcake_rel/...@141571 2009-03-19 23:08:36 -07:00
Edward Hervey
4cd3f74003 findleaves.sh: Properly fix arguments.
the first argument is the executable (here findleaves.sh), therefore we
need to start popping from the 2nd argument (1).
2009-03-19 12:32:04 +01:00
The Android Open Source Project
f122bec404 auto import from //branches/cupcake_rel/...@140373 2009-03-18 17:39:42 -07:00
Jean-Baptiste Queru
ccf4b83b02 Merge commit 'remotes/korg/cupcake' into cupcake_to_master
Conflicts:
	core/prelink-linux-arm.map
2009-03-18 16:58:18 -07:00
The Android Open Source Project
6bce205856 auto import from //branches/cupcake_rel/...@138607 2009-03-13 13:04:19 -07:00
The Android Open Source Project
fdd3a1020c auto import from //branches/cupcake/...@137873 2009-03-11 12:11:54 -07:00
The Android Open Source Project
2f31293ba7 auto import from //branches/cupcake/...@137197 2009-03-09 11:52:11 -07:00
The Android Open Source Project
88b607994a auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
The Android Open Source Project
05806d7af6 auto import from //depot/cupcake/@135843 2009-03-03 18:28:14 -08:00
The Android Open Source Project
094268cf8c auto import from //depot/cupcake/@132589 2009-03-03 14:03:52 -08:00
The Android Open Source Project
a9b2249753 auto import from //depot/cupcake/@137055 2009-03-02 22:54:15 -08:00
aurelien...@free.fr
2f49d59369 Add support for symbolic links for product folders
Fixes http://code.google.com/p/android/issues/detail?id=2116
2009-03-02 10:54:28 -08:00
The Android Open Source Project
4d23ccc023 auto import from //branches/cupcake/...@132569 2009-02-20 07:38:28 -08:00
The Android Open Source Project
41977d7cd2 auto import from //branches/cupcake/...@132276 2009-02-19 10:57:29 -08:00
The Android Open Source Project
dca10d536d auto import from //branches/cupcake/...@131421 2009-02-13 12:57:48 -08:00
The Android Open Source Project
475fa12ade auto import from //branches/cupcake/...@130745 2009-02-10 15:43:57 -08:00
The Android Open Source Project
e914857b89 Merge branch 'cupcake' 2009-01-20 14:05:22 -08:00
The Android Open Source Project
ed18741e07 auto import from //branches/cupcake/...@127101 2009-01-20 14:03:55 -08:00
The Android Open Source Project
a71fc0a155 Merge branch 'master' of git://android.git.kernel.org/platform/build 2009-01-16 14:38:53 -08:00
android-build SharedAccount
0c2b8bfb87 Merge branch 'cupcake' 2009-01-15 16:15:46 -08:00
The Android Open Source Project
66339ad5ce auto import from //branches/cupcake/...@126645 2009-01-15 16:12:07 -08:00
Mike Hearn
5496ad284d Don't walk the inheritance heirarchy looking for deprecated superclasses.
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.
2009-01-14 17:27:57 +01:00
The Android Open Source Project
70b813ec57 auto import from //branches/cupcake/...@125939 2009-01-09 18:27:30 -08:00
The Android Open Source Project
4f85cc54b3 auto import from //branches/cupcake/...@125939 2009-01-09 17:50:54 -08:00
Jean-Baptiste Queru
179d2bf01a Merge commit 'remotes/korg/cupcake'
Conflicts:
	core/api/1.xml
	core/api/current.xml
	core/main.mk
2008-12-19 07:58:19 -08:00
The Android Open Source Project
dcc08f073b Code drop from //branches/cupcake/...@124589 2008-12-17 18:03:49 -08:00
Christopher Tate
824b6963bd Use a typed comparison of floating point field values rather than just a string comparison.
This addresses toolchain issues; see http://code.google.com/p/android/issues/detail?id=994
2008-10-22 20:23:11 -07:00
Alexey Zaytsev
8ae3ad5802 Add a few missing headers.
Fixes build with gcc 4.3.2 on Debian.

Signed-off-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>
2008-10-22 02:02:30 +04:00
The Android Open Source Project
b6c1cf6de7 Initial Contribution 2008-10-21 07:00:00 -07:00