255c390559
am a9722e29: am 9782fc4c: am 46fbaa56: Merge "Exclude OTA/bin tools when using A/B OTA updater"
...
* commit 'a9722e29278710c32d84604fd338a4e05ebbb320':
Exclude OTA/bin tools when using A/B OTA updater
2015-10-03 02:05:31 +00:00
a9722e2927
am 9782fc4c: am 46fbaa56: Merge "Exclude OTA/bin tools when using A/B OTA updater"
...
* commit '9782fc4cddac3e31e1e08b1ec86fc61c84a943ec':
Exclude OTA/bin tools when using A/B OTA updater
2015-10-03 02:02:38 +00:00
9782fc4cdd
am 46fbaa56: Merge "Exclude OTA/bin tools when using A/B OTA updater"
...
* commit '46fbaa564071e682e3cef7580723249af153ca71':
Exclude OTA/bin tools when using A/B OTA updater
2015-10-03 01:55:34 +00:00
48e49f592f
Exclude OTA/bin tools when using A/B OTA updater
...
The OTA/bin tools are not needed in the target files zip when using
the A/B OTA updater.
Bug: 24577767
Change-Id: I7938a906e4d73709aaa944e8065f922536072e27
2015-10-02 17:23:14 -07:00
4d387d00f0
am f9bd3d82: am 35907067: am e89dd69c: Merge "Pack META/ab_partitions.txt when using the A/B OTA updater."
...
* commit 'f9bd3d82f1a6451fc9c1f7e3a4017bdc1d13bc58':
Pack META/ab_partitions.txt when using the A/B OTA updater.
2015-10-02 03:57:48 +00:00
f9bd3d82f1
am 35907067: am e89dd69c: Merge "Pack META/ab_partitions.txt when using the A/B OTA updater."
...
* commit '3590706735ac41b6956ef07de20cac3994a046f2':
Pack META/ab_partitions.txt when using the A/B OTA updater.
2015-10-02 03:52:50 +00:00
3590706735
am e89dd69c: Merge "Pack META/ab_partitions.txt when using the A/B OTA updater."
...
* commit 'e89dd69c7632e23bf1cf7db5be1cf1b0f6f345f8':
Pack META/ab_partitions.txt when using the A/B OTA updater.
2015-10-02 03:46:07 +00:00
8925d334c3
Pack META/ab_partitions.txt when using the A/B OTA updater.
...
The list of A/B partitions updated is product-specific. Normally you
would update boot and system, but the product could require to update
other partitions during a system update. This patch packages the list
of A/B partitions configured to be updated when using the A/B updater.
The list can be set in the product makefile by setting the make
variable UPDATE_AB_PARTITIONS.
Bug: 24387863
Test: `make dist` creates the META/ab_partitions.txt in the target_files.zip
Change-Id: I4226ab05c7c7cd74721b06f1da64c6cf4d0e52ac
2015-10-01 19:31:18 -07:00
33e07c993e
am 48ab56c5: am dbfe5a7e: am 06ba28c3: Merge "Pack the update_engine_config.txt when using the A/B OTA updater."
...
* commit '48ab56c5cda3d35f885ae50ac2d20567c28ab203':
Pack the update_engine_config.txt when using the A/B OTA updater.
2015-09-30 20:24:17 +00:00
48ab56c5cd
am dbfe5a7e: am 06ba28c3: Merge "Pack the update_engine_config.txt when using the A/B OTA updater."
...
* commit 'dbfe5a7ecb3d891201ffcb255d4d6af62b5d07ff':
Pack the update_engine_config.txt when using the A/B OTA updater.
2015-09-30 20:16:46 +00:00
dbfe5a7ecb
am 06ba28c3: Merge "Pack the update_engine_config.txt when using the A/B OTA updater."
...
* commit '06ba28c31e9bea93ae3e3994bfe766a0a4a0073e':
Pack the update_engine_config.txt when using the A/B OTA updater.
2015-09-30 20:10:45 +00:00
70067acd66
Pack the update_engine_config.txt when using the A/B OTA updater.
...
This config file pulled directly from the source specifies the update
payload version supported by the code. When generating an incremental
update payload for the A/B updater, the generated payload format will
match the version supported by the old version.
Bug: 24406755
Test: `make dist` on Brillo.
Change-Id: Ib7ac6828d0d34eb31e786dbaae5d59ecf26c3576
2015-09-30 09:54:36 -07:00
863ae6e6dd
am 54fee2c4: am 5bd910a5: am 7e9b4ec4: Merge "Pack libdivsufsort.so into otatools.zip."
...
* commit '54fee2c40761d7636f960afe07b4d28a5cf01ddd':
Pack libdivsufsort.so into otatools.zip.
2015-09-29 17:53:50 +00:00
54fee2c407
am 5bd910a5: am 7e9b4ec4: Merge "Pack libdivsufsort.so into otatools.zip."
...
* commit '5bd910a56e90025539abe432e01c72f3bea15a2d':
Pack libdivsufsort.so into otatools.zip.
2015-09-29 17:47:49 +00:00
5bd910a56e
am 7e9b4ec4: Merge "Pack libdivsufsort.so into otatools.zip."
...
* commit '7e9b4ec44c63cb2e89388250aa6547aa6eddcab8':
Pack libdivsufsort.so into otatools.zip.
2015-09-29 17:42:44 +00:00
f6d83021d4
Pack libdivsufsort.so into otatools.zip.
...
This is to support the change to bsdiff which depends on
libdivsufsort.so and libdivsufsort64.so now.
Bug: 24332905
Change-Id: I232fc1b2abda67456f012a83fa4f69a99bc6ea14
2015-09-28 16:42:51 -07:00
c8adb6cbb8
am 6a6f1850: am db4cba4a: am 562ad0b5: Merge "Package breakpad symbols in target files zip"
...
* commit '6a6f18506900c67f822cbc7523c04ea6e0a45e72':
Package breakpad symbols in target files zip
2015-09-28 20:37:07 +00:00
6a6f185069
am db4cba4a: am 562ad0b5: Merge "Package breakpad symbols in target files zip"
...
* commit 'db4cba4a084c545e692c324abe26be33b0c3434b':
Package breakpad symbols in target files zip
2015-09-28 20:30:51 +00:00
db4cba4a08
am 562ad0b5: Merge "Package breakpad symbols in target files zip"
...
* commit '562ad0b5e4f5d49fc62e72ca1d6eb18acab6e90b':
Package breakpad symbols in target files zip
2015-09-28 20:24:32 +00:00
dfbab49bed
Package breakpad symbols in target files zip
...
When BREAKPAD_GENERATE_SYMBOLS is set to true, package the breakpad
symbols into the target files zip thats generated with `make dist`.
Bug: 24165970
Change-Id: I11c0d9a9d9e159475bfdb7bc338f9e9ac60aeada
2015-09-25 18:34:15 -07:00
c67c548ecd
am f0f8bc21: am d6679fbc: am 9412efdc: Merge "Don\'t build otatools.zip if we don\'t build the ota package."
...
* commit 'f0f8bc2118a96a2b929e1bae5e3154cb846b6a4f':
Don't build otatools.zip if we don't build the ota package.
2015-09-22 20:57:42 +00:00
f0f8bc2118
am d6679fbc: am 9412efdc: Merge "Don\'t build otatools.zip if we don\'t build the ota package."
...
* commit 'd6679fbc7e3fdafa4b8b2f554f5f53fef00af696':
Don't build otatools.zip if we don't build the ota package.
2015-09-22 18:56:57 +00:00
d6679fbc7e
am 9412efdc: Merge "Don\'t build otatools.zip if we don\'t build the ota package."
...
* commit '9412efdc1b9f54e1bc8df3ea3e8e34b7d899cc70':
Don't build otatools.zip if we don't build the ota package.
2015-09-22 18:50:52 +00:00
bd2d024778
Don't build otatools.zip if we don't build the ota package.
...
Also added flag TARGET_SKIP_OTA_PACKAGE to allow product to skip ota
package.
Bug: 24295339
Change-Id: Ib613ed747528661a6572b577cd54ccb6c2d1fdc8
2015-09-22 11:41:59 -07:00
186a89f2c1
am 1cb3285e: am f267f714: am 908260a5: Merge "Add support of SANITIZE_TARGET=\'address coverage\' for fuzzing."
...
* commit '1cb3285e8d0e404d72f4b732d1346c0c23a797a7':
Add support of SANITIZE_TARGET='address coverage' for fuzzing.
2015-09-19 20:07:33 +00:00
1cb3285e8d
am f267f714: am 908260a5: Merge "Add support of SANITIZE_TARGET=\'address coverage\' for fuzzing."
...
* commit 'f267f7147fe74b6d523b8f3b700bef276f2782bb':
Add support of SANITIZE_TARGET='address coverage' for fuzzing.
2015-09-18 20:41:48 +00:00
f267f7147f
am 908260a5: Merge "Add support of SANITIZE_TARGET=\'address coverage\' for fuzzing."
...
* commit '908260a56631cad51196c7b197f720bc88d7f5c7':
Add support of SANITIZE_TARGET='address coverage' for fuzzing.
2015-09-18 20:31:54 +00:00
74b32b8dfc
Add support of SANITIZE_TARGET='address coverage' for fuzzing.
...
Also, add trace-cmp instrumentation to fuzz_test and host_fuzz_test.
Bug: 22850550
Change-Id: Ifff7b8be693ae991feb0a64e19439370a19b2748
2015-09-18 11:54:43 -07:00
ec4d46f74e
am 8b037b67: am 942672d8: am 45075cf6: Merge "Generate installed-files-vendor.txt"
...
* commit '8b037b6765ac6390e0fe6217aba9eac592f2a108':
Generate installed-files-vendor.txt
2015-09-16 02:39:29 +00:00
8b037b6765
am 942672d8: am 45075cf6: Merge "Generate installed-files-vendor.txt"
...
* commit '942672d82b7be88c252ff4c979039eb40349cef0':
Generate installed-files-vendor.txt
2015-09-15 23:21:11 +00:00
942672d82b
am 45075cf6: Merge "Generate installed-files-vendor.txt"
...
* commit '45075cf623fc59930594ac27c675cd43e36975b1':
Generate installed-files-vendor.txt
2015-09-15 23:10:16 +00:00
8da19e3688
Generate installed-files-vendor.txt
...
Similar to installed-files.txt, installed-files-vendor.txt lists the
content of vendor.img.
Bug: 24009297
Change-Id: Ib8112b19cc9f54d0c0d6a829063e4fe72d8ce664
2015-09-15 14:24:00 -07:00
23bf2ba887
am 04ae3520: am d88eaf02: am 123a7d38: Merge "build: Don\'t call make_recovery_patch if there\'s no recovery."
...
* commit '04ae3520a2e6cf44933a565fed6e478e60cdda9b':
build: Don't call make_recovery_patch if there's no recovery.
2015-08-19 03:10:29 +00:00
04ae3520a2
am d88eaf02: am 123a7d38: Merge "build: Don\'t call make_recovery_patch if there\'s no recovery."
...
* commit 'd88eaf025543c3e5360fb22f1d142133621b117e':
build: Don't call make_recovery_patch if there's no recovery.
2015-08-19 02:47:48 +00:00
42a2b83c53
am d88eaf02: am 123a7d38: Merge "build: Don\'t call make_recovery_patch if there\'s no recovery."
...
* commit 'd88eaf025543c3e5360fb22f1d142133621b117e':
build: Don't call make_recovery_patch if there's no recovery.
2015-08-19 02:46:41 +00:00
cbc6dc29d6
build: Don't call make_recovery_patch if there's no recovery.
...
Change-Id: Iea1bd529eca9cd607da3b420bc4287f95c18219d
2015-08-18 18:28:47 -07:00
dd122b1ea2
am 014719fc: resolved conflicts for merge of 05fae7e0 to mnc-dr-dev-plus-aosp
...
* commit '014719fcfc240910fa216c39826b95d712468183':
Use repeatable timestamps
2015-08-18 04:15:47 +00:00
9cf990beec
resolved conflicts for merge of 05fae7e0 to mnc-dev-plus-aosp
...
Change-Id: I9f0f1169839afabc7ec7e439b668798e2cd111a3
2015-08-17 20:50:48 -07:00
014719fcfc
resolved conflicts for merge of 05fae7e0 to mnc-dr-dev-plus-aosp
...
Change-Id: I32919ab1e3cd5f84d09180125a7294bcfa35549e
2015-08-17 20:44:29 -07:00
e65107508a
Merge "Use repeatable timestamps"
2015-08-18 03:30:11 +00:00
5971fe3476
Merge commit '68e0bbf9'
...
Change-Id: I04f361807f8568bc87c4d035d52594eff16955fa
2015-08-12 18:54:45 -07:00
68e0bbf998
am 59a76529: am 6ff3e53f: am 897f3ba8: am 25abc5a3: Merge "Fix issie #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit '59a7652985c6e49478348c6643b491275f1dc8f3':
Fix issie #23116383 : Include security patch level in Settings
2015-08-13 01:18:07 +00:00
897f3ba8b1
am 25abc5a3: Merge "Fix issie #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit '25abc5a38e2e7f2962463aa4e5cd407ecdde689c':
Fix issie #23116383 : Include security patch level in Settings
2015-08-13 00:54:30 +00:00
42ebdfc574
am 25abc5a3: Merge "Fix issie #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit '25abc5a38e2e7f2962463aa4e5cd407ecdde689c':
Fix issie #23116383 : Include security patch level in Settings
2015-08-13 00:53:51 +00:00
0933e17bb6
am cd8f838d: am c85364c9: am 5f79bcdd: Merge changes from topic \'file_contexts.bin\'
...
* commit 'cd8f838d079b38d8c125396f7932c4be24063193':
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
2015-08-13 00:10:36 +00:00
cd8f838d07
am c85364c9: am 5f79bcdd: Merge changes from topic \'file_contexts.bin\'
...
* commit 'c85364c9c91961461a6d81a37c8b30b34b02383b':
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
2015-08-13 00:01:09 +00:00
420662b9cd
am c85364c9: am 5f79bcdd: Merge changes from topic \'file_contexts.bin\'
...
* commit 'c85364c9c91961461a6d81a37c8b30b34b02383b':
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
2015-08-13 00:00:36 +00:00
5f79bcdd07
Merge changes from topic 'file_contexts.bin'
...
* changes:
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
2015-08-12 23:46:28 +00:00
e593e5c42a
Fix issie #23116383 : Include security patch level in Settings
...
Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
2015-08-12 16:29:08 -07:00
ccc933e97b
Use repeatable timestamps
...
This moves all of the date references under build/ to using a single
datetime that can be set manually using BUILD_DATETIME.
It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
BUILD_DATETIME.
Bug: 23117013
Change-Id: I7c17a32b794a5adf40b9cd69136fb0ff9f6084ec
2015-08-12 00:02:20 -07:00
8e29bba8c3
am ec5e3aae: resolved conflicts for merge of b184ec2a to mnc-dr-dev-plus-aosp
...
* commit 'ec5e3aae6d8c89a5f6ca0a34fcdfc72e9a611188':
Revert "Use repeatable timestamps"
2015-08-12 01:38:06 +00:00
8478f7abbd
resolved conflicts for merge of b184ec2a to mnc-dev-plus-aosp
...
Change-Id: I6178127dd19ee553c15343fc0120af9463b7ac4d
2015-08-11 18:31:59 -07:00
a635da13b2
am a3b91e62: resolved conflicts for merge of c576c08f to mnc-dr-dev-plus-aosp
...
* commit 'a3b91e621c4ca1708fa2572e05e8ac5b0f4b5d17':
Use repeatable timestamps
2015-08-12 01:28:03 +00:00
ec5e3aae6d
resolved conflicts for merge of b184ec2a to mnc-dr-dev-plus-aosp
...
Change-Id: I90ac0f467ff13a038f27581cb2d07b1c5af5bd92
2015-08-11 18:27:02 -07:00
33f46daa22
resolved conflicts for merge of c576c08f to mnc-dev-plus-aosp
...
Change-Id: I2d28518ac5a26de7c5df9a2e3a1902e880155101
2015-08-11 18:21:43 -07:00
a3b91e621c
resolved conflicts for merge of c576c08f to mnc-dr-dev-plus-aosp
...
Change-Id: I86f6d0e7b9def5afa618915e7249c6758a5f0d1b
2015-08-11 18:11:48 -07:00
608aa91db7
Merge "Revert "Use repeatable timestamps""
2015-08-12 01:02:19 +00:00
92026f2d36
Revert "Use repeatable timestamps"
...
OSX `date` doesn't understand -d
This reverts commit 13ba6e00f4
2015-08-12 01:00:19 +00:00
671b8ff545
Merge "Use repeatable timestamps"
2015-08-12 00:49:26 +00:00
13ba6e00f4
Use repeatable timestamps
...
This moves all of the date references under build/ to using a single
datetime that can be set manually using BUILD_DATETIME.
It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
BUILD_DATETIME.
Bug: 23117013
Change-Id: I880ef103a26bca86bd7bf42d58e62e740a6228c8
2015-08-11 17:08:03 -07:00
1204e257fc
am d67b8c1a: am 23cb26c7: am 20febe3d: Merge "Don\'t build otapackage on Mac."
...
* commit 'd67b8c1ab68ec57ff2b82d41453c406381fa5a08':
Don't build otapackage on Mac.
2015-08-11 23:28:44 +00:00
d67b8c1ab6
am 23cb26c7: am 20febe3d: Merge "Don\'t build otapackage on Mac."
...
* commit '23cb26c7bfa1714db3b31b166be49a0aa46e4a08':
Don't build otapackage on Mac.
2015-08-11 23:23:45 +00:00
2bf0ba2dcf
am 23cb26c7: am 20febe3d: Merge "Don\'t build otapackage on Mac."
...
* commit '23cb26c7bfa1714db3b31b166be49a0aa46e4a08':
Don't build otapackage on Mac.
2015-08-11 23:23:39 +00:00
20febe3d83
Merge "Don't build otapackage on Mac."
2015-08-11 22:49:25 +00:00
09c4b68dfd
Don't build otapackage on Mac.
...
Also removed the unneeded variable DISTTOOLS
and the unnecessary dependency of otapackage/updatepackage on DISTTOOLS.
Bug: 23085297
Change-Id: I6b269003a72bb48eda1260c8d9b4bd88974bcde9
2015-08-11 11:45:54 -07:00
25a1c48de7
am fd50d4de: am a1655645: am edf7bf8d: Merge "Allow custom recovery resource dirs."
...
* commit 'fd50d4dec3e57ebf1877021a242659b668788a95':
Allow custom recovery resource dirs.
2015-08-10 22:31:02 +00:00
49e20876b6
am a1655645: am edf7bf8d: Merge "Allow custom recovery resource dirs."
...
* commit 'a16556450c53c18d49fa55ad2a5f08880f997e04':
Allow custom recovery resource dirs.
2015-08-10 22:28:30 +00:00
fd50d4dec3
am a1655645: am edf7bf8d: Merge "Allow custom recovery resource dirs."
...
* commit 'a16556450c53c18d49fa55ad2a5f08880f997e04':
Allow custom recovery resource dirs.
2015-08-10 22:27:01 +00:00
9a17568624
Allow custom recovery resource dirs.
...
Set TARGET_PRIVATE_RES_DIRS in your BoardConfig.mk to specify custom
private recovery resource directories.
With this change you can share the same recovery resource dir for more
than one device; Also you can specify more than one directories.
Change-Id: Ieeb18f5ac11c98b6f08d0ab6fb4e0d9aa72b27e7
2015-08-10 11:33:10 -07:00
16853a6c35
am 5620d94c: am 449b8a06: am c4904316: am ffe86de5: Merge "vboot_signer: Add kernel subkey required for signing kernel keyblock" into mnc-dr-dev
...
* commit '5620d94c5fd5a249f1805ca7acd5fe22930ddef4':
vboot_signer: Add kernel subkey required for signing kernel keyblock
2015-08-10 12:59:13 +00:00
5620d94c5f
am 449b8a06: am c4904316: am ffe86de5: Merge "vboot_signer: Add kernel subkey required for signing kernel keyblock" into mnc-dr-dev
...
* commit '449b8a0664db86e9a556c323e3f4720303abae95':
vboot_signer: Add kernel subkey required for signing kernel keyblock
2015-08-10 12:53:56 +00:00
e8c212235f
vboot_signer: Add kernel subkey required for signing kernel keyblock
...
Currently, the keyblock was being generated using
data_key.vbprivk. However, we need to use kernel_subkey.vbprivk for
kernel keyblock generation. This did not create any issues until now
because dev-mode just throws a message saying that keyblock is
invalid. But, normal-mode does not boot if keyblock is
invalid. Add extra parameter for passing in kernel subkey to
vboot_signer script.
TEST="make bootimage-nodeps" generates correctly signed
boot.img. Verified that the image boots fine in normal mode.
Change-Id: I0fc2183b466e34ddf1d98c9532072548504fcec4
Signed-off-by: Furquan Shaikh <furquan@google.com>
2015-08-07 12:01:20 -07:00
9d49568900
am 7c6a2a4c: resolved conflicts for merge of 610520ad to mnc-dr-dev-plus-aosp
...
* commit '7c6a2a4ccf30ce74a5acddec406fdf4243da1e50':
build: Support packaging for system_root_image.
2015-08-06 18:07:42 +00:00
7c6a2a4ccf
resolved conflicts for merge of 610520ad to mnc-dr-dev-plus-aosp
...
Change-Id: If44e033d2163b1e357be78b5a9e1b6092baf5063
2015-08-06 11:01:31 -07:00
91fdd1a321
resolved conflicts for merge of 610520ad to mnc-dev-plus-aosp
...
Change-Id: I55ad47c70091d4f42f83783e9876846f19e2a777
2015-08-06 10:57:57 -07:00
62bd479fdf
build: Support packaging for system_root_image.
...
If system image contains the root directory
(BOARD_BUILD_SYSTEM_ROOT_IMAGE == "true"), we package the root directory
into ROOT/ instead of BOOT/RAMDISK/ in the target_files zip.
Change-Id: I817776ca97194991308b2131d0e34ab136283464
2015-08-05 16:39:39 -07:00
d3a803e668
build: switch over to file_contexts.bin only
...
Change all uses of the file_contexts file to use the
file_contexts.bin file instead.
Depends on
I75a781100082c23536f70ce3603f7de42408b5ba
I43806d564b83d57f05f5c36c8eba7b1ff4831b04
Id560d093440a2aba99cef28c20133b35feebf950
I15660f4b3e4c5cb8ae0ec1498c74d6fcbb9a0400
Change-Id: Iaf8c4b2e420f610425a07f48db7af32bda3f5b3a
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-08-04 14:59:06 -04:00
6344247985
am 0f49fed7: am c26fddcc: am e4fed421: Merge "build: core: Fix issue in recovery"
...
* commit '0f49fed7cfcb08221e91f1a6a9934bfbbde970cf':
build: core: Fix issue in recovery
2015-08-03 18:08:53 +00:00
85e6106db7
am 68fd2113: am 545f226d: am 46afd7f9: Merge "Add ro.build.system_root_image"
...
* commit '68fd21137b09523ebaa3748e57d7eedd0d0ec2ef':
Add ro.build.system_root_image
2015-08-03 18:08:50 +00:00
0f49fed7cf
am c26fddcc: am e4fed421: Merge "build: core: Fix issue in recovery"
...
* commit 'c26fddcc5be8876854fe3b44c0c48a0c47de8c07':
build: core: Fix issue in recovery
2015-08-03 17:57:24 +00:00
68fd21137b
am 545f226d: am 46afd7f9: Merge "Add ro.build.system_root_image"
...
* commit '545f226db0978639aba41f16f623a395dad4209c':
Add ro.build.system_root_image
2015-08-03 17:56:45 +00:00
1e6ee759b3
am c26fddcc: am e4fed421: Merge "build: core: Fix issue in recovery"
...
* commit 'c26fddcc5be8876854fe3b44c0c48a0c47de8c07':
build: core: Fix issue in recovery
2015-08-01 00:24:00 +00:00
b7c57cba9f
am 545f226d: am 46afd7f9: Merge "Add ro.build.system_root_image"
...
* commit '545f226db0978639aba41f16f623a395dad4209c':
Add ro.build.system_root_image
2015-08-01 00:18:40 +00:00
e4fed421d5
Merge "build: core: Fix issue in recovery"
2015-08-01 00:10:09 +00:00
46afd7f981
Merge "Add ro.build.system_root_image"
2015-08-01 00:05:05 +00:00
7b82656984
build: core: Fix issue in recovery
...
Now that symlinks are created at build time, the rsync while
making recovery runs into issues around the etc symlink
Change-Id: Ie781507b22e4661629840075b274eaab2f712de6
2015-07-31 16:52:21 -07:00
59156a6b7d
Add ro.build.system_root_image
...
ro.build.system_root_image is true if the root directory is built
into the system image.
Change-Id: I17208ebd004c63aebb09db6c3e5f795619e73bd2
2015-07-31 16:52:21 -07:00
fa752c84e2
am b2416d8e: resolved conflicts for merge of bbb41a70 to mnc-dr-dev-plus-aosp
...
* commit 'b2416d8e5c6ce31edb40df6fb3998716940575b9':
build: Fix "adb shell" in recovery for system_root_image.
2015-07-31 17:09:11 +00:00
b2416d8e5c
resolved conflicts for merge of bbb41a70 to mnc-dr-dev-plus-aosp
...
Change-Id: Icc2ed1632cf023785ddfbae09478ea0ffb025167
2015-07-31 10:01:09 -07:00
c5bd8c29d6
resolved conflicts for merge of bbb41a70 to mnc-dev-plus-aosp
...
Change-Id: I250c007de89a52f8911cf56d7dfded38962284ac
2015-07-31 09:58:03 -07:00
be46a54589
build: Fix "adb shell" in recovery for system_root_image.
...
For system images that contain the root directory, "adb shell" in
recovery stops working if the image is mounted at "/system", because
sh now locates at /system/system/bin/sh. We fix the issue by mounting
the image on /system_root and create a symlink to /system_root/system
for /system.
Bug: 22855115
Change-Id: Ia6b257b75aeb67687c3909063d1725a23a5ccd60
2015-07-30 16:44:17 -07:00
37700c9ad1
Merge "Add compressor options for squashfs system images"
2015-07-29 21:35:57 +00:00
0d511afcb8
resolved conflicts for merge of 910d3822 to mnc-dev-plus-aosp
...
Change-Id: Ied44516c7c2e46b93965dbdb8fb4bc98d6ed3310
2015-07-28 17:03:09 -07:00
7eddd6285f
resolved conflicts for merge of 910d3822 to mnc-dr-dev-plus-aosp
...
Change-Id: I2c899be9d6a82664e4d14c903311daeed5e546fd
2015-07-28 16:58:03 -07:00
f2cffbddb9
Support systems that use a full copy of recovery image.
...
If BOARD_USES_FULL_RECOVERY_IMAGE == true, a full copy of recovery
image will be carried as /system/etc/recovery.img instead of a patch
at /system/recovery_from_boot.p.
Bug: 22641135
Change-Id: Ie271d3e2d55d7b003f667ac5b44203d69b23c63b
(cherry picked from commit 8beab69bd5
2015-07-28 12:20:36 -07:00
8beab69bd5
Support systems that use a full copy of recovery image.
...
If BOARD_USES_FULL_RECOVERY_IMAGE == true, a full copy of recovery
image will be carried as /system/etc/recovery.img instead of a patch
at /system/recovery_from_boot.p.
Bug: 22641135
Change-Id: I4acaca86c22bca55c2b936a820edf1f333615609
2015-07-23 13:13:19 -07:00
f5e94cc17f
am c677675c: am 83568a6d: Merge "Create OUT_DIR before writing build_number.txt."
...
* commit 'c677675cccc8a6894b45469a9b8b4f72efe99b9d':
Create OUT_DIR before writing build_number.txt.
2015-07-23 02:06:37 +00:00
8d9dfa3d9b
resolved conflicts for merge of 8c25fd56 to mnc-dev-plus-aosp
...
Change-Id: I318ce3d7bbfbcaf849a36543662f4c63b7377927
2015-07-22 19:01:07 -07:00
4ed70e43a0
am c677675c: am 83568a6d: Merge "Create OUT_DIR before writing build_number.txt."
...
* commit 'c677675cccc8a6894b45469a9b8b4f72efe99b9d':
Create OUT_DIR before writing build_number.txt.
2015-07-22 00:12:16 +00:00
06332732a4
Create OUT_DIR before writing build_number.txt.
...
Change-Id: I6a84ec59194c48f4291480cb0c94db0da488518c
2015-07-21 16:39:46 -07:00
Steve Fung