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
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
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
d0a44722be
add LOCAL_PREBUILT_STRIP_COMMENTS to clear_vars.mk
2009-08-06 21:52:47 -07:00
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
01bf5684b4
Merge change 20313 into donut
...
* changes:
add feature to strip "# comment" lines from prebuilt files
2009-08-06 16:33:21 -07:00
3513846c0a
Merge change 20343
...
* changes:
Sort the results of findleaves.
2009-08-06 16:06:07 -07:00
d36e945e1a
Sort the results of findleaves.
...
Hopefully this will fix the seemingly random build breakages.
2009-08-06 16:05:02 -07:00
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
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
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
97346fa88e
merge from open-source master
2009-08-06 08:09:30 -07:00
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
95641e9759
fix css image references for offline docs
2009-08-06 02:36:50 -07:00
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
fa4765e0dc
lighten up on "preliminary" watermark
2009-08-05 23:39:08 -07:00
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
11be8c3e5f
Merge change 20232 into donut
...
* changes:
Fix broken url in offline preview docs
2009-08-05 22:09:17 -07:00
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
89e555f3c5
Merge change 20222 into donut
...
* changes:
Add support for preview SDK handling in doc templates.
2009-08-05 20:44:28 -07:00
0931432790
Fix broken url in offline preview docs
...
Bug: 2031159
2009-08-05 20:19:16 -07:00
82a28818f5
Add support for preview SDK handling in doc templates.
...
Bug: 2031559
2009-08-05 19:09:16 -07:00
0082bbfb7d
Add back a few libraries for backward-compability with the donut skia
2009-08-05 15:17:42 -07:00
fe77558c21
Add libacc.so to prelink map for forward-compatibility
2009-08-05 13:15:17 -07:00
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
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
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
8f83fce7f1
Merge change 20007
...
* changes:
Add Bluetooth app to generic product file.
2009-08-04 17:25:21 -07:00
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
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
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
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
4d5fdba032
Add Bluetooth app to generic product file.
2009-08-04 14:06:45 -07:00
0f64a55381
merge from open-source master
2009-08-04 09:01:27 -07:00
fdd8e69c42
use the max image sizes from the target files zip
...
For some time now the build system has included all the max image
sizes in a file in the META directory. Use these instead of needing
to parse the BoardConfig.mk file for the device at the time of
building an image or OTA package.
2009-08-03 17:27:48 -07:00
e8cb956b8a
am 828bbfb1: in amend, remove symlink targets before creating them
...
Merge commit '828bbfb18838f04b93ffbed0d7d3b597beaa534c'
* commit '828bbfb18838f04b93ffbed0d7d3b597beaa534c':
in amend, remove symlink targets before creating them
2009-08-03 16:55:57 -07:00
828bbfb188
in amend, remove symlink targets before creating them
...
amend's symlink command isn't idempotent, so if you restart after the
symlinks have been completed then the second installation attempt will
fail. Work around this by deleting all symlink targets before
creating symlinks.
Bug: 2020011
2009-08-03 14:11:09 -07:00
123f82cb0b
merge from donut
2009-08-03 07:50:30 -07:00
c97ea27f86
Merge change 9346
...
* changes:
Update warn.py with the latest warnings that popped up in the build.
2009-07-31 09:43:24 -07:00
5236fbde30
Update warn.py with the latest warnings that popped up in the build.
2009-07-31 09:02:11 -07:00
67dc3d9a99
oops, missed one
2009-07-30 16:53:26 -07:00
d51042522a
Needed for incremental builds after MD2 removal
2009-07-30 16:23:04 -07:00
1de66889ec
Don't check build tools versions (including javac) every time make is run.
...
This trims off another 1/3 of a second from incremental build times.
VERSION_CHECK_SEQUENCE_NUMBER can be incremented to force a check.
2009-07-30 11:54:27 -07:00
ead9646f1f
Don't run findleaves.sh if we're doing ONE_SHOT_MAKEFILE.
...
This cuts the minimum mmm time from 17 seconds to 5 seconds on my mac pro.
2009-07-30 11:20:04 -07:00
2a5d4d81b2
Add cproj function to envsetup.sh that finds an Android.mk and goes to its directory.
2009-07-30 10:24:28 -07:00
1951d0eed9
am 7ebafd5a: Merge change 9009 into donut
...
Merge commit '7ebafd5aa03e9d84696be0448f9d248e8f90e16c'
* commit '7ebafd5aa03e9d84696be0448f9d248e8f90e16c':
Reapply modifications from 3175 to fix display of navTree in doc output.
2009-07-30 06:56:59 -07:00
e7faad965f
am 951f3d89: CTS: Add telephony and webkit test cases to CTS makefile
...
Merge commit '951f3d89fb8c61264a20f9e44b7882e6f562e1d3'
* commit '951f3d89fb8c61264a20f9e44b7882e6f562e1d3':
CTS: Add telephony and webkit test cases to CTS makefile
2009-07-30 06:56:47 -07:00
cca2cdf1ae
am 981bafb1: AI 150131: Remove English/Chinese IME from OpenWnn.
...
Merge commit '981bafb11bf73806f78676d7a1bdc98e3c92bd16'
* commit '981bafb11bf73806f78676d7a1bdc98e3c92bd16':
AI 150131: Remove English/Chinese IME from OpenWnn.
2009-07-30 06:56:45 -07:00
3a37cdf3a2
am 239637ea: (-s ours) findleaves.sh: Properly fix arguments.
...
Merge commit '239637eac86c8f4f92384891a8f99085039a5778'
* commit '239637eac86c8f4f92384891a8f99085039a5778':
findleaves.sh: Properly fix arguments.
2009-07-29 16:48:32 -07:00
a86afb626f
am c16c0a41: Merge change 8942 into donut
...
Merge commit 'c16c0a41f58458b21a4ee5f34a2bcdaa46d156af'
* commit 'c16c0a41f58458b21a4ee5f34a2bcdaa46d156af':
Add CTS permission2 test package to cts.
2009-07-29 16:44:58 -07:00
Doug Zongker