OSDN Git Service
Andy McFadden [Fri, 24 Sep 2010 22:55:42 +0000 (15:55 -0700)]
Andy McFadden [Fri, 24 Sep 2010 19:33:50 +0000 (12:33 -0700)]
am
6474811d: Fix sim-eng build.
Merge commit '
6474811d646153aeab111c1c0586b6ee53dcb0d2' into gingerbread-plus-aosp
* commit '
6474811d646153aeab111c1c0586b6ee53dcb0d2':
Fix sim-eng build.
Andy McFadden [Fri, 24 Sep 2010 19:04:17 +0000 (12:04 -0700)]
Fix sim-eng build.
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
Ficus Kirkpatrick [Fri, 24 Sep 2010 18:26:29 +0000 (11:26 -0700)]
am
954a5e60: am
e7f8140e: am
7978d50e: Add a workaround for a platform JAR parsing bug.
Merge commit '
954a5e606ba6af5aef514c2c4c0d3ea2554b48f9'
* commit '
954a5e606ba6af5aef514c2c4c0d3ea2554b48f9':
Add a workaround for a platform JAR parsing bug.
Ying Wang [Fri, 24 Sep 2010 18:20:56 +0000 (11:20 -0700)]
Merge "Add wpa_supplicant.conf to the core.mk"
Ying Wang [Fri, 24 Sep 2010 18:14:16 +0000 (11:14 -0700)]
Add wpa_supplicant.conf to the core.mk
Note that wpa_supplicant.conf will only be built only if the wpa_supplicant_conf.mk
is included with some conditionals.
Bug:
3003508
Change-Id: I3d1a705c5ff5fd23a8828d5aa756ab2e4edcf4d2
Ficus Kirkpatrick [Fri, 24 Sep 2010 18:09:40 +0000 (11:09 -0700)]
am
e7f8140e: am
7978d50e: Add a workaround for a platform JAR parsing bug.
Merge commit '
e7f8140e6df19840a6f2c4bc7063cc6c484b140f' into gingerbread-plus-aosp
* commit '
e7f8140e6df19840a6f2c4bc7063cc6c484b140f':
Add a workaround for a platform JAR parsing bug.
Ficus Kirkpatrick [Fri, 24 Sep 2010 17:58:04 +0000 (10:58 -0700)]
am
7978d50e: 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.
Ficus Kirkpatrick [Fri, 24 Sep 2010 05:57:05 +0000 (22:57 -0700)]
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
Ying Wang [Fri, 24 Sep 2010 04:41:18 +0000 (21:41 -0700)]
am
bbbed9e1: am
02c9813a: Prebuilt NDKs are merged for linux and darwin.
Merge commit '
bbbed9e1f1be3cd8327ba89f47e9bd628d92cbe2'
* commit '
bbbed9e1f1be3cd8327ba89f47e9bd628d92cbe2':
Prebuilt NDKs are merged for linux and darwin.
Ying Wang [Fri, 24 Sep 2010 04:40:00 +0000 (21:40 -0700)]
am
4f9c4f4d: am
50d7d7a0: Fix private vars for host-dex rules.
Merge commit '
4f9c4f4dbbd6ddedc7f8c61c35ea80953aa9d113'
* commit '
4f9c4f4dbbd6ddedc7f8c61c35ea80953aa9d113':
Fix private vars for host-dex rules.
Ying Wang [Fri, 24 Sep 2010 01:05:38 +0000 (18:05 -0700)]
am
02c9813a: Prebuilt NDKs are merged for linux and darwin.
Merge commit '
02c9813a726803e1c406b19f6b9dc4e411326e66' into gingerbread-plus-aosp
* commit '
02c9813a726803e1c406b19f6b9dc4e411326e66':
Prebuilt NDKs are merged for linux and darwin.
Ying Wang [Fri, 24 Sep 2010 00:59:36 +0000 (17:59 -0700)]
Prebuilt NDKs are merged for linux and darwin.
Change-Id: I0b632d7ba4df5b27dda36280b22dfd0b37e116b7
Ying Wang [Thu, 23 Sep 2010 23:42:38 +0000 (16:42 -0700)]
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.
Ying Wang [Thu, 23 Sep 2010 23:29:53 +0000 (16:29 -0700)]
Fix private vars for host-dex rules.
Change-Id: Ie374d3abf4c261b9c5e8b80ed464b4c6b1b52b42
Dmitry Shmidt [Thu, 23 Sep 2010 18:56:34 +0000 (11:56 -0700)]
am
56de6843: am
fb148d31: Merge "user_tags: Remove 01-test target" into gingerbread
Merge commit '
56de6843674898f72c87e4dc50156b9e9a26aee7'
* commit '
56de6843674898f72c87e4dc50156b9e9a26aee7':
user_tags: Remove 01-test target
Dmitry Shmidt [Thu, 23 Sep 2010 18:34:33 +0000 (11:34 -0700)]
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
Dmitry Shmidt [Thu, 23 Sep 2010 18:21:14 +0000 (11:21 -0700)]
Merge "user_tags: Remove 01-test target"
Dmitry Shmidt [Thu, 23 Sep 2010 18:06:42 +0000 (11:06 -0700)]
Merge "user_tags: Remove 01-test target" into gingerbread
Ying Wang [Thu, 23 Sep 2010 00:45:35 +0000 (17:45 -0700)]
resolved conflicts for merge of
67e0c2a6 to master
Change-Id: I7940c7ae3dd1900180e4767f1c86957db4cf3a1f
Ying Wang [Thu, 23 Sep 2010 00:34:05 +0000 (17:34 -0700)]
resolved conflicts for merge of
b368bba4 to gingerbread-plus-aosp
Change-Id: I50e3e45d2cd1d0a2c01f256e8f53ea4c8b2668c8
Ying Wang [Thu, 23 Sep 2010 00:19:11 +0000 (17:19 -0700)]
resolved conflicts for merge of
9f28f0d7 to master
Change-Id: I8fbf8846fcb41ca6cb5f3e362484ec895fe7f4aa
Ying Wang [Wed, 22 Sep 2010 23:57:01 +0000 (16:57 -0700)]
am
e7874c43: Integrate dexpreopt into the build system.
Merge commit '
e7874c430895b9a4e631c89f1e7729da9264d167' into gingerbread-plus-aosp
* commit '
e7874c430895b9a4e631c89f1e7729da9264d167':
Integrate dexpreopt into the build system.
Ying Wang [Fri, 17 Sep 2010 23:36:06 +0000 (16:36 -0700)]
Integrate dexpreopt into the build system.
Change-Id: Id67f85d0f5c8674f5bc22e431114ca73625811ef
Dmitry Shmidt [Wed, 22 Sep 2010 22:43:21 +0000 (15:43 -0700)]
user_tags: Remove 01-test target
Auto-merge: no
Change-Id: I5e573660cdb4696951bcf62b611cfa71bb8395db
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Wed, 22 Sep 2010 22:35:43 +0000 (15:35 -0700)]
user_tags: Remove 01-test target
Change-Id: I3a523cdd8c79a4428077e01d6f6b7bbcc6fe29ec
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Ying Wang [Wed, 22 Sep 2010 21:11:49 +0000 (14:11 -0700)]
resolved conflicts for merge of
554402f7 to master
Change-Id: Ia72f326ca91311c9eaa05aa4f5a134a60171cafb
Jesse Wilson [Wed, 22 Sep 2010 20:53:41 +0000 (13:53 -0700)]
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.
Ying Wang [Wed, 22 Sep 2010 20:14:49 +0000 (13:14 -0700)]
am
38a3161d: String literal change.
Merge commit '
38a3161dc7f5fec81df9412bc202c3962c74535d' into gingerbread-plus-aosp
* commit '
38a3161dc7f5fec81df9412bc202c3962c74535d':
String literal change.
Ying Wang [Wed, 22 Sep 2010 19:56:13 +0000 (12:56 -0700)]
String literal change.
Change-Id: Ic1289ee3abb184b4617aa42c28e6eca812600463
Jesse Wilson [Wed, 22 Sep 2010 18:55:29 +0000 (11:55 -0700)]
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.
Jesse Wilson [Wed, 22 Sep 2010 17:59:10 +0000 (10:59 -0700)]
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
Ying Wang [Thu, 8 Jul 2010 01:12:25 +0000 (18:12 -0700)]
Enforce 64-bit build environment
We will only support 64-bit build environment beyond froyo/2.2 .
Change-Id: I71eb1230bf0bc12ccde2aeda6255db6a87540437
Doug Zongker [Wed, 22 Sep 2010 17:22:14 +0000 (10:22 -0700)]
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)
Doug Zongker [Wed, 22 Sep 2010 17:18:33 +0000 (10:18 -0700)]
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)
Doug Zongker [Wed, 22 Sep 2010 17:12:54 +0000 (10:12 -0700)]
accommodate both new and old target-files when creating incrementals
(cherry-picked from gingerbread.)
Change-Id: I925bf122b0012302a85c0b6f04cca48eb694b0c4
Doug Zongker [Wed, 22 Sep 2010 17:12:54 +0000 (10:12 -0700)]
accommodate both new and old target-files when creating incrementals (do not merge)
Change-Id: Ibc211164bf1dee8275e15d10cbe81b63d666069f
Doug Zongker [Wed, 22 Sep 2010 03:10:32 +0000 (20:10 -0700)]
resolved conflicts for merge of
e1daf61d to master
Change-Id: Idf5767f68dd19b51940ea69528cdd389b04d56b9
Brian Swetland [Wed, 22 Sep 2010 00:44:08 +0000 (17:44 -0700)]
Doug Zongker [Wed, 22 Sep 2010 00:25:59 +0000 (17:25 -0700)]
am
ad806982: arg: system_size, not system_img
Merge commit '
ad806982c12b64d8dff040f5c9a444d810d7694c' into gingerbread-plus-aosp
* commit '
ad806982c12b64d8dff040f5c9a444d810d7694c':
arg: system_size, not system_img
Doug Zongker [Wed, 22 Sep 2010 00:22:14 +0000 (17:22 -0700)]
arg: system_size, not system_img
Change-Id: Iba5d10204c93159a4f12ea8e8d8687db5b9dd5ca
Doug Zongker [Wed, 22 Sep 2010 00:15:17 +0000 (17:15 -0700)]
Merge "fall back to MTD if no recovery.fstab is present"
Ying Wang [Tue, 21 Sep 2010 23:52:28 +0000 (16:52 -0700)]
Merge "Add a new layer generic_no_telephony.mk"
Ying Wang [Tue, 21 Sep 2010 23:08:26 +0000 (16:08 -0700)]
Add a new layer generic_no_telephony.mk
Bug:
2994028
Change-Id: I2a1831bb8dd1245c6cc0116738c118fe895b6e43
Brian Swetland [Tue, 21 Sep 2010 23:16:47 +0000 (16:16 -0700)]
am
c1a1aa1e: deal with gps renaming
Merge commit '
c1a1aa1eb5f2a6b9e45304b76da01802b5520c18' into gingerbread-plus-aosp
* commit '
c1a1aa1eb5f2a6b9e45304b76da01802b5520c18':
deal with gps renaming
Doug Zongker [Tue, 21 Sep 2010 23:12:55 +0000 (16:12 -0700)]
fall back to MTD if no recovery.fstab is present
Needed for non-device builds (like for the emulator) to work.
Change-Id: I5fdbfb3af34821811744e8ce5bf1eff8df344c73
Brian Swetland [Tue, 21 Sep 2010 22:58:12 +0000 (15:58 -0700)]
deal with gps renaming
Change-Id: I488de95880be1c4fadf23a2fb4f7e7eb686d52c2
Doug Zongker [Tue, 21 Sep 2010 21:46:48 +0000 (14:46 -0700)]
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)
Doug Zongker [Tue, 21 Sep 2010 21:37:19 +0000 (14:37 -0700)]
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)
Doug Zongker [Tue, 21 Sep 2010 21:25:51 +0000 (14:25 -0700)]
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
Doug Zongker [Tue, 21 Sep 2010 01:04:41 +0000 (18:04 -0700)]
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
Doug Zongker [Tue, 21 Sep 2010 18:41:05 +0000 (11:41 -0700)]
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)
Doug Zongker [Tue, 21 Sep 2010 18:37:10 +0000 (11:37 -0700)]
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)
Doug Zongker [Tue, 21 Sep 2010 01:04:41 +0000 (18:04 -0700)]
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
Steve Howard [Mon, 20 Sep 2010 18:57:10 +0000 (11:57 -0700)]
am
1a297b84: am
1020d271: Add new downloads UI to core build.
Merge commit '
1a297b84c8e293a7cd7e2e743d4bf5d0068d8fba'
* commit '
1a297b84c8e293a7cd7e2e743d4bf5d0068d8fba':
Add new downloads UI to core build.
Steve Howard [Mon, 20 Sep 2010 18:52:57 +0000 (11:52 -0700)]
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.
Steve Howard [Fri, 17 Sep 2010 01:15:02 +0000 (18:15 -0700)]
Add new downloads UI to core build.
Change-Id: I96a3bb10beb6c1ec9c48baa2e2039aab7c421b09
Joe Onorato [Sun, 19 Sep 2010 16:21:27 +0000 (09:21 -0700)]
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.
Joe Onorato [Sun, 19 Sep 2010 16:12:39 +0000 (09:12 -0700)]
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.
Joe Onorato [Sun, 19 Sep 2010 16:04:23 +0000 (12:04 -0400)]
Brian's vendor/ change requires a clean build.
Change-Id: I074fe1ec176dc005adcd79eaf7c91cc3b8d3f54c
Doug Zongker [Fri, 17 Sep 2010 15:24:37 +0000 (08:24 -0700)]
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
Doug Zongker [Fri, 17 Sep 2010 14:48:28 +0000 (07:48 -0700)]
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
Doug Zongker [Fri, 17 Sep 2010 14:46:07 +0000 (07:46 -0700)]
Merge "remove remaining refs to max_image_sizes" into gingerbread
Doug Zongker [Fri, 17 Sep 2010 14:44:38 +0000 (07:44 -0700)]
remove remaining refs to max_image_sizes
Change-Id: I7e4686bc06f9c3eab2df34d092021c549738b217
Brian Carlstrom [Fri, 17 Sep 2010 06:23:26 +0000 (23:23 -0700)]
am
cec75adb: am
c05d0000: Only turn host build on for linux
Merge commit '
cec75adb645fdd7535370bbb996039b2a3f3d0b7'
* commit '
cec75adb645fdd7535370bbb996039b2a3f3d0b7':
Only turn host build on for linux
Doug Zongker [Fri, 17 Sep 2010 06:13:11 +0000 (23:13 -0700)]
resolved conflicts for merge of
813ad17a to master
Change-Id: I3fc84babbbcab712c5e38a0c8b815115ba89375f
Brian Carlstrom [Fri, 17 Sep 2010 05:49:10 +0000 (22:49 -0700)]
Only turn host build on for linux
Change-Id: I2d3b16f7881ad82cf272a40213dd4e173f54baa0
Brian Carlstrom [Fri, 17 Sep 2010 05:13:50 +0000 (22:13 -0700)]
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
Brian Carlstrom [Fri, 17 Sep 2010 04:49:01 +0000 (21:49 -0700)]
Only turn host build on for linux
Change-Id: I595948b159bc6a2bf295fd11ab831f978e38c799
Doug Zongker [Fri, 17 Sep 2010 01:11:59 +0000 (18:11 -0700)]
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
Doug Zongker [Fri, 17 Sep 2010 01:09:23 +0000 (18:09 -0700)]
Merge "consolidate target_files metadata into one key-value file" into gingerbread
Jesse Wilson [Fri, 17 Sep 2010 00:57:47 +0000 (17:57 -0700)]
resolved conflicts for merge of
d9de6588 to master
Change-Id: I3d7d6744b4f0d7c10bf001c87c0abbb4cb6885ef
Jesse Wilson [Fri, 17 Sep 2010 00:48:29 +0000 (17:48 -0700)]
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.
Doug Zongker [Fri, 17 Sep 2010 00:44:38 +0000 (17:44 -0700)]
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
Jesse Wilson [Thu, 16 Sep 2010 21:56:08 +0000 (14:56 -0700)]
Include dalvik+libcore dependencies in core product definitions.
Also conditionally include host-only dependencies when the host is
being built.
Change-Id: I0e8c9c1bef5ee60d4c1ce1c158f41b7642f9a8f2
Doug Zongker [Thu, 16 Sep 2010 21:01:56 +0000 (14:01 -0700)]
only do size check for yaffs images; fix incremental info dict
Change-Id: Ic862000a23b93289604b0737bfcaf8d461f36ff8
Doug Zongker [Thu, 16 Sep 2010 20:08:25 +0000 (13:08 -0700)]
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)
Doug Zongker [Thu, 16 Sep 2010 20:04:07 +0000 (13:04 -0700)]
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)
Doug Zongker [Thu, 16 Sep 2010 20:01:26 +0000 (13:01 -0700)]
allow partition sizes in hex (when prefixed with 0x)
Change-Id: I806879fd496304c449ff5315b0ef48fd766d6428
Doug Zongker [Thu, 16 Sep 2010 19:38:40 +0000 (12:38 -0700)]
resolved conflicts for merge of
2cb8d5eb to master
Change-Id: I3b1aec1aee7c6bfcee2e978b4755b2bae9e480c4
Doug Zongker [Thu, 16 Sep 2010 19:32:56 +0000 (12:32 -0700)]
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
Doug Zongker [Thu, 16 Sep 2010 18:28:43 +0000 (11:28 -0700)]
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
Dima Zavin [Thu, 16 Sep 2010 19:07:47 +0000 (12:07 -0700)]
Merge "core: propogate module tags for prebuilts"
Doug Zongker [Thu, 16 Sep 2010 18:56:12 +0000 (11:56 -0700)]
am
df69250b: (-s ours) am
8e8ff4ca: Merge "support for ext4/EMMC in target_files and OTA generation" into gingerbread
Merge commit '
df69250b75c38e726ea7392c39349d9ef654fac6'
* commit '
df69250b75c38e726ea7392c39349d9ef654fac6':
support for ext4/EMMC in target_files and OTA generation
Doug Zongker [Thu, 16 Sep 2010 18:39:49 +0000 (11:39 -0700)]
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
Doug Zongker [Thu, 16 Sep 2010 18:38:06 +0000 (11:38 -0700)]
Merge "support for ext4/EMMC in target_files and OTA generation" into gingerbread
Joe Onorato [Thu, 16 Sep 2010 18:35:31 +0000 (11:35 -0700)]
am
61f23925: (-s ours) 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 '
61f23925d2d0b27ad5a62587c0f9d5e4a6040acc'
* commit '
61f23925d2d0b27ad5a62587c0f9d5e4a6040acc':
DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off.
Doug Zongker [Thu, 1 Jul 2010 22:30:11 +0000 (15:30 -0700)]
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
Ying Wang [Thu, 16 Sep 2010 18:32:20 +0000 (11:32 -0700)]
am
acff3464: (-s ours) am
671f5fb0: Don\'t increase partition size for ext4 user images. [DO NOT MERGE]
Merge commit '
acff3464f84d0eaca8d167c4a9daddf4fc7ca8d2'
* commit '
acff3464f84d0eaca8d167c4a9daddf4fc7ca8d2':
Don't increase partition size for ext4 user images. [DO NOT MERGE]
Joe Onorato [Thu, 16 Sep 2010 18:22:22 +0000 (11:22 -0700)]
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.
Joe Onorato [Thu, 16 Sep 2010 18:17:37 +0000 (11:17 -0700)]
Merge "DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off." into gingerbread
Joe Onorato [Thu, 16 Sep 2010 18:16:51 +0000 (14:16 -0400)]
DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off.
Change-Id: I94652bad7084f3868049b4ea0e43bb90f86dba6f
Ying Wang [Thu, 16 Sep 2010 17:59:41 +0000 (10:59 -0700)]
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]
Joe Onorato [Thu, 16 Sep 2010 17:56:38 +0000 (10:56 -0700)]
am
2818a2e5: (-s ours) am
27ce8811: DO NOT MERGE - Remove extra printf
Merge commit '
2818a2e555df6738fd6434a6e78a48c2acc2aba1'
* commit '
2818a2e555df6738fd6434a6e78a48c2acc2aba1':
DO NOT MERGE - Remove extra printf
Ying Wang [Thu, 16 Sep 2010 17:54:03 +0000 (10:54 -0700)]
Don't increase partition size for ext4 user images. [DO NOT MERGE]
Change-Id: I5b82e6f7bd1c25ce3b1a4c16409b61aa1be7f71f
Joe Onorato [Thu, 16 Sep 2010 16:43:23 +0000 (09:43 -0700)]
am
ca378ad4: (-s ours) am
25ab3dcc: Merge "DO NOT MERGE - Add a -knowntags option to droiddoc" into gingerbread
Merge commit '
ca378ad41295ed23e3dce9d9ce824e5b1ab0bffb'
* commit '
ca378ad41295ed23e3dce9d9ce824e5b1ab0bffb':
DO NOT MERGE - Add a -knowntags option to droiddoc
Joe Onorato [Thu, 16 Sep 2010 16:43:20 +0000 (09:43 -0700)]
am
d68519af: am
9e59ec29: Merge "Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules." into gingerbread
Merge commit '
d68519af91198164d6f302ea53656649f23cdca9'
* commit '
d68519af91198164d6f302ea53656649f23cdca9':
Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules.
Joe Onorato [Thu, 16 Sep 2010 16:36:47 +0000 (09:36 -0700)]
am
27ce8811: DO NOT MERGE - Remove extra printf
Merge commit '
27ce8811835e9bbc9e230a618e883d30d0101c9e' into gingerbread-plus-aosp
* commit '
27ce8811835e9bbc9e230a618e883d30d0101c9e':
DO NOT MERGE - Remove extra printf
Joe Onorato [Thu, 16 Sep 2010 16:34:07 +0000 (12:34 -0400)]
DO NOT MERGE - Remove extra printf
Change-Id: I8a2e4fac78010fe531b080d3555557e557c038b9
Joe Onorato [Thu, 16 Sep 2010 16:27:31 +0000 (09:27 -0700)]
am
25ab3dcc: Merge "DO NOT MERGE - Add a -knowntags option to droiddoc" into gingerbread
Merge commit '
25ab3dcce40bc2d19eeb99c7b36eeab52e4fa582' into gingerbread-plus-aosp
* commit '
25ab3dcce40bc2d19eeb99c7b36eeab52e4fa582':
DO NOT MERGE - Add a -knowntags option to droiddoc
OSDN Git Service
