Ying Wang
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
Ying Wang
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
Ying Wang
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
Evgenii Stepanov
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
Evgenii Stepanov
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
Ivan Krasin
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
Ying Wang
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
Ying Wang
942672d82b
am 45075cf6
: Merge "Generate installed-files-vendor.txt"
...
* commit '45075cf623fc59930594ac27c675cd43e36975b1':
Generate installed-files-vendor.txt
2015-09-15 23:10:16 +00:00
Ying Wang
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
Tao Bao
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
Tao Bao
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
Tao Bao
cbc6dc29d6
build: Don't call make_recovery_patch if there's no recovery.
...
Change-Id: Iea1bd529eca9cd607da3b420bc4287f95c18219d
2015-08-18 18:28:47 -07:00
Dan Willemsen
9cf990beec
resolved conflicts for merge of 05fae7e0
to mnc-dev-plus-aosp
...
Change-Id: I9f0f1169839afabc7ec7e439b668798e2cd111a3
2015-08-17 20:50:48 -07:00
Dan Willemsen
014719fcfc
resolved conflicts for merge of 05fae7e0
to mnc-dr-dev-plus-aosp
...
Change-Id: I32919ab1e3cd5f84d09180125a7294bcfa35549e
2015-08-17 20:44:29 -07:00
Dan Willemsen
e65107508a
Merge "Use repeatable timestamps"
2015-08-18 03:30:11 +00:00
Dianne Hackborn
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
Dianne Hackborn
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
Dianne Hackborn
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
Nick Kralevich
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
Nick Kralevich
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
Nick Kralevich
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
Dianne Hackborn
e593e5c42a
Fix issie #23116383 : Include security patch level in Settings
...
Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
2015-08-12 16:29:08 -07:00
Dan Willemsen
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
Dan Willemsen
8478f7abbd
resolved conflicts for merge of b184ec2a
to mnc-dev-plus-aosp
...
Change-Id: I6178127dd19ee553c15343fc0120af9463b7ac4d
2015-08-11 18:31:59 -07:00
Dan Willemsen
ec5e3aae6d
resolved conflicts for merge of b184ec2a
to mnc-dr-dev-plus-aosp
...
Change-Id: I90ac0f467ff13a038f27581cb2d07b1c5af5bd92
2015-08-11 18:27:02 -07:00
Dan Willemsen
33f46daa22
resolved conflicts for merge of c576c08f
to mnc-dev-plus-aosp
...
Change-Id: I2d28518ac5a26de7c5df9a2e3a1902e880155101
2015-08-11 18:21:43 -07:00
Dan Willemsen
a3b91e621c
resolved conflicts for merge of c576c08f
to mnc-dr-dev-plus-aosp
...
Change-Id: I86f6d0e7b9def5afa618915e7249c6758a5f0d1b
2015-08-11 18:11:48 -07:00
Dan Willemsen
608aa91db7
Merge "Revert "Use repeatable timestamps""
2015-08-12 01:02:19 +00:00
Dan Willemsen
92026f2d36
Revert "Use repeatable timestamps"
...
OSX `date` doesn't understand -d
This reverts commit 13ba6e00f4
.
Change-Id: I5970032ff02cc07bd3b087e1eeb5f19b1e4194b4
2015-08-12 01:00:19 +00:00
Dan Willemsen
671b8ff545
Merge "Use repeatable timestamps"
2015-08-12 00:49:26 +00:00
Dan Willemsen
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
Ying Wang
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
Ying Wang
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
Ying Wang
20febe3d83
Merge "Don't build otapackage on Mac."
2015-08-11 22:49:25 +00:00
Ying Wang
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
Ying Wang
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
Ying Wang
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
Ying Wang
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
Furquan Shaikh
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
Furquan Shaikh
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
Tao Bao
7c6a2a4ccf
resolved conflicts for merge of 610520ad
to mnc-dr-dev-plus-aosp
...
Change-Id: If44e033d2163b1e357be78b5a9e1b6092baf5063
2015-08-06 11:01:31 -07:00
Tao Bao
91fdd1a321
resolved conflicts for merge of 610520ad
to mnc-dev-plus-aosp
...
Change-Id: I55ad47c70091d4f42f83783e9876846f19e2a777
2015-08-06 10:57:57 -07:00
Tao Bao
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
Stephen Smalley
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
Daniel Rosenberg
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
Daniel Rosenberg
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
Daniel Rosenberg
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
Daniel Rosenberg
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
Daniel Rosenberg
e4fed421d5
Merge "build: core: Fix issue in recovery"
2015-08-01 00:10:09 +00:00
Daniel Rosenberg
46afd7f981
Merge "Add ro.build.system_root_image"
2015-08-01 00:05:05 +00:00