Commit Graph

792 Commits

Author SHA1 Message Date
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
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
f76b9c87b1 remove bootloader assertions
These should be done by the device-specific module where necessary;
they aren't appropriate for all devices.
2009-08-27 16:12:00 -07: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
Scott Main
e06d28ecd7 am dab571d6: Merge change 22524 into donut
Merge commit 'dab571d613c2d9955163fa672e3b8ad92fdf5cb7' into eclair

* commit 'dab571d613c2d9955163fa672e3b8ad92fdf5cb7':
  docs only.
2009-08-26 09:29:28 -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
Android (Google) Code Review
dab571d613 Merge change 22524 into donut
* changes:
  docs only. fix api level highlighting for the treeview navigation.
2009-08-25 16:33:12 -07:00
Scott Main
694972774e docs only.
fix api level highlighting for the treeview navigation.
2009-08-24 17:33:06 -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
Doug Zongker
2f78b8ba12 am 8fead691: Merge change 22448 into donut
Merge commit '8fead6912ed3f04867974631935435a887ed889d' into eclair

* commit '8fead6912ed3f04867974631935435a887ed889d':
  incremental OTAs should remove /system/recovery.img
2009-08-24 13:39:30 -07:00
Phil Dubach
3b7521b524 CTS: Add application security tests to makefile
Change-Id: I51291d338cca88fed68247efbecbaf747306c6b7
2009-08-24 11:49:39 -07:00
Android (Google) Code Review
8fead6912e Merge change 22448 into donut
* changes:
  incremental OTAs should remove /system/recovery.img
2009-08-24 10:36:06 -07:00
Doug Zongker
3b949f0725 incremental OTAs should remove /system/recovery.img
This file has been replaced by the recovery_from_boot.p patch file,
but needs to be removed from existing devices if it exists.
2009-08-24 10:24:32 -07:00
Scott Su
40ea53098c Remove frameworks/base/im from build path 2009-08-23 23:43:24 -07:00
Scott Main
aab0d4c9f9 am 72a5cc82: Merge change 22354 into donut
Merge commit '72a5cc829038254988054046c302550d6821a300' into eclair

* commit '72a5cc829038254988054046c302550d6821a300':
  docs only.
2009-08-22 07:44:20 -07:00
Scott Main
102400f8e2 am eca5e16e: Merge change 22348 into donut
Merge commit 'eca5e16e057cc6915c07ea4138929c44a013aba6' into eclair

* commit 'eca5e16e057cc6915c07ea4138929c44a013aba6':
  docs only.
2009-08-22 07:44:16 -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
Android (Google) Code Review
72a5cc8290 Merge change 22354 into donut
* changes:
  docs only. add donut image for homepage announcement.
2009-08-21 16:38:35 -07:00
Scott Main
37a4d1cb5c docs only.
add donut image for homepage announcement.
2009-08-21 16:37:09 -07:00
Android (Google) Code Review
eca5e16e05 Merge change 22348 into donut
* changes:
  docs only. remove preliminary watermak
2009-08-21 16:12:25 -07:00
Scott Main
d22b5e108d docs only.
remove preliminary watermak
2009-08-21 16:11:02 -07:00
Android (Google) Code Review
7c463e4b05 Merge change 21778 into donut
* changes:
  CTS: Enable Python description/plan generator
2009-08-21 14:41:40 -07:00
Jeff Hamilton
0c51de15fd Prefer ContactsProvider over GoogleContactsProvider. 2009-08-21 00:38:17 -05:00
Doug Zongker
1f8b697a7f am e05628cc: fix signing user builds
Merge commit 'e05628cc8df4ec4b69befa9652d81eb81f0ab008' into eclair

* commit 'e05628cc8df4ec4b69befa9652d81eb81f0ab008':
  fix signing user builds
2009-08-20 18:18:29 -07:00
Doug Zongker
e05628cc8d fix signing user builds
When unzipping a target-files which has been signed with OTA key
replacement, you'll get "overwrite this file?" prompts because the key
files appear in the zip files twice.  Suppress these prompts.

Many developer phone products don't define PRODUCT_OTA_PUBLIC_KEYS, so
add a default key.

This change doesn't affect device code.
2009-08-20 18:02:47 -07:00
Dirk Dougherty
724735d2be am 6f7ba2dc: Merge change 20234 into donut
Merge commit '6f7ba2dce2c112eb4be33dbad54751d55ddd2276' into eclair

* commit '6f7ba2dce2c112eb4be33dbad54751d55ddd2276':
  Remove extraneous quotation mark in template file
2009-08-20 10:36:47 -07:00
Android (Google) Code Review
6f7ba2dce2 Merge change 20234 into donut
* changes:
  Remove extraneous quotation mark in template file
2009-08-20 10:33:11 -07:00
Andrei Popescu
fb71fe7126 Clean libwebcore after new WebKit merge 2009-08-20 12:42:30 +01: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
Android (Google) Code Review
c798114c04 Merge change 21783 into eclair
* changes:
  Windows: Fix platform build.
2009-08-19 12:11:38 -07:00
Raphael
f6ff4c5acf Windows: Fix platform build. 2009-08-19 11:32:15 -07:00
Scott Main
f036631b02 am 54161d14: DOCS ONLY. styleheet changes to fix some errors in the print layout and remove extra space from above nested lists, so they fit closer to the parent list item.
Merge commit '54161d143931c5be2d49e8f9f215ec8bff2237af' into eclair

* commit '54161d143931c5be2d49e8f9f215ec8bff2237af':
  DOCS ONLY.
2009-08-19 11:05:04 -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
Chih-Chung Chang
0db6f1ed39 Need this to update system properties (for change 21876). 2009-08-19 18:14:23 +08:00
Scott Main
54161d1439 DOCS ONLY.
styleheet changes to fix some errors in the print layout
and remove extra space from above nested lists, so they fit
closer to the parent list item.
2009-08-18 19:00:11 -07:00
Doug Zongker
badd2ca451 fix endianness problem with the tail of the signature comment
The two 0xff bytes were intended to easily distinguish files with
whole file signatures from those without, but I got the endianness
backwards.  Go ahead and fix that, as long as I'm making changes to
the verifier anyway.

Check for a signature that includes the sequence 0x50 0x4b 0x05 0x06,
which looks to minzip like the start of the EOCD block.
2009-08-14 17:15:46 -07:00
Doug Zongker
09cf56001a explicitly set max heap size when running signapk
On the mac, -Xmx defaults to 64MB, which isn't enough to do a
whole-file signing of a full OTA package.
2009-08-14 15:25:06 -07:00
Doug Zongker
951495fc48 update OTA package maker to do whole-file signature
Use the new -w flag to SignApk when signing OTA packages.
2009-08-14 14:07:15 -07:00
Doug Zongker
c6cf01a117 add whole-file signature mode to SignApk
Make SignApk generate a signature for (nearly) the entire zip file
when run with the -w option.  The signature covers all of the zip file
except for the archive comment (conveniently the last thing in a zip
file); the archive comment field is used to contain the signature
itself.
2009-08-14 12:25:05 -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
f0061880be am fab87998: (-s ours) Fix the platform version (1.6 now) and sdk version (4)
Merge commit 'fab87998b50c997ba4e506a080d01f606615eb19'

* commit 'fab87998b50c997ba4e506a080d01f606615eb19':
  Fix the platform version (1.6 now) and sdk version (4)
2009-08-12 19:44:20 -07:00