Merge commit 'bf9b8e8904b930028adaf94c7139b714cef3d641'
* commit 'bf9b8e8904b930028adaf94c7139b714cef3d641':
Cleanstep required by switching back to JSC in the browser
Merge commit '270de9284a56f1e9646afb1cf7e9f2720ddaa7b0' into eclair-plus-aosp
* commit '270de9284a56f1e9646afb1cf7e9f2720ddaa7b0':
Cleanstep required by switching back to JSC in the browser
Merge commit '0646e78e9969762ead938f953c7283d984333d99'
* commit '0646e78e9969762ead938f953c7283d984333d99':
do a pass of normal-chunk-merging before comparing src and tgt files
Merge commit 'd7d7ab00f58bd75ac185273f93d15533558a7f54' into eclair-plus-aosp
* commit 'd7d7ab00f58bd75ac185273f93d15533558a7f54':
do a pass of normal-chunk-merging before comparing src and tgt files
Merge the gzip footer and header together with any adjacent normal
chunks before comparing chunk structures; this should make the
recovery-from-boot diff not fail due to differences in the footer
after the ramdisk part of the image.
Merge commit '15604b84e246514da6c9721266919003f734380b' into eclair-plus-aosp
* commit '15604b84e246514da6c9721266919003f734380b':
use imgdiff -z to diff zipfiles
imgdiff now understands the zip file format and can produce smaller
patches by doing the patching in uncompressed space. Start taking
advantage of this for .zip, .apk, and .jar files.
Merge commit '9396155dae1a23171a388fcd3c3c8d64a9439062'
* commit '9396155dae1a23171a388fcd3c3c8d64a9439062':
Add camera feature files to the SDK system image.
Merge commit 'db7ab295c4d6e9b03ea3149ad015699f63221087'
* commit 'db7ab295c4d6e9b03ea3149ad015699f63221087':
Add the ability to turn on proguard for java targets, and to call aapt
* 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.
Merge commit 'c6646c9ac41122ecc022102efdcceb890a0ca529'
* commit 'c6646c9ac41122ecc022102efdcceb890a0ca529':
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.
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.
Merge commit '3938ab2572e7c9d5894975c0076b271b2846faa9'
* commit '3938ab2572e7c9d5894975c0076b271b2846faa9':
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
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).
