Commit graph

239 commits

Author SHA1 Message Date
Scott Main
353f53c1a6 am 1aa2380c: AI 150428: update the jquery library to version 1.3.2. the incentive is to utilize an improvement made in the :hidden selector (for the videos page); this update should also hopefully improve some performance, but it is otherwise the same as before
Merge commit '1aa2380c95a107842972f87ce1dfd7be9f859882'

* commit '1aa2380c95a107842972f87ce1dfd7be9f859882':
  AI 150428: update the jquery library to version 1.3.2.
2009-07-25 10:12:06 -07:00
Scott Main
bbd6743f9e am 8576132a: AI 150393: edit the reference\'s navtree highlighting logic to handle intl/ directories BUG=1790234
Merge commit '8576132a38f4242c5f5da3133e832525a70766e6'

* commit '8576132a38f4242c5f5da3133e832525a70766e6':
  AI 150393: edit the reference's navtree highlighting logic to handle intl/ directories
2009-07-25 10:12:04 -07:00
Dirk Dougherty
afac918686 am 1cb43f69: AI 150389: Fix handling of cookie writes for intl pages. BUG=1790234
Merge commit '1cb43f69d4b09f19cff39a68b3cd00de3ecca4a4'

* commit '1cb43f69d4b09f19cff39a68b3cd00de3ecca4a4':
  AI 150389: Fix handling of cookie writes for intl pages.
2009-07-25 10:12:03 -07:00
Dirk Dougherty
901dd0074a am 233bc0b8: AI 150370: Add localized content infrastructure in droiddoc templates, javascript, and css. DocFile.java - instead of FileReader, use InputStreamReader with UTF-8 encoding. ClearPage.java - add UTF-8 output encoding to FileOutputStreamWriter. Note: this
Merge commit '233bc0b84aef261a67a364ff3a8e91077fd70fd6'

* commit '233bc0b84aef261a67a364ff3a8e91077fd70fd6':
  AI 150370: Add localized content infrastructure in droiddoc templates, javascript, and css.  DocFile.java - instead of FileReader, use InputStreamReader with UTF-8 encoding. ClearPage.java - add UTF-8 output encoding to FileOutputStreamWriter. Note: this change also up-integrates gerrit 2146 (smain).
2009-07-25 10:12:01 -07:00
Android (Google) Code Review
8104c7c4b7 am eaf299f8: Merge change 8339 into donut
Merge commit 'eaf299f8b465d7db2f37f068b33ace9a5d6d1589'

* commit 'eaf299f8b465d7db2f37f068b33ace9a5d6d1589':
  AI 150083: Minor updates to the ndk docs based on approved messaging.
2009-07-25 10:11:58 -07:00
Android (Google) Code Review
423ea3e04a am e85be87e: Merge change 3175 into donut
Merge commit 'e85be87ee6e17df30c1cdfee523e8e8f255ebf62'

* commit 'e85be87ee6e17df30c1cdfee523e8e8f255ebf62':
  page load perfomance improvements...
2009-07-25 10:11:56 -07:00
Scott Main
1aa2380c95 AI 150428: update the jquery library to version 1.3.2.
the incentive is to utilize an improvement made in the :hidden selector (for the videos page);
  this update should also hopefully improve some performance, but it is otherwise the same
  as before and this file still includes the core library, plus the UI core and resizable libraries

Automated import of CL 150428
2009-07-24 18:39:20 -07:00
Scott Main
8576132a38 AI 150393: edit the reference's navtree highlighting logic to handle intl/ directories
BUG=1790234

Automated import of CL 150393
2009-07-24 18:39:20 -07:00
Dirk Dougherty
1cb43f69d4 AI 150389: Fix handling of cookie writes for intl pages.
BUG=1790234

Automated import of CL 150389
2009-07-24 18:39:20 -07:00
Dirk Dougherty
233bc0b84a AI 150370: Add localized content infrastructure in droiddoc templates, javascript, and css. DocFile.java - instead of FileReader, use InputStreamReader with UTF-8 encoding. ClearPage.java - add UTF-8 output encoding to FileOutputStreamWriter. Note: this change also up-integrates gerrit 2146 (smain).
BUG=1910893

Automated import of CL 150370
2009-07-24 18:39:20 -07:00
Android (Google) Code Review
eaf299f8b4 Merge change 8339 into donut
* changes:
  Merge commit 'e6be85f5eb1438636e436be4162dd8f54a1192bf' into manualmergeDroiddoc
2009-07-24 17:40:17 -07:00
Android (Google) Code Review
e85be87ee6 Merge change 3175 into donut
* changes:
  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-07-24 16:04:56 -07:00
Android Git Automerger
358a48e12a merge 73ef8257ce from donut (resolved conflicts) 2009-07-24 12:46:51 -07:00
Android (Google) Code Review
ef9f4ea0b8 am 4d7c4348: Merge change 8295 into donut
Merge commit '4d7c4348077b0f1a713ebffe59b458a5d95fba11'

* commit '4d7c4348077b0f1a713ebffe59b458a5d95fba11':
  applypatch changes for patching recovery image
2009-07-23 23:58:04 -07:00
Android (Google) Code Review
186f7a049f am 076f0bfb: Merge change 8313 into donut
Merge commit '076f0bfbab74f725f2c643b8639efe2bb05a0f61'

* commit '076f0bfbab74f725f2c643b8639efe2bb05a0f61':
  Fixed PDK links that point to the Creative Commons License
2009-07-23 16:25:46 -07:00
Doug Zongker
73ef8257ce use a binary patch to install recovery from system
Instead of storing the whole recovery image in system in order to
flash it on first boot, we instead use an imgdiff patch from the boot
image to create the recovery image.  This is substantially smaller
since it effectively only stores the recovery binary and UI images
(the kernel and the init binary are identical to that of the boot
image).

This change modifies the OTA-building script to create and install
these patches, and changes the calculation of the system image size in
the Makefile to reflect the new scheme.
2009-07-23 15:12:53 -07:00
Android (Google) Code Review
4d7c434807 Merge change 8295 into donut
* changes:
  applypatch changes for patching recovery image
2009-07-23 12:38:03 -07:00
Jesse Wilson
cfcbcf2856 Merge commit '289d80ee' into manualmerge2
Conflicts:
	tools/droiddoc/src/DroidDoc.java
	tools/droiddoc/test/stubs/func.sh
2009-07-23 11:10:14 -07:00
Gaurav Mathur
eea8234481 Fixed PDK links that point to the Creative Commons License 2009-07-22 20:27:12 -07:00
Doug Zongker
6c770467fb applypatch changes for patching recovery image
Make some changes needed to applypatch in order to store the recovery
image in the system partition as a binary patch relative to the boot
image:

  - make applypatch use shared libraries, so it's smaller.  It will
    need to be on the main system so it can install the recovery
    image.  Make an applypatch_static binary for use in recovery
    packages (still needed for updating cupcake devices to donut).

  - output the results of patching to an in-memory buffer and write
    that to the partition; there's no convenient /tmp for us to us.
    (This should be basically a no-op in recovery, since /tmp is a
    ramdisk anyway.)
2009-07-22 19:15:59 -07:00
Dirk Dougherty
f267149426 Merge commit 'e6be85f5eb1438636e436be4162dd8f54a1192bf' into manualmergeDroiddoc 2009-07-22 19:01:20 -07:00
Doug Zongker
0493e240fd make bootloader requirements optional
Interpret a "*" in the "require version-bootloader" line as "don't
require any specific bootloader".  Sholes OTAs include the bootloader
and the main system in the same package.
2009-07-22 09:28:25 -07:00
Jesse Wilson
289d80eee4 Adding version information to DroidDoc. Rather than pulling the version from
@since tags in the code, it's pulled from the API XML files also used by
apicheck.

The code now reads the apicheck XML, and applies it's versions to the DroidDoc
class models. The models output the version to HDF, and that's picked up by
the CS templates.

The clearsilver templates will be changed to be pretty in a follow up change.

Conflicts:
	tools/droiddoc/src/DroidDoc.java
2009-07-21 18:09:39 -07:00
Android (Google) Code Review
ef5e7dc4dd am 70a76816: Merge change 7944 into donut
Merge commit '70a76816e5268e345a2a52d12c7c0140e9645015'

* commit '70a76816e5268e345a2a52d12c7c0140e9645015':
  better patching for zip files
2009-07-21 14:38:39 -07:00
Android (Google) Code Review
70a76816e5 Merge change 7944 into donut
* changes:
  better patching for zip files
2009-07-21 12:07:35 -07:00
Jesse Wilson
5e0dd414ff Adding version information to DroidDoc. Rather than pulling the version from
@since tags in the code, it's pulled from the API XML files also used by
apicheck.

The code now reads the apicheck XML, and applies it's versions to the DroidDoc
class models. The models output the version to HDF, and that's picked up by
the CS templates.

The clearsilver templates will be changed to be pretty in a follow up change.
2009-07-21 11:06:25 -07:00
Doug Zongker
6b2bb3d96d better patching for zip files
Adds a zip mode ("-z") to imgdiff to construct efficient patches for
zip files (including jars and apks).  We identify the regions within
the zip file containing deflated data, and when a corresponding file
can be found in the source zip, a patch is generated for the
uncompressed version of the data.

The GZIP chunk type is replaced with a DEFLATE chunk type that handles
a raw deflated data stream.  This new DEFLATE chunk can be used for
both gzipped pieces (as found within boot and recovery images) and zip
files (apks, etc.)  The gzip header and footer are handled by NORMAL
chunks on either side of the main DEFLATE chunks.  (Typically these
tiny NORMAL chunks will get merged with adjacent chunks, so the number
of output chunks is unaffected.)

Add a test script that tests the generate-apply cycle on all the zips
and images within a pair of full OTA packages.
2009-07-20 14:45:29 -07:00
Joe Onorato
b7c41aaad0 Add a separate version of the docs build that only does the stubs.
That way we don't have to wait for clearsilver to write the thousands
of html files during every build.

(This is the build change, there is also a frameworks/base change)
2009-07-20 11:57:59 -04:00
Android (Google) Code Review
4d221e8e28 am ccf9c1da: Merge change 7479 into donut
Merge commit 'ccf9c1da8612d2d9bfb13efb97ceed29c15c83b4'

* commit 'ccf9c1da8612d2d9bfb13efb97ceed29c15c83b4':
  handle identical gzip chunks better
2009-07-16 17:54:18 -07:00
Android (Google) Code Review
ccf9c1da86 Merge change 7479 into donut
* changes:
  handle identical gzip chunks better
2009-07-16 13:30:16 -07:00
Doug Zongker
79e4a0b568 am a237874c: fix the modtime of files in the apk when signing
Merge commit 'a237874ccf49e92b93faea51f65c2ff37ea19ac7'

* commit 'a237874ccf49e92b93faea51f65c2ff37ea19ac7':
  fix the modtime of files in the apk when signing
2009-07-15 18:15:19 -07:00
Doug Zongker
3b72436dbe handle identical gzip chunks better
Improve the speed of incremental OTA install by treating unchanging
gzip chunks as normal chunks, avoiding a decompress/recompress cycle.
This reduces the time needed to apply a patch to a boot image where
the kernel has not changed from ~30 seconds to ~2 seconds, on an opal.
2009-07-15 17:54:30 -07:00
Doug Zongker
a237874ccf fix the modtime of files in the apk when signing
SignApk fixes the timestamp of the signature files it adds.  Use that
same timestamp for all the files, so that the modtime doesn't vary
from build to build.  (Incremental OTAs currently spend significant
time rewriting every .apk to do nothing but patch in timestamp
changes.)
2009-07-15 15:43:39 -07:00
Doug Zongker
b606925ef9 am 03061474: in auto mode, generate both edify and amend scripts for full OTAs
Merge commit '030614740c1a22e51c6513058852f9ab368fdf5d'

* commit '030614740c1a22e51c6513058852f9ab368fdf5d':
  in auto mode, generate both edify and amend scripts for full OTAs
2009-07-14 12:54:56 -07:00
Doug Zongker
030614740c in auto mode, generate both edify and amend scripts for full OTAs
Generate packages that can be installed by either amend or edify, so
we can remove amend support from donut.
2009-07-14 12:40:26 -07:00
Marco Nelissen
594375db5f Python script to parse a build log and present the warnings in html 2009-07-14 12:22:29 -07:00
Jean-Baptiste Queru
04edc95a32 Merge branch 'master' of git://android.git.kernel.org/platform/build into merge_korg_master
Conflicts:
	core/apicheck_msg_current.txt
2009-07-06 12:27:36 -07:00
Doug Zongker
8b3f93a7d5 am 6e9c1a6d: remove some accidentally-submitted debug logging
Merge commit '6e9c1a6dd0042e123941e59ad5da6fc569093fbb'

* commit '6e9c1a6dd0042e123941e59ad5da6fc569093fbb':
  remove some accidentally-submitted debug logging
2009-07-02 15:24:24 -07:00
Android (Google) Code Review
d77ccd3f1b am a2bd9af9: Merge change 4759 into donut
Merge commit 'a2bd9af94757e73a4ff4c1fe8c98b4174b008b62'

* commit 'a2bd9af94757e73a4ff4c1fe8c98b4174b008b62':
  Removing top tabs from PDK navigation because right now we only have one section.
2009-07-01 22:43:50 -07:00
Doug Zongker
acb8bda3bb am 0f3298a4: delete source files not in target
Merge commit '0f3298a497e32f6c2325a0071124a62d031fae6f'

* commit '0f3298a497e32f6c2325a0071124a62d031fae6f':
  delete source files not in target
2009-07-01 16:01:52 -07:00
Doug Zongker
6e9c1a6dd0 remove some accidentally-submitted debug logging 2009-07-01 14:18:59 -07:00
Android (Google) Code Review
a2bd9af947 Merge change 4759 into donut
* changes:
  	Removing top tabs from PDK navigation because right now we only have one section.
2009-06-30 13:53:47 -07:00
Doug Zongker
0f3298a497 delete source files not in target
Incremental OTAs were not removing files from the old build that don't
exist in the new build.  Fix.
2009-06-30 08:16:58 -07:00
Doug Zongker
8e2f2b9b20 ignore missing/bad device-specific releasetools modules
If we fail to load the device-specific releasetools module (ie, if -s
is specified but the file is missing), issue an error message but
continue without any device-specific code.
2009-06-24 14:34:57 -07:00
Doug Zongker
a4ebcbb929 resolved conflicts for merge of e1c31bac to master 2009-06-24 13:58:30 -07:00
Dirk Dougherty
e6be85f5eb AI 150083: Minor updates to the ndk docs based on approved messaging.
BUG=1790234

Automated import of CL 150083
2009-06-24 11:01:03 -07:00
Doug Zongker
e1c31bacae make building recovery and boot images optional
If the source target-files zip omits files needed to build the
recovery and/or boot images, leave them out instead of dying with an
error.  This lets build like "generic-userdebug" work.
2009-06-23 17:40:35 -07:00
Android (Google) Code Review
0fbd7da3cd am 55766e47: Merge change 5150 into donut
Merge commit '55766e47aaf4fe72a2b5cdd8aa60d14781c01e94'

* commit '55766e47aaf4fe72a2b5cdd8aa60d14781c01e94':
  don't fail if no required bootloaders are defined
2009-06-23 16:34:08 -07:00
Android (Google) Code Review
55766e47aa Merge change 5150 into donut
* changes:
  don't fail if no required bootloaders are defined
2009-06-23 16:32:18 -07:00
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