Commit Graph

354 Commits

Author SHA1 Message Date
Doug Zongker fe0602f60b increase reserved blocks from 5 to 8
Our yaffs filesystems reserve 5 blocks, use 1 for a checkpoint, and
may use 1 or 2 more for caching.  Take these all into account when
computing the max image size.
2009-09-14 18:08:45 -07:00
Andy McFadden 2c86bfd285 Sleazy workaround for webkit build failures.
The WebKit library link line is exceeding 128KB on sim-eng builds.
The path to sim-eng object files is slightly longer than device builds
because the object files live under the "host" directory.

This change truncates the "product" directory name to "pr", reducing the
command line by a few KB.  This only affects sim-eng builds.

The real fix will need be to webkit (see internal bug 1917987), which
will eventually start failing on device builds if it continues to grow.
2009-09-10 10:05:14 -07:00
Android (Google) Code Review db7ab295c4 Merge change 23258 into eclair
* changes:
  Add the ability to turn on proguard for java targets, and to call aapt to generate a rules file for proguard for stuff from the manifest and other resources that need to be kept.
2009-08-30 13:44:22 -07:00
Joe Onorato 2daa2b3b05 Add the ability to turn on proguard for java targets, and to call aapt
to generate a rules file for proguard for stuff from the manifest and
other resources that need to be kept.
2009-08-30 13:43:00 -07:00
Brett Chabot 0425394081 am 3c7c8a60: Merge change 22522 into donut
Merge commit '3c7c8a60860f97ac4c7381bd6ed30a43864372da' into eclair

* commit '3c7c8a60860f97ac4c7381bd6ed30a43864372da':
  Add Gesture tests to CTS.
2009-08-29 16:44:39 -07:00
Android (Google) Code Review 3c7c8a6086 Merge change 22522 into donut
* changes:
  Add Gesture tests to CTS.
2009-08-29 16:42:25 -07:00
Daniel Sandler c6646c9ac4 Introduce a default density ('mdpi') for all device builds.
This is done by appending "mdpi" (medium density or 160 dpi, which is what
we've been using so far on dream etc.) to PRODUCT_LOCALES if no other dpi is
found there. (PRODUCT_LOCALES is then sent as a configuration parameter to
aapt to determine which resources should be included in the build.)

With this change, each build will now include only one density of any given
asset. For example, if there exists

  drawable-hdpi/foo.png
  drawable-mdpi/foo.png

...then the build will include *only* drawable-mdpi/foo.png, unless the
density is overridden in the build's own device spec:

  PRODUCT_LOCALES += hdpi

...in which case the build will include only drawable-hdpi/foo.png.
2009-08-28 10:00:12 -04:00
Doug Zongker 3938ab2572 am 1b6d0a65: allow prebuilts to specify LOCAL_CERTIFICATE so they can be resigned
Merge commit '1b6d0a65fc62901f2c18d00c556bd5da50f35584' into eclair

* commit '1b6d0a65fc62901f2c18d00c556bd5da50f35584':
  allow prebuilts to specify LOCAL_CERTIFICATE so they can be resigned
2009-08-26 23:22:05 -07:00
Doug Zongker 1b6d0a65fc allow prebuilts to specify LOCAL_CERTIFICATE so they can be resigned
If a prebuilt specifies a LOCAL_CERTIFICATE, stick it in the
PACKAGES.* collection so that the predexopt process can work on the
file (which only works if the new .apk can be signed).
2009-08-26 18:22:43 -07:00
Doug Zongker fbc039e9b9 am 4ac1ba61: fix typo in bash expression
Merge commit '4ac1ba61075190fa9ced594c85285beff6293184' into eclair

* commit '4ac1ba61075190fa9ced594c85285beff6293184':
  fix typo in bash expression
2009-08-26 11:41:13 -07:00
Doug Zongker ed96e88850 resolved conflicts for merge of 6dd2ae02 to eclair 2009-08-26 09:37:07 -07:00
Doug Zongker 4ac1ba6107 fix typo in bash expression
Fortunately the error doesn't change the value of the expression
(since undefined variables are treated as 0 inside "$((...))").
2009-08-25 20:38:50 -07:00
Doug Zongker 6dd2ae02c1 turn down allowed image size
yaffs appears to reserve 5 blocks on the partition for itself.
Account for this when computing the maximum allowable image size.
2009-08-25 18:05:02 -07:00
Brett Chabot 759901fa6d Add Gesture tests to CTS. 2009-08-24 17:30:41 -07:00
Phil Dubach d0088f0e28 am 793817ba: CTS: Add missing make dependencies for application security tests
Merge commit '793817baa1455c410311d79ef6f44cac1c26be9f' into eclair

* commit '793817baa1455c410311d79ef6f44cac1c26be9f':
  CTS: Add missing make dependencies for application security tests
2009-08-24 15:51:51 -07:00
Phil Dubach 793817baa1 CTS: Add missing make dependencies for application security tests
Change-Id: I4d069b18b0da5f49ca9bb377d04732b8222ac137
2009-08-24 15:18:35 -07:00
Phil Dubach c4d5369c22 am 3b7521b5: CTS: Add application security tests to makefile
Merge commit '3b7521b524de694cb9da277fd1d7493fc41aa0f3' into eclair

* commit '3b7521b524de694cb9da277fd1d7493fc41aa0f3':
  CTS: Add application security tests to makefile
2009-08-24 13:39:32 -07:00
Phil Dubach 3b7521b524 CTS: Add application security tests to makefile
Change-Id: I51291d338cca88fed68247efbecbaf747306c6b7
2009-08-24 11:49:39 -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
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
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