The Android Open Source Project
9fddf20aec
Merge commit 'remotes/goog/master' into eclair-release
2009-08-10 09:06:18 -07:00
Doug Zongker
8510a1e0d7
use *_PARTITION_SIZE instead of *_MAX_SIZE
...
Make BoardConfig.mk store the size of the partition rather than the
maximum size of the image that can be flashed there, because the
function used to do the conversion isn't available when BoardConfig.mk
is read any more.
2009-08-10 09:03:16 -07:00
Joe Onorato
3366c07e56
Tweak the product graph formatting.
2009-08-08 12:15:10 -07:00
Brian Swetland
630b7d3ffa
build: do not attempt to build recovery.img for TINY_ANDROID builds
...
Signed-off-by: Brian Swetland <swetland@google.com >
2009-08-07 18:09:44 -07:00
Joe Onorato
4820a945a5
dedup findleaves output
2009-08-07 11:19:50 -07:00
The Android Open Source Project
7fadef259d
ERC38
2009-08-07 09:27:00 -07:00
The Android Open Source Project
c08d748759
Merge commit 'remotes/goog/master' into eclair-release
2009-08-07 09:26:45 -07:00
Doug Zongker
edd731f430
am f7c8b9ad
: reenable ranlib transform for prebuilts
...
Merge commit 'f7c8b9adb4b65fafac786e77f6dd7c3411344dba'
* commit 'f7c8b9adb4b65fafac786e77f6dd7c3411344dba':
reenable ranlib transform for prebuilts
2009-08-07 09:15:21 -07:00
Doug Zongker
f7c8b9adb4
reenable ranlib transform for prebuilts
...
An extra blank line detached the ranlib commands from the rules they
were supposed to be for.
2009-08-07 08:45:49 -07:00
Doug Zongker
85416153ae
am d0a44722
: add LOCAL_PREBUILT_STRIP_COMMENTS to clear_vars.mk
...
Merge commit 'd0a44722be82319e45b6616267011d4dd17e767b'
* commit 'd0a44722be82319e45b6616267011d4dd17e767b':
add LOCAL_PREBUILT_STRIP_COMMENTS to clear_vars.mk
2009-08-06 21:56:50 -07:00
Doug Zongker
d0a44722be
add LOCAL_PREBUILT_STRIP_COMMENTS to clear_vars.mk
2009-08-06 21:52:47 -07:00
Android (Google) Code Review
80f820ca1a
am 01bf5684
: Merge change 20313 into donut
...
Merge commit '01bf5684b448623d7eb054b6d717bb77af05de33'
* commit '01bf5684b448623d7eb054b6d717bb77af05de33':
add feature to strip "# comment" lines from prebuilt files
2009-08-06 16:35:50 -07:00
Android (Google) Code Review
01bf5684b4
Merge change 20313 into donut
...
* changes:
add feature to strip "# comment" lines from prebuilt files
2009-08-06 16:33:21 -07:00
Android (Google) Code Review
3513846c0a
Merge change 20343
...
* changes:
Sort the results of findleaves.
2009-08-06 16:06:07 -07:00
Joe Onorato
d36e945e1a
Sort the results of findleaves.
...
Hopefully this will fix the seemingly random build breakages.
2009-08-06 16:05:02 -07:00
The Android Open Source Project
9d4a9846a5
DRC37B
2009-08-06 15:47:24 -07:00
Android (Google) Code Review
e9024b3ee1
Merge change 20172
...
* changes:
Add back a few libraries for backward-compability with the donut skia
2009-08-06 14:52:39 -07:00
Doug Zongker
1046d20624
add feature to strip "# comment" lines from prebuilt files
...
Change things so that when $(LOCAL_PREBUILT_STRIP_COMMENTS) is
nonempty, we copy the source file using sed to strip out all the "#
line"-style comments and blank lines, saving considerable system image
space in the case of some wifi configurations.
Bug: 2036961
2009-08-06 14:39:43 -07:00
Joe Onorato
dc1a728fb8
Rewrite findleaves.sh in python
...
This cuts the make startup time by about 30 seconds. Python is faster
than bash in this case, and also we can now supply multiple directories
to prune, and skip the .repo directory, which is, uh, big.
This is from my mac laptop:
$ time build/tools/findleaves.sh --prune="./out" . Android.mk > /dev/null
real 0m29.186s
user 0m0.550s
sys 0m5.897s
$ time build/tools/findleaves.py --prune="./out" . Android.mk > /dev/null
real 0m4.701s
user 0m0.645s
sys 0m1.294s
$ time build/tools/findleaves.py --prune="./out" --prune="./.repo" . Android.mk > /dev/null
real 0m0.176s
user 0m0.094s
sys 0m0.080s
2009-08-06 12:09:21 -07:00
The Android Open Source Project
1189ae35d5
DRC37
2009-08-06 11:28:19 -07:00
The Android Open Source Project
e4e68e9ec1
Merge commit 'remotes/goog/donut' into donut-release
2009-08-06 11:28:05 -07:00
The Android Open Source Project
bba41f0459
ERC37
2009-08-06 08:36:17 -07:00
The Android Open Source Project
1acb3b5b0c
Merge commit 'remotes/goog/master' into eclair-release
2009-08-06 08:36:03 -07:00
Jean-Baptiste Queru
97346fa88e
merge from open-source master
2009-08-06 08:09:30 -07:00
Scott Main
66a3d6dced
am 95641e97
: fix css image references for offline docs
...
Merge commit '95641e9759b74fe61ff138970ca8aa2a9f34a080'
* commit '95641e9759b74fe61ff138970ca8aa2a9f34a080':
fix css image references for offline docs
2009-08-06 02:45:17 -07:00
Scott Main
95641e9759
fix css image references for offline docs
2009-08-06 02:36:50 -07:00
Scott Main
7a09cd61de
am fa4765e0
: lighten up on "preliminary" watermark
...
Merge commit 'fa4765e0dc46af4d131fc9e914e114b4f59d4a80'
* commit 'fa4765e0dc46af4d131fc9e914e114b4f59d4a80':
lighten up on "preliminary" watermark
2009-08-05 23:43:15 -07:00
Scott Main
fa4765e0dc
lighten up on "preliminary" watermark
2009-08-05 23:39:08 -07:00
Android (Google) Code Review
af8a3139ca
am 11be8c3e
: Merge change 20232 into donut
...
Merge commit '11be8c3e5f2fd950b14bd17af9b67c25a15970f8'
* commit '11be8c3e5f2fd950b14bd17af9b67c25a15970f8':
Fix broken url in offline preview docs
2009-08-05 22:11:37 -07:00
Android (Google) Code Review
11be8c3e5f
Merge change 20232 into donut
...
* changes:
Fix broken url in offline preview docs
2009-08-05 22:09:17 -07:00
Android (Google) Code Review
cce4bb5c45
am 89e555f3
: Merge change 20222 into donut
...
Merge commit '89e555f3c5ccb44f15995d5d59854c4e0f9450fa'
* commit '89e555f3c5ccb44f15995d5d59854c4e0f9450fa':
Add support for preview SDK handling in doc templates.
2009-08-05 20:46:45 -07:00
Android (Google) Code Review
89e555f3c5
Merge change 20222 into donut
...
* changes:
Add support for preview SDK handling in doc templates.
2009-08-05 20:44:28 -07:00
Dirk Dougherty
71904aa403
Remove extraneous quotation mark in template file
...
Bug: 2031559
2009-08-05 20:35:31 -07:00
Dirk Dougherty
0931432790
Fix broken url in offline preview docs
...
Bug: 2031159
2009-08-05 20:19:16 -07:00
Dirk Dougherty
82a28818f5
Add support for preview SDK handling in doc templates.
...
Bug: 2031559
2009-08-05 19:09:16 -07:00
Jean-Baptiste Queru
0082bbfb7d
Add back a few libraries for backward-compability with the donut skia
2009-08-05 15:17:42 -07:00
Jean-Baptiste Queru
fe77558c21
Add libacc.so to prelink map for forward-compatibility
2009-08-05 13:15:17 -07:00
Android (Google) Code Review
007294e261
am 28ab3b12
: Merge change 8917 into donut
...
Merge commit '28ab3b12d38f1e613d92fcee251ef064665dd8c9'
* commit '28ab3b12d38f1e613d92fcee251ef064665dd8c9':
implement api level toggling
2009-08-05 12:01:29 -07:00
Android (Google) Code Review
28ab3b12d3
Merge change 8917 into donut
...
* changes:
implement api level toggling and rename navtree.js to android-developer-reference.js for all reference related scripts TODO: shading for hidden classes in the treeview navigation... these aren't dynamic yet.
2009-08-05 11:55:54 -07:00
Scott Main
25fda19689
implement api level toggling
...
and rename navtree.js to android-developer-reference.js for all reference related scripts
TODO: shading for hidden classes in the treeview navigation... these aren't dynamic yet.
2009-08-05 10:43:55 -07:00
The Android Open Source Project
685b90da0c
ERC36
2009-08-05 08:36:03 -07:00
The Android Open Source Project
384cd68799
Merge commit 'remotes/goog/master' into eclair-release
2009-08-05 08:35:50 -07:00
Android (Google) Code Review
8f83fce7f1
Merge change 20007
...
* changes:
Add Bluetooth app to generic product file.
2009-08-04 17:25:21 -07:00
Doug Zongker
1218b09012
am 1aca962a
: allow for malformed imagesizes.txt
...
Merge commit '1aca962af153d6437937e3e687740d2c1c12657d'
* commit '1aca962af153d6437937e3e687740d2c1c12657d':
allow for malformed imagesizes.txt
2009-08-04 15:14:01 -07:00
Doug Zongker
1aca962af1
allow for malformed imagesizes.txt
...
Some builds have blank values for max image sizes; ignore these lines.
2009-08-04 15:09:27 -07:00
Android (Google) Code Review
7d7630cca8
am b6153173
: Merge change 9605 into donut
...
Merge commit 'b6153173952895441e55d0ff6be332bb7c7605e2'
* commit 'b6153173952895441e55d0ff6be332bb7c7605e2':
use the max image sizes from the target files zip
2009-08-04 14:16:38 -07:00
Android (Google) Code Review
b615317395
Merge change 9605 into donut
...
* changes:
use the max image sizes from the target files zip
2009-08-04 14:11:15 -07:00
Jaikumar Ganesh
4d5fdba032
Add Bluetooth app to generic product file.
2009-08-04 14:06:45 -07:00
Jean-Baptiste Queru
0f64a55381
merge from open-source master
2009-08-04 09:01:27 -07:00
The Android Open Source Project
07514706ec
ERC35
2009-08-04 08:38:53 -07:00