Commit Graph

3392 Commits

Author SHA1 Message Date
Jesse Wilson
fed45d859a am 77070aa7: am ce7d5023: Turn dalvikvm host builds on by default when linux is the host OS.
Merge commit '77070aa757806d1617d707db4d2bd7931b2353fc'

* commit '77070aa757806d1617d707db4d2bd7931b2353fc':
  Turn dalvikvm host builds on by default when linux is the host OS.
2010-09-22 13:53:41 -07:00
Jesse Wilson
77070aa757 am ce7d5023: Turn dalvikvm host builds on by default when linux is the host OS.
Merge commit 'ce7d5023c3df4c16ae395d64d51dd8345e40a39e' into gingerbread-plus-aosp

* commit 'ce7d5023c3df4c16ae395d64d51dd8345e40a39e':
  Turn dalvikvm host builds on by default when linux is the host OS.
2010-09-22 11:55:29 -07:00
Jesse Wilson
ce7d5023c3 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
2010-09-22 11:39:18 -07:00
Doug Zongker
b8d49163fe am 7fa4a21e: (-s ours) am 780c2372: accommodate both new and old target-files when creating incrementals (do not merge)
Merge commit '7fa4a21e1872e5ef2da12f00e77fa459c6c61c1c'

* commit '7fa4a21e1872e5ef2da12f00e77fa459c6c61c1c':
  accommodate both new and old target-files when creating incrementals (do not merge)
2010-09-22 10:22:14 -07:00
Doug Zongker
7fa4a21e18 am 780c2372: accommodate both new and old target-files when creating incrementals (do not merge)
Merge commit '780c2372706c5250079cb7d759f6530691dd9143' into gingerbread-plus-aosp

* commit '780c2372706c5250079cb7d759f6530691dd9143':
  accommodate both new and old target-files when creating incrementals (do not merge)
2010-09-22 10:18:33 -07:00
Doug Zongker
f2ab290550 accommodate both new and old target-files when creating incrementals
(cherry-picked from gingerbread.)

Change-Id: I925bf122b0012302a85c0b6f04cca48eb694b0c4
2010-09-22 10:17:31 -07:00
Doug Zongker
780c237270 accommodate both new and old target-files when creating incrementals (do not merge)
Change-Id: Ibc211164bf1dee8275e15d10cbe81b63d666069f
2010-09-22 10:12:54 -07:00
Doug Zongker
539db3b845 resolved conflicts for merge of e1daf61d to master
Change-Id: Idf5767f68dd19b51940ea69528cdd389b04d56b9
2010-09-21 20:10:32 -07:00
Brian Swetland
58118ccc56 am d451b872: (-s ours) am c1a1aa1e: deal with gps renaming
Merge commit 'd451b872babde2f97da08ba27d60e18643b76f0a'

* commit 'd451b872babde2f97da08ba27d60e18643b76f0a':
  deal with gps renaming
2010-09-21 17:44:08 -07:00
Doug Zongker
e1daf61d43 am ad806982: arg: system_size, not system_img
Merge commit 'ad806982c12b64d8dff040f5c9a444d810d7694c' into gingerbread-plus-aosp

* commit 'ad806982c12b64d8dff040f5c9a444d810d7694c':
  arg: system_size, not system_img
2010-09-21 17:25:59 -07:00
Doug Zongker
ad806982c1 arg: system_size, not system_img
Change-Id: Iba5d10204c93159a4f12ea8e8d8687db5b9dd5ca
2010-09-21 17:22:14 -07:00
Doug Zongker
0d32cc159a Merge "fall back to MTD if no recovery.fstab is present" 2010-09-21 17:15:17 -07:00
Ying Wang
171264e568 Merge "Add a new layer generic_no_telephony.mk" 2010-09-21 16:52:28 -07:00
Ying Wang
03e76ace38 Add a new layer generic_no_telephony.mk
Bug: 2994028
Change-Id: I2a1831bb8dd1245c6cc0116738c118fe895b6e43
2010-09-21 16:28:29 -07:00
Brian Swetland
d451b872ba am c1a1aa1e: deal with gps renaming
Merge commit 'c1a1aa1eb5f2a6b9e45304b76da01802b5520c18' into gingerbread-plus-aosp

* commit 'c1a1aa1eb5f2a6b9e45304b76da01802b5520c18':
  deal with gps renaming
2010-09-21 16:16:47 -07:00
Doug Zongker
33a4b08b15 fall back to MTD if no recovery.fstab is present
Needed for non-device builds (like for the emulator) to work.

Change-Id: I5fdbfb3af34821811744e8ce5bf1eff8df344c73
2010-09-21 16:12:55 -07:00
Brian Swetland
c1a1aa1eb5 deal with gps renaming
Change-Id: I488de95880be1c4fadf23a2fb4f7e7eb686d52c2
2010-09-21 15:58:12 -07:00
Doug Zongker
78a2750f94 am 714633b1: (-s ours) am c0434ac8: add recovery.fstab as dependency so it triggers rebuild (do not merge)
Merge commit '714633b13f00d07afb78838a2d27c95cdd78973f'

* commit '714633b13f00d07afb78838a2d27c95cdd78973f':
  add recovery.fstab as dependency so it triggers rebuild (do not merge)
2010-09-21 14:46:48 -07:00
Doug Zongker
714633b13f am c0434ac8: add recovery.fstab as dependency so it triggers rebuild (do not merge)
Merge commit 'c0434ac8b504df8a2f2a2828dc9b3f804c3dda72' into gingerbread-plus-aosp

* commit 'c0434ac8b504df8a2f2a2828dc9b3f804c3dda72':
  add recovery.fstab as dependency so it triggers rebuild (do not merge)
2010-09-21 14:37:19 -07:00
Doug Zongker
c0434ac8b5 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
2010-09-21 14:26:36 -07:00
Doug Zongker
9ce0fb6e59 support for per-partition fs_type
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.

(Cherrypicked from gingerbread w/some edits to resolve conflicts.)

Change-Id: Ic3ed85ac5672d8fe20280dacf43d5b82053311bb
2010-09-21 14:13:11 -07:00
Doug Zongker
56a3dba9d8 am ed2d3f42: (-s ours) am 258bf46e: support for per-partition fs_type (do not merge)
Merge commit 'ed2d3f42d1a9a058f0eee5b20f7b6b2982a2a7be'

* commit 'ed2d3f42d1a9a058f0eee5b20f7b6b2982a2a7be':
  support for per-partition fs_type (do not merge)
2010-09-21 11:41:05 -07:00
Doug Zongker
ed2d3f42d1 am 258bf46e: support for per-partition fs_type (do not merge)
Merge commit '258bf46ea6bb4f25d01fab1b783238589e5bbec4' into gingerbread-plus-aosp

* commit '258bf46ea6bb4f25d01fab1b783238589e5bbec4':
  support for per-partition fs_type (do not merge)
2010-09-21 11:37:10 -07:00
Doug Zongker
258bf46ea6 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
2010-09-21 09:55:29 -07:00
Steve Howard
a188df5cd7 am 1a297b84: am 1020d271: Add new downloads UI to core build.
Merge commit '1a297b84c8e293a7cd7e2e743d4bf5d0068d8fba'

* commit '1a297b84c8e293a7cd7e2e743d4bf5d0068d8fba':
  Add new downloads UI to core build.
2010-09-20 11:57:10 -07:00
Steve Howard
1a297b84c8 am 1020d271: Add new downloads UI to core build.
Merge commit '1020d271c67b062e95b61c4eb9f1f5168e2b6197' into gingerbread-plus-aosp

* commit '1020d271c67b062e95b61c4eb9f1f5168e2b6197':
  Add new downloads UI to core build.
2010-09-20 11:52:57 -07:00
Steve Howard
1020d271c6 Add new downloads UI to core build.
Change-Id: I96a3bb10beb6c1ec9c48baa2e2039aab7c421b09
2010-09-20 11:44:54 -07:00
Joe Onorato
e4227106f4 am bf17772c: am ad05677b: Brian\'s vendor/ change requires a clean build.
Merge commit 'bf17772cae2a11cf4039e8652aee3b96af7a739f'

* commit 'bf17772cae2a11cf4039e8652aee3b96af7a739f':
  Brian's vendor/ change requires a clean build.
2010-09-19 09:21:27 -07:00
Joe Onorato
bf17772cae am ad05677b: Brian\'s vendor/ change requires a clean build.
Merge commit 'ad05677b0d02a54af34370e8b237aa86f0d627f4' into gingerbread-plus-aosp

* commit 'ad05677b0d02a54af34370e8b237aa86f0d627f4':
  Brian's vendor/ change requires a clean build.
2010-09-19 09:12:39 -07:00
Joe Onorato
ad05677b0d Brian's vendor/ change requires a clean build.
Change-Id: I074fe1ec176dc005adcd79eaf7c91cc3b8d3f54c
2010-09-19 12:04:23 -04:00
Doug Zongker
cb269124bb am 25df2a98: am 6be030af: Merge "remove remaining refs to max_image_sizes" into gingerbread
Merge commit '25df2a980d87f011fe702b6209c3b71b2824fc18'

* commit '25df2a980d87f011fe702b6209c3b71b2824fc18':
  remove remaining refs to max_image_sizes
2010-09-17 08:24:37 -07:00
Doug Zongker
25df2a980d am 6be030af: Merge "remove remaining refs to max_image_sizes" into gingerbread
Merge commit '6be030af2907cfbbfe59bd207e07f09c45ec4588' into gingerbread-plus-aosp

* commit '6be030af2907cfbbfe59bd207e07f09c45ec4588':
  remove remaining refs to max_image_sizes
2010-09-17 07:48:28 -07:00
Doug Zongker
6be030af29 Merge "remove remaining refs to max_image_sizes" into gingerbread 2010-09-17 07:46:07 -07:00
Doug Zongker
1684d9c0cf remove remaining refs to max_image_sizes
Change-Id: I7e4686bc06f9c3eab2df34d092021c549738b217
2010-09-17 07:45:30 -07:00
Brian Carlstrom
1b3e028eb0 am cec75adb: am c05d0000: Only turn host build on for linux
Merge commit 'cec75adb645fdd7535370bbb996039b2a3f3d0b7'

* commit 'cec75adb645fdd7535370bbb996039b2a3f3d0b7':
  Only turn host build on for linux
2010-09-16 23:23:26 -07:00
Doug Zongker
b984ae51e5 resolved conflicts for merge of 813ad17a to master
Change-Id: I3fc84babbbcab712c5e38a0c8b815115ba89375f
2010-09-16 23:13:11 -07:00
Brian Carlstrom
6821dbad65 Only turn host build on for linux
Change-Id: I2d3b16f7881ad82cf272a40213dd4e173f54baa0
2010-09-16 22:49:10 -07:00
Brian Carlstrom
cec75adb64 am c05d0000: Only turn host build on for linux
Merge commit 'c05d0000bb3e91a21c2cc7cbd85232f1afc7a8d2' into gingerbread-plus-aosp

* commit 'c05d0000bb3e91a21c2cc7cbd85232f1afc7a8d2':
  Only turn host build on for linux
2010-09-16 22:13:50 -07:00
Brian Carlstrom
c05d0000bb Only turn host build on for linux
Change-Id: I595948b159bc6a2bf295fd11ab831f978e38c799
2010-09-16 21:49:01 -07:00
Doug Zongker
813ad17ad3 am 918ccff3: Merge "consolidate target_files metadata into one key-value file" into gingerbread
Merge commit '918ccff37260270d0eef3a3a7bfc2410c46d931a' into gingerbread-plus-aosp

* commit '918ccff37260270d0eef3a3a7bfc2410c46d931a':
  consolidate target_files metadata into one key-value file
2010-09-16 18:11:59 -07:00
Doug Zongker
918ccff372 Merge "consolidate target_files metadata into one key-value file" into gingerbread 2010-09-16 18:09:23 -07:00
Jesse Wilson
8caaeddcc0 resolved conflicts for merge of d9de6588 to master
Change-Id: I3d7d6744b4f0d7c10bf001c87c0abbb4cb6885ef
2010-09-16 17:57:47 -07:00
Jesse Wilson
d9de658868 am 852f43bd: Include dalvik+libcore dependencies in core product definitions.
Merge commit '852f43bd29da34ff15799b88c3db166428cea6d8' into gingerbread-plus-aosp

* commit '852f43bd29da34ff15799b88c3db166428cea6d8':
  Include dalvik+libcore dependencies in core product definitions.
2010-09-16 17:48:29 -07:00
Doug Zongker
37974731fc consolidate target_files metadata into one key-value file
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
2010-09-16 17:44:38 -07:00
Jesse Wilson
852f43bd29 Include dalvik+libcore dependencies in core product definitions.
Also conditionally include host-only dependencies when the host is
being built.

Change-Id: I0e8c9c1bef5ee60d4c1ce1c158f41b7642f9a8f2
2010-09-16 15:34:00 -07:00
Doug Zongker
486de126e3 only do size check for yaffs images; fix incremental info dict
Change-Id: Ic862000a23b93289604b0737bfcaf8d461f36ff8
2010-09-16 14:01:56 -07:00
Doug Zongker
9b3944ed8c am 4d197be3: am ec5ffbab: allow partition sizes in hex (when prefixed with 0x)
Merge commit '4d197be33970a163e8e38ba1b685718784498e43'

* commit '4d197be33970a163e8e38ba1b685718784498e43':
  allow partition sizes in hex (when prefixed with 0x)
2010-09-16 13:08:25 -07:00
Doug Zongker
4d197be339 am ec5ffbab: allow partition sizes in hex (when prefixed with 0x)
Merge commit 'ec5ffbabd3a3ba65bac934305f7ffcb7e15fb744' into gingerbread-plus-aosp

* commit 'ec5ffbabd3a3ba65bac934305f7ffcb7e15fb744':
  allow partition sizes in hex (when prefixed with 0x)
2010-09-16 13:04:07 -07:00
Doug Zongker
ec5ffbabd3 allow partition sizes in hex (when prefixed with 0x)
Change-Id: I806879fd496304c449ff5315b0ef48fd766d6428
2010-09-16 13:01:26 -07:00
Doug Zongker
f127eb709b resolved conflicts for merge of 2cb8d5eb to master
Change-Id: I3b1aec1aee7c6bfcee2e978b4755b2bae9e480c4
2010-09-16 12:38:40 -07:00