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
Merge commit '1020d271c67b062e95b61c4eb9f1f5168e2b6197' into gingerbread-plus-aosp
* commit '1020d271c67b062e95b61c4eb9f1f5168e2b6197':
Add new downloads UI to core build.
Merge commit 'c05d0000bb3e91a21c2cc7cbd85232f1afc7a8d2' into gingerbread-plus-aosp
* commit 'c05d0000bb3e91a21c2cc7cbd85232f1afc7a8d2':
Only turn host build on for linux
Merge commit '918ccff37260270d0eef3a3a7bfc2410c46d931a' into gingerbread-plus-aosp
* commit '918ccff37260270d0eef3a3a7bfc2410c46d931a':
consolidate target_files metadata into one key-value file
Merge commit '852f43bd29da34ff15799b88c3db166428cea6d8' into gingerbread-plus-aosp
* commit '852f43bd29da34ff15799b88c3db166428cea6d8':
Include dalvik+libcore dependencies in core product definitions.
Instead of separate files for recovery api version, tool extensions,
and mkyaffs2 options, put those all in the generic key-value file.
Change-Id: Ib642311632844d52e4895fd4747093fc7e86232d
Merge commit 'c77a9ad444d49e2ad777678cf5671f0a94f44ffb' into gingerbread-plus-aosp
* commit 'c77a9ad444d49e2ad777678cf5671f0a94f44ffb':
store user-visible image sizes in target-files
Do the yaffs-specific adjustments to image sizes in common.CheckSize,
instead of baking it into the image size stored in the target-files
package. Remove the special fs_type flag and fold it into the
"info_dict" we have for saving key-value pairs from the build system.
Change-Id: I6e63f3330f6277d9a946b22e66cadeb51203ba14
Merge commit '8e8ff4cad905a5b4eed7659152f075f9a5c038b1' into gingerbread-plus-aosp
* commit '8e8ff4cad905a5b4eed7659152f075f9a5c038b1':
support for ext4/EMMC in target_files and OTA generation
Move the image sizes into a more generic key-value file. Make them
optional. Add additional key/value pairs describing what kind of
filesystem the device uses. Pass new fs-type-related arguments in
edify scripts when mounting and reformatting partitions.
Don't include all the init.*.rc files from the regular system in
recovery -- they aren't needed, and break recovery on some devices.
Change-Id: Ic1c651f754ed00ba1cffe8cf56c43f7f3b0ebfd7
Merge commit '6022a9786f745dc41f92e71e16b5b95a7cfd81b7' into gingerbread-plus-aosp
* commit '6022a9786f745dc41f92e71e16b5b95a7cfd81b7':
DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off.
Merge commit '671f5fb09f3510c16f73049cad9d8d6d652eaad8' into gingerbread-plus-aosp
* commit '671f5fb09f3510c16f73049cad9d8d6d652eaad8':
Don't increase partition size for ext4 user images. [DO NOT MERGE]