Xin Li
44dd4881de
Merge commit '66b8b530187b129934a685bf0c4349eef00e4b0c' from
...
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.
Change-Id: I7594bb72dd7e847292eb502edd918e41318aac29
Merged-In: Ide82473d358719f7e01cd2a4a85db954f3722f14
2017-11-14 11:36:22 -08:00
Michael Wright
8a049bd1fd
Error when an abstract method is added to a released class.
...
Test: m -j12 and see the build break because of methods added to
ViewStructure
Change-Id: If323b263b58edb559ddae6251f170ceaf962a932
2017-11-02 14:37:20 +00:00
bohu
813249bfdf
emulator: squash misc modifications from oc-emu-dev
...
Change-Id: Ia6c3ff0805b88ef284524a4e6faa5615016b359c
Merged-In: I7380292cd4dc851a987683bdf61d511dbf74aff6
2017-10-26 16:45:05 -07:00
bohu
4ac55e0bbb
emulator: squash misc modifications from oc-emu-dev
...
Change-Id: Ia6c3ff0805b88ef284524a4e6faa5615016b359c
Merged-In: I7380292cd4dc851a987683bdf61d511dbf74aff6
2017-10-26 16:23:14 -07:00
Colin Cross
2377f23d44
Merge "Update references to build/core to build/make/core" am: 6db8597174 am: bce301801f am: 4ffa2e1ebc
...
am: 40be14c239
2017-10-21 00:01:42 +00:00
Colin Cross
40be14c239
Merge "Update references to build/core to build/make/core" am: 6db8597174 am: bce301801f
...
am: 4ffa2e1ebc
2017-10-20 23:53:47 +00:00
Colin Cross
bce301801f
Merge "Update references to build/core to build/make/core"
...
am: 6db8597174
2017-10-20 23:49:17 +00:00
Colin Cross
6cdc5d20f3
Update references to build/core to build/make/core
...
sed -i -e 's"\([^/]\)build/core"\1build/make/core"g' $(git grep -l build/core)
Test: m checkbuild
Change-Id: Idf3a2fed79aee5d2c07bd8e42f0c0660f253ddc2
2017-10-20 12:49:28 -07:00
Bowgo Tsai
50b8e537a6
Merge "Adding Android verified boot 1.0 metadata into ENG builds" am: 5f958ccad5 am: 86c4f8ed54 am: 08a05cd9ae
...
am: 0e1ada16ce
2017-10-15 04:14:28 +00:00
Bowgo Tsai
0e1ada16ce
Merge "Adding Android verified boot 1.0 metadata into ENG builds" am: 5f958ccad5 am: 86c4f8ed54
...
am: 08a05cd9ae
2017-10-15 03:26:24 +00:00
Bowgo Tsai
86c4f8ed54
Merge "Adding Android verified boot 1.0 metadata into ENG builds"
...
am: 5f958ccad5
2017-10-15 02:48:17 +00:00
Bowgo Tsai
6ceeb1a8bf
Adding Android verified boot 1.0 metadata into ENG builds
...
Adding verified boot metadata with a "disable magic". The resulting
metadata at the end of each image (e.g., system.img, vendor.img) will
be the same as triggering an "adb disable-verity" on an USERDEBUG image.
This can help simplify the code on fs_mgr, which won't have to check if
current image is an ENG build or not.
Bug: 63056044
Test: boot sailfish eng/userdebug builds
Change-Id: I95d23ac7b76c04d6d4483c9c4dc1de16bf0d9c3a
2017-10-12 10:08:44 +08:00
Jeff Gaston
f32467dac6
Fix sdk-addon build on build servers
...
they don't source envsetup.sh
Bug: 65286453
Test: m -j OUT_DIR=/tmp/abs PRODUCT-sdk_gphone_x86-sdk_addon /tmp/abs/host/linux-x86/sdk_addon/google_phone_x86-eng.$(whoami)-linux-x86.zip
Change-Id: Id396203b500e70cfa2b1e1eb5241d88fae88fc36
Merged-In: Id396203b500e70cfa2b1e1eb5241d88fae88fc36
(cherry picked from commit 25210ce70b
2017-09-18 19:27:13 -07:00
Jeff Gaston
8228d37ac4
Fix sdk-addon build on build servers
...
they don't source envsetup.sh
Bug: 65286453
Test: m -j OUT_DIR=/tmp/abs PRODUCT-sdk_gphone_x86-sdk_addon /tmp/abs/host/linux-x86/sdk_addon/google_phone_x86-eng.$(whoami)-linux-x86.zip
Change-Id: Id396203b500e70cfa2b1e1eb5241d88fae88fc36
Merged-In: Id396203b500e70cfa2b1e1eb5241d88fae88fc36
(cherry picked from commit 25210ce70b
2017-09-18 19:13:49 -07:00
Jeff Gaston
2fa3fe1146
Fix sdk-addon build on build servers
...
they don't source envsetup.sh
Bug: 65286453
Test: m -j OUT_DIR=/tmp/abs PRODUCT-sdk_gphone_x86-sdk_addon /tmp/abs/host/linux-x86/sdk_addon/google_phone_x86-eng.$(whoami)-linux-x86.zip
Change-Id: Id396203b500e70cfa2b1e1eb5241d88fae88fc36
Merged-In: Id396203b500e70cfa2b1e1eb5241d88fae88fc36
(cherry picked from commit 25210ce70b
2017-09-18 21:54:24 +00:00
Jeff Gaston
25210ce70b
Fix sdk-addon build on build servers
...
they don't source envsetup.sh
Bug: 65286453
Test: m -j OUT_DIR=/tmp/abs PRODUCT-sdk_gphone_x86-sdk_addon /tmp/abs/host/linux-x86/sdk_addon/google_phone_x86-eng.$(whoami)-linux-x86.zip
Change-Id: Id396203b500e70cfa2b1e1eb5241d88fae88fc36
2017-09-15 15:07:19 -07:00
Jeff Gaston
c5fa0e7f49
resolve merge conflicts of 8bbbd87ef6 to stage-aosp-master
...
Test: I solemnly swear I tested this conflict resolution.
Merged-In: Id2d18fe41de5d533baf1f082292d70d946386249
Change-Id: Ibc66733eb7879f2be2458e922641fec3a899beab
2017-09-15 19:25:19 +00:00
Jeff Gaston
12dd16d36e
Fix sdk-addon for absolute OUT_DIR
...
am: c09b693857
2017-09-15 04:22:11 +00:00
Jeff Gaston
c09b693857
Fix sdk-addon for absolute OUT_DIR
...
Bug: 65286453
Test: m -j OUT_DIR=/tmp/abs PRODUCT-sdk_gphone_x86-sdk_addon /tmp/abs/host/linux-x86/sdk_addon/google_phone_x86-eng.jeffrygaston-linux-x86.zip
Change-Id: Id2d18fe41de5d533baf1f082292d70d946386249
2017-09-14 17:16:32 -07:00
Jeff Gaston
43f3457329
Fix sdk-addon for absolute OUT_DIR
...
Bug: 65286453
Test: m -j OUT_DIR=/tmp/abs PRODUCT-sdk_gphone_x86-sdk_addon /tmp/abs/host/linux-x86/sdk_addon/google_phone_x86-eng.jeffrygaston-linux-x86.zip
Change-Id: Id2d18fe41de5d533baf1f082292d70d946386249
2017-09-13 15:23:38 -07:00
bohu
7b5e1abacb
emulator: squash misc modifications from oc-emu-dev
...
Change-Id: I7380292cd4dc851a987683bdf61d511dbf74aff6
Merged-In: I7380292cd4dc851a987683bdf61d511dbf74aff6
2017-08-30 17:13:47 -07:00
Bowgo Tsai
f43c09ad0b
Merge "Support signing custom_images with AVB" am: e09809a32d am: d8c0bb8f61 am: e047421956
...
am: 90f4777cdd
2017-08-25 08:09:53 +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
d8c0bb8f61
Merge "Support signing custom_images with AVB"
...
am: e09809a32d
2017-08-25 07:56:01 +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
TreeHugger Robot
7c84cf5717
Merge "Add task for API diffs"
2017-08-14 22:28:01 +00:00
Bo Hu
22221a4f5a
Merge changes from topic "port-emu-to-oc-mr1-dev" into oc-mr1-dev
...
am: 60df0a831c
2017-08-14 18:49:42 +00:00
bohu
753e9e4462
emulator: squash misc modifications from oc-emu-dev
...
Change-Id: I7380292cd4dc851a987683bdf61d511dbf74aff6
2017-08-13 22:32:01 -07:00
Alan Viverette
6210536fb5
Add task for API diffs
...
Test: make api-diff
Change-Id: Ifb788069bf1d882a52e8429e056070675f866986
2017-08-09 14:58:28 +00:00
Bo Hu
e6e2566f07
Merge "Revert "Revert "emulator: create qemu images for system,vendor""" am: 5af2027e34 am: abd33cdba6 am: 1b86b7581c
...
am: d80d922083
2017-08-01 23:34:44 +00:00
Bo Hu
d80d922083
Merge "Revert "Revert "emulator: create qemu images for system,vendor""" am: 5af2027e34 am: abd33cdba6
...
am: 1b86b7581c
2017-08-01 23:30:23 +00:00
Bo Hu
abd33cdba6
Merge "Revert "Revert "emulator: create qemu images for system,vendor"""
...
am: 5af2027e34
2017-08-01 23:22:17 +00:00
Bo Hu
bc88ff69cf
Revert "Revert "emulator: create qemu images for system,vendor""
...
This reverts commit 9b99ddc8a5f0d50bbef0
2017-08-01 14:34:15 -07:00
Bo Hu
f0d50bbef0
Revert "Revert "emulator: create qemu images for system,vendor""
...
This reverts commit 9b99ddc8a5
2017-08-01 13:00:53 -07:00
Bo Hu
c8aaab1f3f
Merge "Revert "emulator: create qemu images for system,vendor"" am: a2ea9626e5 am: b7e5cf8b6d am: 471e2ba1d6
...
am: b0ca7302aa
2017-08-01 07:10:37 +00:00
Bo Hu
b0ca7302aa
Merge "Revert "emulator: create qemu images for system,vendor"" am: a2ea9626e5 am: b7e5cf8b6d
...
am: 471e2ba1d6
2017-08-01 07:07:07 +00:00
Bo Hu
b7e5cf8b6d
Merge "Revert "emulator: create qemu images for system,vendor""
...
am: a2ea9626e5
2017-08-01 07:00:06 +00:00
Bo Hu
a2ea9626e5
Merge "Revert "emulator: create qemu images for system,vendor""
2017-08-01 06:52:44 +00:00
Bo Hu
9b99ddc8a5
Revert "emulator: create qemu images for system,vendor"
...
This reverts commit b5d0503758
2017-08-01 06:50:07 +00:00
Colin Cross
acd9fe310b
Merge "Fix test suite zip generation on mac" am: 94be321cae am: c1ed882bd8 am: 3f7ab5f080
...
am: ffcc178ba7
2017-08-01 04:11:40 +00:00
Colin Cross
ffcc178ba7
Merge "Fix test suite zip generation on mac" am: 94be321cae am: c1ed882bd8
...
am: 3f7ab5f080
2017-08-01 04:08:08 +00:00
Colin Cross
c1ed882bd8
Merge "Fix test suite zip generation on mac"
...
am: 94be321cae
2017-08-01 04:01:37 +00:00
Treehugger Robot
94be321cae
Merge "Fix test suite zip generation on mac"
2017-08-01 03:51:28 +00:00
bohu
34e0ca1577
Merge "emulator: create qemu images for system,vendor" am: 571e5d47b7 am: dbbd3311ae am: fe3b305516
...
am: 69121fd68c
2017-08-01 02:18:45 +00:00
bohu
69121fd68c
Merge "emulator: create qemu images for system,vendor" am: 571e5d47b7 am: dbbd3311ae
...
am: fe3b305516
2017-08-01 02:12:16 +00:00
bohu
dbbd3311ae
Merge "emulator: create qemu images for system,vendor"
...
am: 571e5d47b7
2017-08-01 01:56:12 +00:00
Colin Cross
f3a4340435
Fix test suite zip generation on mac
...
Don't use sed -i, it requires an argument on mac and is eating the
-e parameter, which causes the command to not be applied.
Also clean up the temporary list files so they don't clutter up
$OUT.
Test: m -j device-tests
Bug: 64226094
Change-Id: Ie71820fc2d1cd812717bf0c156af011ca723e9f6
2017-08-01 01:51:30 +00:00
bohu
b5d0503758
emulator: create qemu images for system,vendor
...
For raw system.img and vendor.img do not have
partition table and init refuses to mount them
in first stage mounting.
For emulator build:
create partitioned system-qemu.img for system.img;
create partitioned vendor-qemu.img for vendor.img
if applicable.
Change-Id: I64fdcdafc303cf2f74a1e96653e7afe259f0af98
2017-07-31 16:28:40 -07:00
Bowgo Tsai
1799d360b5
Merge "custom_images: support verity fec (forward error correction)" am: abf553c9d3 am: bd91ac7740 am: 9a797706b5
...
am: 5cf6551455
2017-07-15 00:10:39 +00:00
Bowgo Tsai
5cf6551455
Merge "custom_images: support verity fec (forward error correction)" am: abf553c9d3 am: bd91ac7740
...
am: 9a797706b5
2017-07-15 00:06:34 +00:00
