Commit graph

3042 commits

Author SHA1 Message Date
Ying Wang
4f9c4f4dbb am 50d7d7a0: Fix private vars for host-dex rules.
Merge commit '50d7d7a0a68378d1b02b5d2a2514592ba0d65f84' into gingerbread-plus-aosp

* commit '50d7d7a0a68378d1b02b5d2a2514592ba0d65f84':
  Fix private vars for host-dex rules.
2010-09-23 16:42:38 -07:00
Ying Wang
50d7d7a0a6 Fix private vars for host-dex rules.
Change-Id: Ie374d3abf4c261b9c5e8b80ed464b4c6b1b52b42
2010-09-23 16:34:59 -07:00
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
fb148d31ea Merge "user_tags: Remove 01-test target" into gingerbread 2010-09-23 11:06:42 -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
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
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
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
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
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
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
Brian Swetland
c1a1aa1eb5 deal with gps renaming
Change-Id: I488de95880be1c4fadf23a2fb4f7e7eb686d52c2
2010-09-21 15:58:12 -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
android-build SharedAccount
9825eacd68 FRG83
Change-Id: I8d8fa5700e05930be8550f536561498010725fb4
2010-09-21 13:58:39 -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
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
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
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
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
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
android-build SharedAccount
df747a140b FRG78
Change-Id: I7de099f3c8650c05d70128313c3f46db5fcad2c0
2010-09-16 14:04:48 -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
2cb8d5ebb2 am c77a9ad4: store user-visible image sizes in target-files
Merge commit 'c77a9ad444d49e2ad777678cf5671f0a94f44ffb' into gingerbread-plus-aosp

* commit 'c77a9ad444d49e2ad777678cf5671f0a94f44ffb':
  store user-visible image sizes in target-files
2010-09-16 12:32:56 -07:00
Doug Zongker
c77a9ad444 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
2010-09-16 12:29:17 -07:00
Doug Zongker
df69250b75 am 8e8ff4ca: Merge "support for ext4/EMMC in target_files and OTA generation" into gingerbread
Merge commit '8e8ff4cad905a5b4eed7659152f075f9a5c038b1' into gingerbread-plus-aosp

* commit '8e8ff4cad905a5b4eed7659152f075f9a5c038b1':
  support for ext4/EMMC in target_files and OTA generation
2010-09-16 11:39:49 -07:00
Doug Zongker
8e8ff4cad9 Merge "support for ext4/EMMC in target_files and OTA generation" into gingerbread 2010-09-16 11:38:06 -07:00
Doug Zongker
c19a8d5590 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
2010-09-16 11:34:31 -07:00
Joe Onorato
61f23925d2 am 6022a978: Merge "DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off." into gingerbread
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.
2010-09-16 11:22:22 -07:00
Joe Onorato
6022a9786f Merge "DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off." into gingerbread 2010-09-16 11:17:37 -07:00
Joe Onorato
c0bad69b82 DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off.
Change-Id: I94652bad7084f3868049b4ea0e43bb90f86dba6f
2010-09-16 14:16:51 -04:00
Ying Wang
acff3464f8 am 671f5fb0: Don\'t increase partition size for ext4 user images. [DO NOT MERGE]
Merge commit '671f5fb09f3510c16f73049cad9d8d6d652eaad8' into gingerbread-plus-aosp

* commit '671f5fb09f3510c16f73049cad9d8d6d652eaad8':
  Don't increase partition size for ext4 user images. [DO NOT MERGE]
2010-09-16 10:59:41 -07:00