Phil Dubach
dd6c1e11c5
am 7c463e4b
: Merge change 21778 into donut
...
Merge commit '7c463e4b0565f752bc06feb98962ab1536937aa1' into eclair
* commit '7c463e4b0565f752bc06feb98962ab1536937aa1':
CTS: Enable Python description/plan generator
2009-08-22 07:43:37 -07:00
Phil Dubach
5e3ab04d97
CTS: Enable Python description/plan generator
...
This enables the new description/plan generator added in change
21366.
2009-08-19 17:03:21 -07:00
Android (Google) Code Review
a3f7c20f90
Merge change 21912 into eclair
...
* changes:
Bump platform version to 4.
2009-08-19 14:46:27 -07:00
Raphael
28fcfdd7dd
Fix broken server Windows SDK build.
...
I removed these lines because for some reason building under Windows
fails for me when they are present. However the build server breaks
so I'll rolling them back and I'll try to understand that later.
2009-08-19 14:06:33 -07:00
Raphael
f6ff4c5acf
Windows: Fix platform build.
2009-08-19 11:32:15 -07:00
Dianne Hackborn
e34fdc0113
Bump platform version to 4.
...
Not sure why this didn't get integrated from Donut.
2009-08-19 11:00:21 -07:00
Android (Google) Code Review
9af298ec82
Merge change 21127
...
* changes:
Remove 'ctor-dtor-privacy' warning, as it's not very usefull.
2009-08-13 12:03:57 -07:00
Marco Nelissen
7f0a18f771
Remove 'ctor-dtor-privacy' warning, as it's not very usefull.
2009-08-13 11:13:21 -07:00
Sriram Raman
fab87998b5
Fix the platform version (1.6 now) and sdk version (4)
2009-08-12 16:02:12 -07:00
Android (Google) Code Review
5b5f82b635
Merge change 21000 into donut
...
* changes:
Update the platform-version-codename
2009-08-12 15:47:22 -07:00
Sriram Raman
20572dd352
Update the platform-version-codename
2009-08-12 15:22:34 -07:00
Dianne Hackborn
a37bdef67a
am 6929fb57
: Merge change 20880 into donut
...
Merge commit '6929fb57a5afb90606feb8c35c8c2cda170adfe4'
* commit '6929fb57a5afb90606feb8c35c8c2cda170adfe4':
Fix issue #2048267 : Run zipalign on all prebuilts
2009-08-12 12:05:27 -07:00
Raphael
cac4dccb0a
am 31a8ac22
: BUG 1993354 : Add zipalign to Windows SDK
...
Merge commit '31a8ac22585b2a8263892487bd38b64783402e06'
* commit '31a8ac22585b2a8263892487bd38b64783402e06':
BUG 1993354 : Add zipalign to Windows SDK
2009-08-12 12:04:53 -07:00
Android (Google) Code Review
6929fb57a5
Merge change 20880 into donut
...
* changes:
Fix issue #2048267 : Run zipalign on all prebuilts
2009-08-11 19:56:57 -07:00
Dianne Hackborn
9c0c4b7a58
Fix issue #2048267 : Run zipalign on all prebuilts
2009-08-11 19:41:51 -07:00
Phil Dubach
378a5884da
am c539dbe6
: CTS: Add missing integration of 147397 to fix VM tests
...
Merge commit 'c539dbe6a2810818ac22f180e64bdc0256557532'
* commit 'c539dbe6a2810818ac22f180e64bdc0256557532':
CTS: Add missing integration of 147397 to fix VM tests
2009-08-11 18:11:22 -07:00
Raphael
31a8ac2258
BUG 1993354 : Add zipalign to Windows SDK
2009-08-11 15:36:16 -07:00
Phil Dubach
c539dbe6a2
CTS: Add missing integration of 147397 to fix VM tests
...
For host side test packages, the name of the jar file containing the tests is
declared in the packages Android.mk. The name of the make file needs to be
passed to the description generator so that it can pick up this information.
The makefile was not passing on the parameter containing the make file name.
2009-08-10 14:23:23 -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
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
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
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
Jean-Baptiste Queru
123f82cb0b
merge from donut
2009-08-03 07:50:30 -07:00
Joe Onorato
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
Joe Onorato
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
Phil Dubach
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
Android (Google) Code Review
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
Jean-Baptiste Queru
7227ea7619
merge from donut
2009-07-29 14:56:48 -07:00
Phil Dubach
951f3d89fb
CTS: Add telephony and webkit test cases to CTS makefile
2009-07-29 11:58:11 -07:00
Brett Chabot
7b5edc3e8a
Add CTS permission2 test package to cts.
2009-07-28 20:11:24 -07:00
Joe Onorato
cffab81686
Make the product graph slightly more readable.
2009-07-28 18:29:19 -07:00
Jean-Baptiste Queru
7c07cf9a82
Merge korg/donut into korg/master
...
Conflicts:
core/apicheck_msg_current.txt
core/combo/linux-arm.mk
core/prelink-linux-arm.map
tools/droiddoc/src/ClassInfo.java
2009-07-25 16:58:22 -07:00
Android (Google) Code Review
4387b34839
Merge change 8494
...
* changes:
Fix issue 2001204: libaudiopolicy.so and libaudiopolicygeneric.so libraries must be pre-linked.
2009-07-25 00:54:27 -07:00
Sriram Raman
7b02ff0fdc
am 1e96ac84
: Make the recovery.img construction (from boot.img) logic depend on whether recovery.img was installed. Don\'t have to re-specify exclusion list for the patch file construction.
...
Merge commit '1e96ac8430da922332e4c85e7eed0e95442ff2ce'
* commit '1e96ac8430da922332e4c85e7eed0e95442ff2ce':
Make the recovery.img construction (from boot.img) logic depend on whether recovery.img was installed.
2009-07-24 16:09:20 -07:00
Sriram Raman
1e96ac8430
Make the recovery.img construction (from boot.img) logic depend on whether recovery.img was installed.
...
Don't have to re-specify exclusion list for the patch file construction.
2009-07-24 14:24:35 -07:00
Android Git Automerger
9c3b0d58c8
Merge commit '66ae61670d3ea69dd1cf72cf529c29654c07405e'
2009-07-24 12:48:15 -07:00
Android Git Automerger
c41bda63a3
Merge commit '3455a3d4a1b5f59ccbcc2ac7268d11b03861c229'
2009-07-24 12:47:48 -07:00
Android Git Automerger
dabee36b79
Merge commit 'b003d89ee3a6d39a0ad3ca6e9c8a61f39ef3b92a'
2009-07-24 12:47:28 -07:00
Android Git Automerger
cb69dabbdd
Merge commit '22bc517cdfb6b7ee5f90f61de425516c1d7b0245'
2009-07-24 12:47:17 -07:00
Android Git Automerger
72e108a1d4
Merge commit '7a7cd0d8a3ee6d061d7b505583cb791eec6124f5'
2009-07-24 12:47:03 -07:00
Android Git Automerger
358a48e12a
merge 73ef8257ce
from donut (resolved conflicts)
2009-07-24 12:46:51 -07:00