Commit Graph

3613 Commits

Author SHA1 Message Date
Dmitry Shmidt 56de684367 am fb148d31: Merge "user_tags: Remove 01-test target" into gingerbread
Merge commit 'fb148d31eaab585c377e3b6be7a5c94380d623e0' into gingerbread-plus-aosp

* commit 'fb148d31eaab585c377e3b6be7a5c94380d623e0':
  user_tags: Remove 01-test target
2010-09-23 11:34:33 -07:00
Dmitry Shmidt 9a7bebc6a9 Merge "user_tags: Remove 01-test target" 2010-09-23 11:21:14 -07:00
Dmitry Shmidt fb148d31ea Merge "user_tags: Remove 01-test target" into gingerbread 2010-09-23 11:06:42 -07:00
Ying Wang 31a957076b resolved conflicts for merge of 67e0c2a6 to master
Change-Id: I7940c7ae3dd1900180e4767f1c86957db4cf3a1f
2010-09-22 17:45:35 -07:00
Ying Wang 67e0c2a6bd resolved conflicts for merge of b368bba4 to gingerbread-plus-aosp
Change-Id: I50e3e45d2cd1d0a2c01f256e8f53ea4c8b2668c8
2010-09-22 17:34:05 -07:00
Ying Wang 3efd768a0d resolved conflicts for merge of 9f28f0d7 to master
Change-Id: I8fbf8846fcb41ca6cb5f3e362484ec895fe7f4aa
2010-09-22 17:19:11 -07:00
Ying Wang 9f28f0d76e am e7874c43: Integrate dexpreopt into the build system.
Merge commit 'e7874c430895b9a4e631c89f1e7729da9264d167' into gingerbread-plus-aosp

* commit 'e7874c430895b9a4e631c89f1e7729da9264d167':
  Integrate dexpreopt into the build system.
2010-09-22 16:57:01 -07:00
Ying Wang e7874c4308 Integrate dexpreopt into the build system.
Change-Id: Id67f85d0f5c8674f5bc22e431114ca73625811ef
2010-09-22 16:51:53 -07:00
Dmitry Shmidt 093766beb4 user_tags: Remove 01-test target
Auto-merge: no

Change-Id: I5e573660cdb4696951bcf62b611cfa71bb8395db
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-09-22 15:43:21 -07:00
Dmitry Shmidt 0bce270587 user_tags: Remove 01-test target
Change-Id: I3a523cdd8c79a4428077e01d6f6b7bbcc6fe29ec
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-09-22 15:35:43 -07:00
Ying Wang 1613f4ff1e resolved conflicts for merge of 554402f7 to master
Change-Id: Ia72f326ca91311c9eaa05aa4f5a134a60171cafb
2010-09-22 14:11:49 -07:00
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
Ying Wang 554402f76d am 38a3161d: String literal change.
Merge commit '38a3161dc7f5fec81df9412bc202c3962c74535d' into gingerbread-plus-aosp

* commit '38a3161dc7f5fec81df9412bc202c3962c74535d':
  String literal change.
2010-09-22 13:14:49 -07:00
Ying Wang 38a3161dc7 String literal change.
Change-Id: Ic1289ee3abb184b4617aa42c28e6eca812600463
2010-09-22 13:06:34 -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
Ying Wang b368bba41c Enforce 64-bit build environment
We will only support 64-bit build environment beyond froyo/2.2 .

Change-Id: I71eb1230bf0bc12ccde2aeda6255db6a87540437
2010-09-22 11:02:09 -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
android-build SharedAccount 9825eacd68 FRG83
Change-Id: I8d8fa5700e05930be8550f536561498010725fb4
2010-09-21 13:58:39 -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