Merge commit '1fdbf261a0d550baaed96f5461bb014754364c16' into gingerbread-plus-aosp
* commit '1fdbf261a0d550baaed96f5461bb014754364c16':
Don't set DISABLE_DEXPREOPT in lunch.
Merge commit '30090e41e31e7db34a1092d8173c1413c036b49d' into gingerbread-plus-aosp
* commit '30090e41e31e7db34a1092d8173c1413c036b49d':
Set the intermediate dirs before using them.
Merge commit '97984c41fe4f8fdca1f24c7bf790bf03b174f90e' into gingerbread-plus-aosp
* commit '97984c41fe4f8fdca1f24c7bf790bf03b174f90e':
FRG83
FRG78
FRG75
FRG58B
FRG58
FRG57
include build timestamp in OTA metadata
Merge commit '96a57e737707d05333dced5b657c4ef21c44088a' into gingerbread-plus-aosp
* commit '96a57e737707d05333dced5b657c4ef21c44088a':
make info_dict and GetTypeAndDevice available to device extensions
Merge commit 'd56d69b621bf41b478d59b6f987b6f796a9d8652' into gingerbread-plus-aosp
* commit 'd56d69b621bf41b478d59b6f987b6f796a9d8652':
Fix dependency when switching between build variants with and without Proguard.
Don't try to do the host build if we're configured for sim-eng. They
seem to be clashing, and it's redundant anyway.
Change-Id: I8e1a24b6e07d28701b32b6559ba39337b211264d
Merge commit 'e7f8140e6df19840a6f2c4bc7063cc6c484b140f' into gingerbread-plus-aosp
* commit 'e7f8140e6df19840a6f2c4bc7063cc6c484b140f':
Add a workaround for a platform JAR parsing bug.
Merge commit '7978d50edb9c4da0b8f4076412f092418da6e372' into gingerbread
* commit '7978d50edb9c4da0b8f4076412f092418da6e372':
Add a workaround for a platform JAR parsing bug.
The java.util.jar implementation through Android 1.6 has a
bug where if the signature file in META-INF is a multiple
of 1024 bytes, it will throw an IOException attempting to
read it.
If signapk would produce a CERT.SF in a multiple of 1024
bytes, add an extra CRLF to the end of the file.
Bug: 3019677
Change-Id: I23d4a36e12e224be600d3ac39379b5b5a022a628
Merge commit '02c9813a726803e1c406b19f6b9dc4e411326e66' into gingerbread-plus-aosp
* commit '02c9813a726803e1c406b19f6b9dc4e411326e66':
Prebuilt NDKs are merged for linux and darwin.
With this change, in a user build the dependency looks like:
package.apk -> progaurd.classes.dex -> ... -> proguard.classes.jar
While in an eng build:
package.apk -> noproguard.classes.dex -> ... -> noproguard.classes.jar
Because package.apk is product-specific and removed when switching between
user and eng builds, it can always be built with the correct and up-to-date .dex file.
Bug: 3022484
Change-Id: I3a732cb3e256f193088c294dc4a0573188283cb2
Merge commit '50d7d7a0a68378d1b02b5d2a2514592ba0d65f84' into gingerbread-plus-aosp
* commit '50d7d7a0a68378d1b02b5d2a2514592ba0d65f84':
Fix private vars for host-dex rules.
Merge commit 'e7874c430895b9a4e631c89f1e7729da9264d167' into gingerbread-plus-aosp
* commit 'e7874c430895b9a4e631c89f1e7729da9264d167':
Integrate dexpreopt into the build system.
Merge commit 'ce7d5023c3df4c16ae395d64d51dd8345e40a39e' into gingerbread-plus-aosp
* commit 'ce7d5023c3df4c16ae395d64d51dd8345e40a39e':
Turn dalvikvm host builds on by default when linux is the host OS.
Previously host builds were only enabled under user and user-debug
builds. This will make it easier for Androids to find out if they've
inadvertently broken host compatibility in native code.
Change-Id: Id1f2d5e189c4c1b6462fe03bab1b0f75e98a599c
Merge commit '780c2372706c5250079cb7d759f6530691dd9143' into gingerbread-plus-aosp
* commit '780c2372706c5250079cb7d759f6530691dd9143':
accommodate both new and old target-files when creating incrementals (do not merge)
Merge commit 'c0434ac8b504df8a2f2a2828dc9b3f804c3dda72' into gingerbread-plus-aosp
* commit 'c0434ac8b504df8a2f2a2828dc9b3f804c3dda72':
add recovery.fstab as dependency so it triggers rebuild (do not merge)
Make recovery image depend on the fstab file so it gets rebuilt when
fstab changes. Add support for "emmc" fstab partition type to
edify_generator.
Change-Id: Ic5df4e86c24321bf7d82a644e3e4770352e4f64b
Merge commit '258bf46ea6bb4f25d01fab1b783238589e5bbec4' into gingerbread-plus-aosp
* commit '258bf46ea6bb4f25d01fab1b783238589e5bbec4':
support for per-partition fs_type (do not merge)
Include the recovery.fstab file in the recovery image. Remove the
global fs_type and partition_type values from the target-files
key/value dict, and parse the recovery.fstab file instead to find
types for each partition.
Change-Id: I35ee2dd0989441dc2a704b63c1b32e598049acb5
Ying Wang