Commit graph

752 commits

Author SHA1 Message Date
The Android Open Source Project
2a582caba1 am 39a6a644: merge from open-source master
Merge commit '39a6a64471b28032d2037d9472d58dc0a77ef313'

* commit '39a6a64471b28032d2037d9472d58dc0a77ef313':
  Create systemtarball either with bz2 or gz
2010-07-09 15:00:57 -07:00
The Android Open Source Project
39a6a64471 merge from open-source master
Change-Id: Ic005b0772e144fc986fd3bacc67d5840b16efb81
2010-07-09 14:57:26 -07:00
Scott Main
ec06d42152 am b0b2146b: am 38d2e1da: am b66a5c05: docs: modify redirect link text
Merge commit 'b0b2146bb7017c8f1b91ff4a4d05ed64a2b3a20f'

* commit 'b0b2146bb7017c8f1b91ff4a4d05ed64a2b3a20f':
  docs: modify redirect link text
2010-07-08 19:10:07 -07:00
Bruce Beare
69ef5ce4f0 Create systemtarball either with bz2 or gz
Change-Id: I64e93872942e8dcad4a894a906be7912bb6da308
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-08 16:36:05 -07:00
Scott Main
38d2e1dacd am b66a5c05: docs: modify redirect link text
Merge commit 'b66a5c0574e14b838d9dc2497540ffc6cb73dc4f' into gingerbread

* commit 'b66a5c0574e14b838d9dc2497540ffc6cb73dc4f':
  docs: modify redirect link text
2010-07-08 11:42:13 -07:00
Scott Main
b66a5c0574 docs: modify redirect link text
Change-Id: Ieb26c4278958624b9c7aa8795cd7a8cab87fafec
2010-07-08 11:34:45 -07:00
Doug Zongker
e8d9c4d3c1 Merge "generate pseudofilenames for EMMC partitions" 2010-07-07 14:35:30 -07:00
Doug Zongker
67369983cf generate pseudofilenames for EMMC partitions
Change-Id: Ibe77f4338fed5745c7c650270dcef24988ebfdda
2010-07-07 14:34:59 -07:00
David Turner
c8a20b72ed am e0e7bce4: am 2b8ba2fa: Merge "Clean up warnings in soslim" into gingerbread
Merge commit 'e0e7bce46bbb9b6a057ed9e57700dbeb3e45d8c1'

* commit 'e0e7bce46bbb9b6a057ed9e57700dbeb3e45d8c1':
  Clean up warnings in soslim
2010-07-07 14:18:39 -07:00
Doug Zongker
b4c7d32cba support for ext4/EMMC in target_files and OTA generation
Move the image sizes into a more generic key-value file.  Make them
optional.  Add additional key/value pairs describing what kind of
filesystem the device uses.  Pass new fs-type-related arguments in
edify scripts when mounting and reformatting partitions.

Don't include all the init.*.rc files from the regular system in
recovery -- they aren't needed, and break recovery on some devices.

Change-Id: I40e49e65f0d76f735259e4b4fef882322cd739da
2010-07-01 15:30:11 -07:00
Kenny Root
afb36e7e86 Clean up warnings in soslim
Change-Id: I497745fe9701876272fdbe7a946622a40efffdd5
2010-06-26 22:43:55 -07:00
Scott Main
45e4685a7e am 7e5592c7: am 62c65665: am 81b68ad9: Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo
Merge commit '7e5592c703964c35a177c8f4514c4a9eb2135344'

* commit '7e5592c703964c35a177c8f4514c4a9eb2135344':
  docs: show the download message on the SDK homepage because we no longer
2010-06-24 18:16:36 -07:00
Scott Main
62c6566558 am 81b68ad9: Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo
Merge commit '81b68ad95d6a8ecb8a44ad453d336dff3a059488' into gingerbread

* commit '81b68ad95d6a8ecb8a44ad453d336dff3a059488':
  docs: show the download message on the SDK homepage because we no longer
2010-06-24 18:12:45 -07:00
Scott Main
fe75781ee9 am 81b68ad9: Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo
Merge commit '81b68ad95d6a8ecb8a44ad453d336dff3a059488' into froyo-plus-aosp

* commit '81b68ad95d6a8ecb8a44ad453d336dff3a059488':
  docs: show the download message on the SDK homepage because we no longer
2010-06-24 18:11:52 -07:00
Scott Main
81b68ad95d Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo 2010-06-24 18:10:32 -07:00
Scott Main
a1b358a22c docs: show the download message on the SDK homepage because we no longer
need to walk through the TOS

Change-Id: I46f7e7284792b2bea77cf2a88b195e8117b4e4d2
2010-06-24 17:57:50 -07:00
Doug Zongker
5a3ba25fbf am c58e4f42: am 06acf91f: am 3b85269c: include build timestamp in OTA metadata
Merge commit 'c58e4f42ec27f81cd72d3e5872fd65e13a8e4213'

* commit 'c58e4f42ec27f81cd72d3e5872fd65e13a8e4213':
  include build timestamp in OTA metadata
2010-06-23 10:18:21 -07:00
Doug Zongker
bf77b69422 am 3b85269c: include build timestamp in OTA metadata
Merge commit '3b85269cfe10ec15e9b544dd6964b8c9f5f761f9' into froyo-plus-aosp

* commit '3b85269cfe10ec15e9b544dd6964b8c9f5f761f9':
  include build timestamp in OTA metadata
2010-06-21 15:42:14 -07:00
Doug Zongker
06acf91f65 am 3b85269c: include build timestamp in OTA metadata
Merge commit '3b85269cfe10ec15e9b544dd6964b8c9f5f761f9' into gingerbread

* commit '3b85269cfe10ec15e9b544dd6964b8c9f5f761f9':
  include build timestamp in OTA metadata
2010-06-21 15:40:21 -07:00
Doug Zongker
3b85269cfe include build timestamp in OTA metadata
Change-Id: I44292c6346db3356dfafbd044027e37a9b467cfe
2010-06-21 15:31:39 -07:00
Ying Wang
933abf15bc extfs support for img_from_target_files
Change-Id: Ie3df70426066bff467792b8528bc4528eb6afe15
2010-06-17 11:25:27 -07:00
Jing Yu
96c286daf1 am eed926c8: am ada132a8: Switch toolchain from gcc-4.4.0 to gcc-4.4.3
Merge commit 'eed926c889382073c74de43a0d15e37462623cf3'

* commit 'eed926c889382073c74de43a0d15e37462623cf3':
  Switch toolchain from gcc-4.4.0 to gcc-4.4.3
2010-06-16 20:47:01 -07:00
Jing Yu
ada132a80b Switch toolchain from gcc-4.4.0 to gcc-4.4.3
gcc-4.4.3 toolchain is based on fsf GCC-4.4.3 with numerous patches.
It reduces 3.65% code size than the prebuilt gcc-4.4.0 toolchain,
and improves 3.4% performance on Android benchmarks.

The toolchain uses gold as default linker. With gold, the toolchain
further reduces 1MB system image.

Change-Id: I55eb4df185f2932e71498fcc28428e4d1b175393
2010-06-16 20:17:19 -07:00
Ying Wang
f9cd36a0f7 resolved conflicts for merge of 56791ebe to master
Change-Id: I7463636796f1262fd92af839102dc58d562259f7
2010-06-15 15:43:13 -07:00
Ying Wang
c01cf7b9e6 resolved conflicts for merge of 2b8d2383 to gingerbread
Change-Id: I9174f843f0fde139a7d582f45b027f3face5c981
2010-06-15 15:11:51 -07:00
Joe Onorato
8aeb7cc461 am 2b8d2383: Merge changes I02214abd,I79e6f60e into froyo
Merge commit '2b8d2383043a2b16e53538f9ebf123bfffd27ba1' into froyo-plus-aosp

* commit '2b8d2383043a2b16e53538f9ebf123bfffd27ba1':
  Add a tapas command.
  Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
2010-06-15 14:24:42 -07:00
Joe Onorato
da12daf15f Add a tapas command.
(Actually there was a tapas command that just called choosecombo).

The new better tapas command is for building unbundled apps.  Run
it with one or more modules to build and optionally a build variant.

tapas [variant] App1 App2 ...

If you don't supply a build variant, it defaults to eng.

Change-Id: I02214abd0b5ad02e364fcb024e10cf6ad17a9e68
2010-06-10 18:38:37 -07:00
Joe Onorato
16fa4b290e Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
Change-Id: I79e6f60e009dad3a48709962347441e4ca0c337a
2010-06-10 18:38:25 -07:00
Ying Wang
9a5418bba5 resolved conflicts for merge of f83fd362 to master
Change-Id: I527111ec1461e258b4911a2aaa90100eceacea80
2010-06-09 11:48:48 -07:00
Ying Wang
ab251d9c80 am 7a794289: Merge "Unbundle the build system." into froyo
Merge commit '7a7942899eedde3b946768a155fac3d70af5c9c3' into froyo-plus-aosp

* commit '7a7942899eedde3b946768a155fac3d70af5c9c3':
  Unbundle the build system.
2010-06-09 11:33:36 -07:00
Ying Wang
66356cef22 am 7a794289: Merge "Unbundle the build system." into froyo
Merge commit '7a7942899eedde3b946768a155fac3d70af5c9c3' into kraken

* commit '7a7942899eedde3b946768a155fac3d70af5c9c3':
  Unbundle the build system.
2010-06-09 11:33:32 -07:00
Ying Wang
0f6f4ca54e Unbundle the build system.
Change-Id: I88912d876c3972212e8871b3e5b3b8b6d2da34d0
2010-06-09 10:26:26 -07:00
Roman Nurik
78eff9f5bd Revamp resources listing, part 2 (droiddoc).
- Fix docs navigation JS to correctly handle pages with query strings (i.e. browser.html?tag=article)
- Add resource browser CSS and JS to complement browser.jd in frameworks/base.
- Add microtemplate.js library for ease HTML templates in JS.

Change-Id: I518eeb5fc5a05dc6775eb3870eb88ebb0fc7b72c
2010-06-04 10:51:02 -07:00
Elliott Hughes
5479d77e32 Work around a bug with <T> ... <? extends T[]> methods.
Java 6 adds an Arrays.copyOf method that confuses droiddoc into producing
a class "Array" in the anonymous package. I've raised a bug for someone
to work out why and fix this properly (after spending a fairly fruitless
afternoon on it). This work-around filters that out the cruft. I've checked
the generated current.xml file and the generated java.util.Arrays stubs,
and they're both correct. The extent of droiddoc's confusion appears to be
limited to inventing a non-existent class. (My guess is that it doesn't
realize that the element type of the array is a type parameter, not a type,
and it ends up using a default type name of "Array" from somewhere [javadoc
itself?].)

Bug: 2715505
Change-Id: I2ad7ecc819e320a1d209720b3dfbef45bbd89877
2010-05-26 11:41:33 -07:00
Scott Main
ab90d31c2b am 168cd06c: am 9589164c: am b7ebe01f: am ca671ab7: Revert "Doc change: Update froyo mark for home" 2010-05-25 12:36:20 -07:00
Scott Main
b7ebe01f60 am ca671ab7: Revert "Doc change: Update froyo mark for home"
Merge commit 'ca671ab7a661625e021f2145e2d01f39d542fb28' into froyo-plus-aosp

* commit 'ca671ab7a661625e021f2145e2d01f39d542fb28':
  Revert "Doc change: Update froyo mark for home"
2010-05-25 12:31:29 -07:00
Scott Main
ca671ab7a6 Revert "Doc change: Update froyo mark for home"
This reverts commit 9d1d6441d9.
2010-05-25 12:22:29 -07:00
Dirk Dougherty
b510ff8163 am 4856af65: am 90fa8093: am d44754e0: am e9b01eb4: Doc change: add tv assets for carousel. 2010-05-20 00:20:56 -07:00
Dirk Dougherty
d44754e0e5 am e9b01eb4: Doc change: add tv assets for carousel.
Merge commit 'e9b01eb46d461e7cfecb365acf046e2ad56c05a0' into froyo-plus-aosp

* commit 'e9b01eb46d461e7cfecb365acf046e2ad56c05a0':
  Doc change: add tv assets for carousel.
2010-05-20 00:15:38 -07:00
Dirk Dougherty
e9b01eb46d Doc change: add tv assets for carousel.
Change-Id: I357509c83e64ceb898b2069482ff1d0f3b3337cc
2010-05-19 19:42:12 -07:00
Dirk Dougherty
4ad0ca603b am 4150816f: am 5caaeadb: am e5cfdbfb: am 9d1d6441: Doc change: Update froyo mark for home 2010-05-19 19:02:26 -07:00
Dirk Dougherty
e5cfdbfb17 am 9d1d6441: Doc change: Update froyo mark for home
Merge commit '9d1d6441d97eeea80c70c549646d7c177936e148' into froyo-plus-aosp

* commit '9d1d6441d97eeea80c70c549646d7c177936e148':
  Doc change: Update froyo mark for home
2010-05-19 18:58:05 -07:00
Dirk Dougherty
9d1d6441d9 Doc change: Update froyo mark for home
Change-Id: Idacecd87faca95cd258436ab842c03102e5fc6c6
2010-05-19 18:25:33 -07:00
Dan Morrill
899001748e Changing the footer per legal guidance.
Change-Id: Ia20e3b1a69265e1ffe0b50993be12dcd96afa05f
2010-05-18 08:10:14 -07:00
The Android Open Source Project
386f70a2b0 am ce88086c: am 105a934f: am 9514fca5: merge from open-source master 2010-05-14 13:47:12 -07:00
The Android Open Source Project
9514fca5c7 merge from open-source master
Change-Id: Ia4cb27645bfd757fb75273ff5a6cbf3af57b3a03
2010-05-14 13:38:55 -07:00
Jean-Baptiste Queru
be6b55ccc2 Merge "Support absolute path, in OUT_DIR" 2010-05-14 12:17:43 -07:00
Scott Main
0f28a15755 am 68ed2f54: am 758c0f34: am de14ee57: am 3494d9b3: docs: lighten the "new" red. softens the effect and makes it more legible when selected 2010-05-10 10:30:58 -07:00
Scott Main
de14ee5701 am 3494d9b3: docs: lighten the "new" red. softens the effect and makes it more legible when selected
Merge commit '3494d9b3deeb9967be247bf31cdaa3fd30fb4207' into froyo-plus-aosp

* commit '3494d9b3deeb9967be247bf31cdaa3fd30fb4207':
  docs: lighten the "new" red. softens the effect and makes it more legible when selected
2010-05-10 10:26:20 -07:00
Scott Main
3494d9b3de docs: lighten the "new" red. softens the effect and makes it more legible when selected
Change-Id: I0f1f70c281cc0a6f3621c898b04d3845924f6e35
2010-05-10 10:01:13 -07:00