Commit graph

1162 commits

Author SHA1 Message Date
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
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
b984ae51e5 resolved conflicts for merge of 813ad17a to master
Change-Id: I3fc84babbbcab712c5e38a0c8b815115ba89375f
2010-09-16 23:13:11 -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
f127eb709b resolved conflicts for merge of 2cb8d5eb to master
Change-Id: I3b1aec1aee7c6bfcee2e978b4755b2bae9e480c4
2010-09-16 12:38:40 -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
Dima Zavin
2e8730e341 Merge "core: propogate module tags for prebuilts" 2010-09-16 12:07:47 -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
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
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
Ying Wang
671f5fb09f Don't increase partition size for ext4 user images. [DO NOT MERGE]
Change-Id: I5b82e6f7bd1c25ce3b1a4c16409b61aa1be7f71f
2010-09-16 10:54:03 -07:00
Joe Onorato
8b566d137d 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.
2010-09-16 09:43:20 -07:00
Joe Onorato
d68519af91 am 9e59ec29: Merge "Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules." into gingerbread
Merge commit '9e59ec29933a4e6e9ee740fd180e4e31ff687fae' into gingerbread-plus-aosp

* commit '9e59ec29933a4e6e9ee740fd180e4e31ff687fae':
  Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules.
2010-09-16 09:27:24 -07:00
Joe Onorato
9e59ec2993 Merge "Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules." into gingerbread 2010-09-16 09:02:17 -07:00
Joe Onorato
f58df74f6a Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules.
Change-Id: I568b416efe5ccefac6b5e6e99ddccc23600b1f74
2010-09-16 11:57:19 -04:00
Dima Zavin
d2ebc18698 core: propogate module tags for prebuilts
Change-Id: If46558dc783b72a1baf3e8e1df167cb75c67e944
Signed-off-by: Dima Zavin <dima@android.com>
2010-09-15 22:03:38 -07:00
Jean-Baptiste Queru
9090c4c1d7 am da21ccf8: Grandfather the simulator-specific modules. do not merge.
Merge commit 'da21ccf86c31fb060b5a259342fb0bfbb0362f8b' into gingerbread-plus-aosp

* commit 'da21ccf86c31fb060b5a259342fb0bfbb0362f8b':
  Grandfather the simulator-specific modules. do not merge.
2010-09-15 20:05:41 -07:00
Jean-Baptiste Queru
da21ccf86c Grandfather the simulator-specific modules. do not merge.
Those aren't new modules that were added recently, they just never got
considered when generating the original list of grandfathered modules

Change-Id: I0e6ff940936454048b59c0fc38e24e533e8598ae
2010-09-15 19:57:17 -07:00
Jean-Baptiste Queru
a2959d5eec Grandfather the simulator-specific modules.
Those aren't new modules that were added recently, they just never got
considered when generating the original list of grandfathered modules

Change-Id: I01c63f57be71146671cd3a7445baa774163262d8
2010-09-15 19:51:50 -07:00
Jean-Baptiste Queru
88a873a8c5 am 05ad00ea: am 5890600d: Add a better explanation about how to deal with user modules
Merge commit '05ad00eac9edda58c5cd3110853a6b93d6cc4e89'

* commit '05ad00eac9edda58c5cd3110853a6b93d6cc4e89':
  Add a better explanation about how to deal with user modules
2010-09-15 19:02:26 -07:00
Doug Zongker
fbb920ad91 am bc843297: am 135a120e: remove the system board name from the build fingerprint
Merge commit 'bc84329757c6b79e1f10c418057e599ee106135c'

* commit 'bc84329757c6b79e1f10c418057e599ee106135c':
  remove the system board name from the build fingerprint
2010-09-15 17:54:07 -07:00
Ying Wang
0153446b79 am 6674ec30: am 659adc0b: Merge "Change "make PRODUCT-XXX-tests" to build only tests-build-target" into gingerbread
Merge commit '6674ec30bb92337e3bccb67bca53555a798a493f'

* commit '6674ec30bb92337e3bccb67bca53555a798a493f':
  Change "make PRODUCT-XXX-tests" to build only tests-build-target
2010-09-15 17:53:22 -07:00
Jean-Baptiste Queru
05ad00eac9 am 5890600d: Add a better explanation about how to deal with user modules
Merge commit '5890600dac385941b6a4c6b6d0b230c1f13d54fa' into gingerbread-plus-aosp

* commit '5890600dac385941b6a4c6b6d0b230c1f13d54fa':
  Add a better explanation about how to deal with user modules
2010-09-15 14:42:46 -07:00
Jean-Baptiste Queru
5890600dac Add a better explanation about how to deal with user modules
Change-Id: Ib79cc0f4b47648daa18db97aa949cd167c8d44a9
2010-09-15 14:29:14 -07:00
Jean-Baptiste Queru
868391e565 Manual merge into master
Change-Id: Ib71bf36e1205e0bbf1f375cee4a28bceaba60c97
2010-09-15 14:25:11 -07:00
Doug Zongker
bc84329757 am 135a120e: remove the system board name from the build fingerprint
Merge commit '135a120e3904d782623e4a3fc958ed098e8de384' into gingerbread-plus-aosp

* commit '135a120e3904d782623e4a3fc958ed098e8de384':
  remove the system board name from the build fingerprint
2010-09-15 13:14:26 -07:00
Doug Zongker
135a120e39 remove the system board name from the build fingerprint
Change-Id: I4cbbd03084b6ac24184b7475be3d34130094667d
2010-09-15 13:11:19 -07:00
Ying Wang
6674ec30bb am 659adc0b: Merge "Change "make PRODUCT-XXX-tests" to build only tests-build-target" into gingerbread
Merge commit '659adc0b54e40b3b194c84ad4ac8d2e775276e60' into gingerbread-plus-aosp

* commit '659adc0b54e40b3b194c84ad4ac8d2e775276e60':
  Change "make PRODUCT-XXX-tests" to build only tests-build-target
2010-09-15 11:58:41 -07:00
Ying Wang
659adc0b54 Merge "Change "make PRODUCT-XXX-tests" to build only tests-build-target" into gingerbread 2010-09-15 11:52:34 -07:00
Jean-Baptiste Queru
d64e5a2eef Fail the build when using a user tag on a non-legacy module.
The supported mechanism is to explicitly add the module
name to the PRODUCT_PACKAGES of the relevant product definitions.

Change-Id: Ic754446e15965d468d1bbe85864275e2cda9b3aa
2010-09-15 10:50:27 -07:00
Jean-Baptiste Queru
f9a6571c34 Merge "Grandfather in a few more modules" 2010-09-15 10:49:52 -07:00
Jean-Baptiste Queru
0973350a3a Grandfather in a few more modules
Change-Id: Ib8fe72fd91e432219323523f6c242cb6210145cc
2010-09-15 10:48:47 -07:00
Joe Onorato
42c3ac6e04 Merge "Add option to fail when Android.mk files change PRODUCT_* variables." 2010-09-15 10:23:32 -07:00
Jean-Baptiste Queru
4555fb9c2e am 78c5ff6d: another module that needs to be grandfathered in
Merge commit '78c5ff6d376afc6a1a5fab8a7a24be00211c2d35' into gingerbread-plus-aosp

* commit '78c5ff6d376afc6a1a5fab8a7a24be00211c2d35':
  another module that needs to be grandfathered in
2010-09-15 09:48:01 -07:00
Jean-Baptiste Queru
78c5ff6d37 another module that needs to be grandfathered in
Change-Id: I37e0e0ae0056a2315e1102f79fd923143928f6fe
2010-09-15 09:43:42 -07:00
Jean-Baptiste Queru
81503a1fd7 am 0dfcdcb8: another module that needs to be grandfathered in
Merge commit '0dfcdcb8b4e76ab1ae3f9086e59b5d30e42b8394' into gingerbread-plus-aosp

* commit '0dfcdcb8b4e76ab1ae3f9086e59b5d30e42b8394':
  another module that needs to be grandfathered in
2010-09-15 09:25:36 -07:00
Jean-Baptiste Queru
0dfcdcb8b4 another module that needs to be grandfathered in
Change-Id: Ibf24b4507b0c367117c33476a07d7189aeb3dff7
2010-09-15 09:22:52 -07:00
Jean-Baptiste Queru
e3dccb5f62 am 6dc2a832: another module that needs to be grandfathered in
Merge commit '6dc2a832508c08c12cb30a6bc2beb8101107cc68' into gingerbread-plus-aosp

* commit '6dc2a832508c08c12cb30a6bc2beb8101107cc68':
  another module that needs to be grandfathered in
2010-09-15 08:16:34 -07:00
Jean-Baptiste Queru
6dc2a83250 another module that needs to be grandfathered in
Change-Id: I024ba177e6ca4745e38feb2395e57c46354c2eea
2010-09-15 08:06:05 -07:00
Ying Wang
db2cb63612 Change "make PRODUCT-XXX-tests" to build only tests-build-target
Change-Id: Ib1a1a7b09ea6f1c3eea84394dcd6e3ebcda81e1a
2010-09-14 16:32:12 -07:00
Jean-Baptiste Queru
2b3b26f5b1 am 32afccc7: Revert "Default host module tag to optional."
Merge commit '32afccc732a6d7c631d2ba4d8a818fcbe2162903' into gingerbread-plus-aosp

* commit '32afccc732a6d7c631d2ba4d8a818fcbe2162903':
  Revert "Default host module tag to optional."
2010-09-14 13:27:46 -07:00
Jean-Baptiste Queru
423c15c25b Revert "Default host module tag to optional."
This reverts commit 528362f074.
2010-09-14 13:27:12 -07:00