The Android Open Source Project
cf6d088196
ERC59
2009-08-28 08:35:51 -07:00
The Android Open Source Project
edd8c2052c
Merge commit 'remotes/goog/eclair' into eclair-release
2009-08-28 08:35:41 -07:00
Daniel Sandler
981362caa2
am c6646c9a
: Introduce a default density (\'mdpi\') for all device builds.
...
Merge commit 'c6646c9ac41122ecc022102efdcceb890a0ca529'
* commit 'c6646c9ac41122ecc022102efdcceb890a0ca529':
Introduce a default density ('mdpi') for all device builds.
2009-08-28 07:51:09 -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
The Android Open Source Project
412ed5eda3
DRC58C
2009-08-27 22:18:38 -07:00
The Android Open Source Project
33b86ad856
ERC58C
2009-08-27 18:10:27 -07:00
The Android Open Source Project
d59b24325c
Merge commit 'remotes/goog/eclair' into eclair-release
2009-08-27 18:10:14 -07:00
Dirk Dougherty
123bb1228b
Doc changes for SDK update.
...
Update SDK toc template.
2009-08-27 16:48:25 -07:00
Doug Zongker
75b4ba0e4d
am f76b9c87
: remove bootloader assertions
...
Merge commit 'f76b9c87b16956aebfe5af497913d698dd03cc01'
* commit 'f76b9c87b16956aebfe5af497913d698dd03cc01':
remove bootloader assertions
2009-08-27 16:25:24 -07:00
Jay Schroeder
b7e96e4498
kcm tool fix for the keyboard output permissions
...
This patch adds read permission for everyone to the output files of the
kcm tool. The compiled keycharmap files need to be able to be read by
everyone. This fixes a problem at startup being unable to read the
*.kcm.bin files located at <android-root>/system/usr/keychars.
2009-08-27 18:16:25 -05: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
The Android Open Source Project
0364be9fe2
DRC58B
2009-08-27 15:40:48 -07:00
The Android Open Source Project
d85e883a71
ERC58B
2009-08-27 15:08:33 -07:00
Joshua Bloch
855003deb7
Making Droiddoc not explode when inherited interfaces disappear.
2009-08-27 14:43:03 -07:00
The Android Open Source Project
b6179579f7
DRC58
2009-08-27 11:23:39 -07:00
The Android Open Source Project
aa53037ba5
Merge commit 'remotes/goog/donut' into donut-release
2009-08-27 11:23:27 -07:00
The Android Open Source Project
8b4c6e8fed
ERC58
2009-08-27 08:36:10 -07:00
The Android Open Source Project
e5860a383a
Merge commit 'remotes/goog/eclair' into eclair-release
2009-08-27 08:35:55 -07:00
Doug Zongker
ebb71b4ebb
am 3938ab25
: am 1b6d0a65
: allow prebuilts to specify LOCAL_CERTIFICATE so they can be resigned
...
Merge commit '3938ab2572e7c9d5894975c0076b271b2846faa9'
* commit '3938ab2572e7c9d5894975c0076b271b2846faa9':
allow prebuilts to specify LOCAL_CERTIFICATE so they can be resigned
2009-08-26 23:26:49 -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
cdd9af8110
am fbc039e9
: am 4ac1ba61
: fix typo in bash expression
...
Merge commit 'fbc039e9b9cda43fd4dc8bd63887dcb8feaa22b8'
* commit 'fbc039e9b9cda43fd4dc8bd63887dcb8feaa22b8':
fix typo in bash expression
2009-08-26 11:47:38 -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
a85ff47d45
am ed96e888
: resolved conflicts for merge of 6dd2ae02
to eclair
...
Merge commit 'ed96e88850b471d4ebbbdd1c2acd3efdc6b19a10'
* commit 'ed96e88850b471d4ebbbdd1c2acd3efdc6b19a10':
turn down allowed image size
2009-08-26 11:13:37 -07:00
Keith Deacon
7d3d4a5af1
Added a default to specify an alternative tool chain prefix if needed.
2009-08-26 10:44:27 -07:00
Nate Karstens
11c5f57f63
Updated to better distinguish between options and operands
2009-08-26 10:35:25 -07:00
Doug Zongker
ed96e88850
resolved conflicts for merge of 6dd2ae02
to eclair
2009-08-26 09:37:07 -07:00
Scott Main
9aa4927072
am e06d28ec
: am dab571d6
: Merge change 22524 into donut
...
Merge commit 'e06d28ecd7df35d9ab978edbf93129a0f1ad610a'
* commit 'e06d28ecd7df35d9ab978edbf93129a0f1ad610a':
docs only.
2009-08-26 09:34:11 -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
The Android Open Source Project
25e3597702
ERC57
2009-08-26 08:36:01 -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
The Android Open Source Project
57408af32c
ERC56
2009-08-25 08:34:35 -07:00
The Android Open Source Project
806acb332f
ERC55D
2009-08-24 18:49:05 -07:00
The Android Open Source Project
cc579c2ae7
Merge commit 'remotes/goog/eclair' into eclair-release
2009-08-24 18:48:54 -07:00
Scott Main
694972774e
docs only.
...
fix api level highlighting for the treeview navigation.
2009-08-24 17:33:06 -07:00
Brett Chabot
759901fa6d
Add Gesture tests to CTS.
2009-08-24 17:30:41 -07:00
Phil Dubach
674df021f4
am d0088f0e
: am 793817ba
: CTS: Add missing make dependencies for application security tests
...
Merge commit 'd0088f0e285eefc975505ac846ace2f695d31e7a'
* commit 'd0088f0e285eefc975505ac846ace2f695d31e7a':
CTS: Add missing make dependencies for application security tests
2009-08-24 15:56:00 -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
27674fd176
am c4d5369c
: am 3b7521b5
: CTS: Add application security tests to makefile
...
Merge commit 'c4d5369c2295c65ce6ec335fea02feb735534a4d'
* commit 'c4d5369c2295c65ce6ec335fea02feb735534a4d':
CTS: Add application security tests to makefile
2009-08-24 13:43:54 -07:00
Doug Zongker
ce8f172e1f
am 2f78b8ba
: am 8fead691
: Merge change 22448 into donut
...
Merge commit '2f78b8ba1225a92305ce6c03ef2898055b6a99ac'
* commit '2f78b8ba1225a92305ce6c03ef2898055b6a99ac':
incremental OTAs should remove /system/recovery.img
2009-08-24 13:43:52 -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
Kenny Root
23f70ffd9d
Update prelink map for libFLAC
2009-08-24 11:35:02 -07:00
Scott Su
3d32979e8a
am 40ea5309
: Remove frameworks/base/im from build path
...
Merge commit '40ea53098cc0829abee3cfa7abfafc735f27e93b'
* commit '40ea53098cc0829abee3cfa7abfafc735f27e93b':
Remove frameworks/base/im from build path
2009-08-24 10:40:24 -07:00
The Android Open Source Project
122e179e33
ERC55C
2009-08-24 10:40:00 -07:00
The Android Open Source Project
d7183f9961
Merge commit 'remotes/goog/eclair' into eclair-release
2009-08-24 10:39:52 -07:00