Commit Graph

606 Commits

Author SHA1 Message Date
The Android Open Source Project
d7183f9961 Merge commit 'remotes/goog/eclair' into eclair-release 2009-08-24 10:39:52 -07:00
The Android Open Source Project
45ce9badc4 ERC55B 2009-08-24 10:34:20 -07:00
The Android Open Source Project
1687276897 ERC55 2009-08-24 08:35:46 -07:00
The Android Open Source Project
1dcaf3b87c Merge commit 'remotes/goog/eclair' into eclair-release 2009-08-24 08:35:35 -07:00
Scott Su
40ea53098c Remove frameworks/base/im from build path 2009-08-23 23:43:24 -07:00
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
The Android Open Source Project
786d66abb9 ERC52C 2009-08-21 16:30:15 -07:00
The Android Open Source Project
e395d0e1a6 ERC52B 2009-08-21 16:17:58 -07:00
The Android Open Source Project
9bea88781a ERC52 2009-08-21 07:05:52 -07:00
The Android Open Source Project
1581c91ba9 ERC51B 2009-08-20 12:11:53 -07:00
The Android Open Source Project
0bfe8d0551 ERC51 2009-08-20 07:06:12 -07:00
The Android Open Source Project
439a3a0e2d Merge commit 'remotes/goog/eclair' into eclair-release 2009-08-20 07:05:58 -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
The Android Open Source Project
fd0ac871ec ERC50 2009-08-19 07:06:21 -07:00
The Android Open Source Project
530107a5ce ERC49 2009-08-18 07:05:53 -07:00
The Android Open Source Project
7a7f713308 ERC48 2009-08-17 07:05:38 -07:00
The Android Open Source Project
6a65d0ce38 ERC45 2009-08-14 07:04:24 -07:00
The Android Open Source Project
104317c227 ERC44C 2009-08-13 19:46:14 -07:00
The Android Open Source Project
d11edaf9a1 ERC44B 2009-08-13 12:12:36 -07:00
The Android Open Source Project
7829dcfbe7 Merge commit 'remotes/goog/master' into eclair-release 2009-08-13 12:12:24 -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
The Android Open Source Project
23009a0823 ERC44 2009-08-13 07:06:46 -07:00
The Android Open Source Project
944c8f858f Merge commit 'remotes/goog/master' into eclair-release 2009-08-13 07:06:34 -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
The Android Open Source Project
3cf379a56d ERC43 2009-08-12 08:36:10 -07:00
The Android Open Source Project
35ec11c757 Merge commit 'remotes/goog/master' into eclair-release 2009-08-12 08:35:58 -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
The Android Open Source Project
de29151a19 ERC42B 2009-08-11 13:58:43 -07:00
The Android Open Source Project
df672a6f3a ERC42 2009-08-11 09:47:18 -07:00
Doug Zongker
ecfad666e3 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-11 09:46:11 -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
The Android Open Source Project
d77eba1656 ERC41 2009-08-10 09:06:32 -07:00
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
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