Tao Bao
3a32028c41
Merge "Remove file_contexts.bin from non-A/B OTA package." am: 7a1ed9edef am: f7b5d5fbaa
...
am: 5009e0a560
2017-08-25 23:18:47 +00:00
Tao Bao
5009e0a560
Merge "Remove file_contexts.bin from non-A/B OTA package." am: 7a1ed9edef
...
am: f7b5d5fbaa
2017-08-25 23:16:46 +00:00
Tao Bao
f7b5d5fbaa
Merge "Remove file_contexts.bin from non-A/B OTA package."
...
am: 7a1ed9edef
2017-08-25 23:14:47 +00:00
Tao Bao
7a1ed9edef
Merge "Remove file_contexts.bin from non-A/B OTA package."
2017-08-25 23:07:47 +00:00
Tao Bao
ac7b7db12c
Remove file_contexts.bin from non-A/B OTA package.
...
This entry only exists in non-A/B full OTA path. However, this file has
never been loaded by recovery - recovery was only reading the one from
the recovery image (which also has been removed by a recent change in
[1]).
[1]: commit e35926e1aff2e6b9b54656bd59c8178e295a1b7e in
platform/bootable/recovery.
Bug: 63538434
Test: `m dist` on angler. file_contexts.bin is gone from full OTA
package. Sideloading the generated full OTA on angler.
Change-Id: Iec2e2d36599fa1ed499516a3e74f06cd36ade494
2017-08-25 14:14:53 -07:00
Simran Basi
e08ccc9e22
Merge "Add shortcut to atest after envsetup.sh is sourced." am: 6417aa89e4 am: 97053a075c
...
am: 6e16916d1f
2017-08-25 19:03:02 +00:00
Simran Basi
6e16916d1f
Merge "Add shortcut to atest after envsetup.sh is sourced." am: 6417aa89e4
...
am: 97053a075c
2017-08-25 18:57:59 +00:00
Simran Basi
97053a075c
Merge "Add shortcut to atest after envsetup.sh is sourced."
...
am: 6417aa89e4
2017-08-25 18:50:32 +00:00
Treehugger Robot
6417aa89e4
Merge "Add shortcut to atest after envsetup.sh is sourced."
2017-08-25 18:44:34 +00:00
Bowgo Tsai
90f4777cdd
Merge "Support signing custom_images with AVB" am: e09809a32d am: d8c0bb8f61
...
am: e047421956
2017-08-25 08:05:23 +00:00
Bowgo Tsai
e047421956
Merge "Support signing custom_images with AVB" am: e09809a32d
...
am: d8c0bb8f61
2017-08-25 08:00:26 +00:00
Bowgo Tsai
d8c0bb8f61
Merge "Support signing custom_images with AVB"
...
am: e09809a32d
2017-08-25 07:56:01 +00:00
Treehugger Robot
e09809a32d
Merge "Support signing custom_images with AVB"
2017-08-25 07:49:37 +00:00
bohu
fe07097cc1
emulator: fix selinux issues
...
am: 2ab3cf3c1f
2017-08-25 07:16:48 +00:00
Bowgo Tsai
480dc7c19d
Support signing custom_images with AVB
...
Current AVB signing for custom images is enabled by either of the
following build variables:
CUSTOM_IMAGE_AVB_HASH_ENABLE := true
CUSTOM_IMAGE_AVB_HASHTREE_ENABLE := true
A previous change to support chain partition replaced avb_signing_args
with avb_key_path and avb_algorithm. This change updates the
corresponding change for custom_images.
To sign a custom_image as a chain partition, it needs:
CUSTOM_IMAGE_AVB_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
CUSTOM_IMAGE_AVB_ALGORITHM := SHA256_RSA2048
CUSTOM_IMAGE_AVB_ROLLBACK_INDEX := 1
Note that it doesn't support include metadata of custom images into
vbmeta.img. Because custom_images is designed to build multiple files
(e.g., custom1.img, custom2.img, custom3.img, etc) and a device can only
use/mount one of them. The vbmeta.img needs to be generated per each
combination.
Bug:36701014
Test: sign custom image with AVB HASH descriptor (non-chain)
Test: sign custom image with AVB HASH descriptor as chain partition
Test: sign custom image with AVB HASHTREE descriptor (non-chain)
Test: sign custom image with AVB HASHTREE descriptor as chain partition
Change-Id: I492e2ce768e7caec22228b776b2c13a2d37a5b89
2017-08-25 13:28:57 +08:00
bohu
2ab3cf3c1f
emulator: fix selinux issues
...
with cas/camera/drm hals
BUG: 64726466
Test: build aosp_x86-eng, boot emulator
without cas/camera/drm hals killed by
selinux avc denials; camera can take
pictures
Change-Id: I8a154fdb5d7aa7763aab2b912976eb9e1d329cdb
2017-08-24 21:29:56 -07:00
Isaac Chen
6d91469c13
Merge "Revert "Revert "Build support for 32-bit armv8-a""" am: 9a888ebb51 am: 9f55141c5f
...
am: 26704591f3
2017-08-25 02:24:35 +00:00
Isaac Chen
26704591f3
Merge "Revert "Revert "Build support for 32-bit armv8-a""" am: 9a888ebb51
...
am: 9f55141c5f
2017-08-25 02:16:51 +00:00
Isaac Chen
9f55141c5f
Merge "Revert "Revert "Build support for 32-bit armv8-a"""
...
am: 9a888ebb51
2017-08-25 02:03:26 +00:00
Isaac Chen
9a888ebb51
Merge "Revert "Revert "Build support for 32-bit armv8-a"""
2017-08-25 01:55:56 +00:00
Yifan Hong
ec7bd8666f
Merge changes from topic "libvintf_cp" am: 9bab2f5fa2 am: 0998353f08
...
am: 1c3670d185
2017-08-24 20:04:52 +00:00
Bowgo Tsai
83f65e2621
Pass FRAMEWORK_VBMETA_VERSION to assemble_vintf am: eb7b438994 -s ours am: 68a916d4c4 -s ours
...
am: a5b0563c0d
2017-08-24 20:04:35 +00:00
Yifan Hong
1c3670d185
Merge changes from topic "libvintf_cp" am: 9bab2f5fa2
...
am: 0998353f08
2017-08-24 19:59:45 +00:00
Bowgo Tsai
a5b0563c0d
Pass FRAMEWORK_VBMETA_VERSION to assemble_vintf am: eb7b438994 -s ours
...
am: 68a916d4c4
2017-08-24 19:59:34 +00:00
Zach Riggle
b6bc12e00a
Merge "Enhance coverage options to include those needed by Honggfuzz for coverage-driven fuzzing" am: 0d2a75510c am: 98025a15ab
...
am: 1e9943c392
2017-08-24 19:57:39 +00:00
Yifan Hong
0998353f08
Merge changes from topic "libvintf_cp"
...
am: 9bab2f5fa2
2017-08-24 19:53:47 +00:00
Bowgo Tsai
68a916d4c4
Pass FRAMEWORK_VBMETA_VERSION to assemble_vintf
...
am: eb7b438994
2017-08-24 19:53:21 +00:00
Zach Riggle
1e9943c392
Merge "Enhance coverage options to include those needed by Honggfuzz for coverage-driven fuzzing" am: 0d2a75510c
...
am: 98025a15ab
2017-08-24 19:51:32 +00:00
Zach Riggle
98025a15ab
Merge "Enhance coverage options to include those needed by Honggfuzz for coverage-driven fuzzing"
...
am: 0d2a75510c
2017-08-24 19:45:11 +00:00
Treehugger Robot
9bab2f5fa2
Merge changes from topic "libvintf_cp"
...
* changes:
Add <kernel> entry to fwk compat mat.
Pass FRAMEWORK_VBMETA_VERSION to assemble_vintf
Accept multiple input files for device manifest.
2017-08-24 19:41:11 +00:00
Zach Riggle
0d2a75510c
Merge "Enhance coverage options to include those needed by Honggfuzz for coverage-driven fuzzing"
2017-08-24 19:26:14 +00:00
Bowgo Tsai
eb7b438994
Pass FRAMEWORK_VBMETA_VERSION to assemble_vintf
...
Note that this depends on a change in avbtool:
https://android-review.googlesource.com/#/c/406374/
Bug: 38325029
Test: builds system.img, checks $OUT/system/compatibility_matrix.xml
contains correct vbmeta-version
Change-Id: Iacc0a2687fb39600ad6b8e9cfbfe5c1a3b90b40b
Merged-In: Iacc0a2687fb39600ad6b8e9cfbfe5c1a3b90b40b
2017-08-24 11:28:04 -07:00
Yifan Hong
1aecc84239
Add <kernel> entry to fwk compat mat.
...
Test: builds and verify that system/compatibility_matrix.xml
has configs filled.
Test: `vintf | tail` on marlin shows that fwk compat mat
is compatible with runtime info.
Bug: 38324908
Change-Id: I8a35ea582fea1faa083c409ec58813c3ac82dc9c
Merged-In: I8a35ea582fea1faa083c409ec58813c3ac82dc9c
2017-08-24 11:28:04 -07:00
Yifan Hong
dae462bdd1
Accept multiple input files for device manifest.
...
Test: test with DEVICE_MANIFEST_FILE variable split
into multiple files
Bug: 38217107
Change-Id: I1146898e4ccf0e8bac7d8541032f160476dbc148
Merged-In: I1146898e4ccf0e8bac7d8541032f160476dbc148
2017-08-24 11:28:02 -07:00
Dmitry Shmidt
8a2d761103
Merge "Set Uml if TARGET_USER_MODE_LINUX is true" am: 714f406a8a am: 2ad98c62e7
...
am: 31d54cb2f9
2017-08-24 01:34:54 +00:00
Dmitry Shmidt
31d54cb2f9
Merge "Set Uml if TARGET_USER_MODE_LINUX is true" am: 714f406a8a
...
am: 2ad98c62e7
2017-08-24 01:29:20 +00:00
Dmitry Shmidt
2ad98c62e7
Merge "Set Uml if TARGET_USER_MODE_LINUX is true"
...
am: 714f406a8a
2017-08-24 01:22:51 +00:00
Treehugger Robot
714f406a8a
Merge "Set Uml if TARGET_USER_MODE_LINUX is true"
2017-08-24 01:14:36 +00:00
Dmitry Shmidt
82d05aaf13
Set Uml if TARGET_USER_MODE_LINUX is true
...
Bug: 64985489
Test: Manual
Change-Id: Ic472fadcf64eb04e592b6f14570f7650bcd4f2e9
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2017-08-23 15:53:28 -07:00
Jeff Vander Stoep
90af004fa6
Merge "embedded.mk: move dependencies to sepolicy" am: d6c7681d85 am: 1c71c880e9
...
am: 0ed1778038
2017-08-23 22:09:09 +00:00
Jeff Vander Stoep
0ed1778038
Merge "embedded.mk: move dependencies to sepolicy" am: d6c7681d85
...
am: 1c71c880e9
2017-08-23 22:04:12 +00:00
Jeff Vander Stoep
1c71c880e9
Merge "embedded.mk: move dependencies to sepolicy"
...
am: d6c7681d85
2017-08-23 21:58:21 +00:00
Treehugger Robot
d6c7681d85
Merge "embedded.mk: move dependencies to sepolicy"
2017-08-23 21:31:31 +00:00
Simran Basi
424b876778
Add shortcut to atest after envsetup.sh is sourced.
...
Bug: None
Test: On master, atest points to atest in tradefed.
Change-Id: Iad6e48a12c4180f77b483cadd4c316820ede87cd
2017-08-23 12:05:36 -07:00
Android Build Merger (Role)
f77f330af0
Merge "Merge "Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b am: e53cb97dcb -s ours am: cde553f1c5 am: 269106b949" into oc-dr1-dev-plus-aosp am: a81104f2cf" into oc-mr1-dev-plus-aosp
2017-08-23 17:08:56 +00:00
Adam Seaton
8bb37d797d
Merge "Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b am: e53cb97dcb -s ours am: cde553f1c5 am: 269106b949" into oc-dr1-dev-plus-aosp
...
am: a81104f2cf
2017-08-23 17:08:36 +00:00
Android Build Merger (Role)
d77ffb15cd
Merge "Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b am: e53cb97dcb -s ours am: cde553f1c5 am: bbcf3f0992 am: 8fda58deb4" into oc-mr1-dev-plus-aosp
2017-08-23 17:08:21 +00:00
Adam Seaton
9ef278d5e4
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b am: e53cb97dcb -s ours am: cde553f1c5 am: bbcf3f0992
...
am: 8fda58deb4
2017-08-23 17:07:54 +00:00
Adam Seaton
59968542e3
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b am: e53cb97dcb -s ours am: cde553f1c5 am: 269106b949
...
am: d463548af1
2017-08-23 17:07:48 +00:00
Android Build Merger (Role)
a81104f2cf
Merge "Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b am: e53cb97dcb -s ours am: cde553f1c5 am: 269106b949" into oc-dr1-dev-plus-aosp
2017-08-23 17:04:33 +00:00
