Commit graph

5140 commits

Author SHA1 Message Date
Jaekyun Seok
8cf6443264 Rename ro.vendor.product.* to ro.product.vendor.*
"ro.vendor." prefix will be used only for vendor-specific properties
except for ro.vendor.build.date, ro.vendor.build.date.utc and
ro.vendor.build.fingerprint.

Those exceptions have been used since Android L. So we can't rename them
to support the system-only upgrade from old Android.

Bug: 36796459
Test: confirmed that ro.vendor.product.* were changed to
ro.product.vendor.* in vendor/build.prop

Change-Id: Ibc107b00264a2dc194261d1968b27a9b17b5d798
2017-10-26 09:25:33 +09:00
Colin Cross
2377f23d44 Merge "Update references to build/core to build/make/core" am: 6db8597174 am: bce301801f am: 4ffa2e1ebc
am: 40be14c239

Change-Id: I126f1387ad66bace815d7a8bd3f46357cb39e7f2
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

Change-Id: I9ff0a8d8e2abd407935e691be324894a5da09f8c
2017-10-20 23:53:47 +00:00
Colin Cross
bce301801f Merge "Update references to build/core to build/make/core"
am: 6db8597174

Change-Id: I4be5bc1805d1900991966d24fda15f2705ee248d
2017-10-20 23:49:17 +00:00
Colin Cross
6db8597174 Merge "Update references to build/core to build/make/core" 2017-10-20 23:41:12 +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
Tao Bao
3ae25c97e0 Merge "releasetools: Work around the issue with mke2fs created images." am: d526e0c8e9 am: f55aae7211 am: c4cd4afaf8
am: 26801092a0

Change-Id: I62ca1d077ce1db55d89cfa220ac2f19e3e0201d8
2017-10-20 17:52:58 +00:00
Tao Bao
26801092a0 Merge "releasetools: Work around the issue with mke2fs created images." am: d526e0c8e9 am: f55aae7211
am: c4cd4afaf8

Change-Id: Iafb5a1a4f6d336fa6d6f190a8859d7d9e7e15438
2017-10-20 17:40:04 +00:00
Tao Bao
f55aae7211 Merge "releasetools: Work around the issue with mke2fs created images."
am: d526e0c8e9

Change-Id: I9d4d034ad3f2763ac3da6a22bf0bd0dc02eb98c3
2017-10-20 17:31:12 +00:00
Tao Bao
b937ead5d9 releasetools: Work around the issue with mke2fs created images.
When generating block based OTAs, we read files from the sparse image
directly with the help of block map file. However, the block map info
might not be accurate if the image is created with mke2fs. Because
mke2fs may skip allocating actual blocks if they contain all zeros.
ota_from_target_files.py consequently passes incomplete APK files to
imgdiff, which fails to generate patches.

This CL works around the issue by falling back from imgdiff to bsdiff on
failures. We should figure out a better way in b/68016761 to remove the
workaround, which would otherwise hide other issues in imgdiff.

Bug: 67824829
Bug: 68016761
Test: ota_from_target_files.py passes on previously failing TF zips.
Change-Id: Ib24c5b5f89812b97a0c87c6bf0dc147ae39bc92f
2017-10-19 16:56:22 -07:00
Tao Bao
7ed24aa7aa Merge "releasetools: Remove the workarounds for mkyaffs2image." am: d2a09ef2d1 am: 9c531a9bef am: c15e55f802
am: b5a8aa05e8

Change-Id: I1213410958d7e2f4f6c91f7029ff7d495b2e627a
2017-10-18 23:24:28 +00:00
Tao Bao
b5a8aa05e8 Merge "releasetools: Remove the workarounds for mkyaffs2image." am: d2a09ef2d1 am: 9c531a9bef
am: c15e55f802

Change-Id: I1b5d4df1f4cb9237ab8e7b66b4c68f8fb3d6b69d
2017-10-18 22:29:15 +00:00
Tao Bao
9c531a9bef Merge "releasetools: Remove the workarounds for mkyaffs2image."
am: d2a09ef2d1

Change-Id: I7f975b9d734f3bc9594758a365574a9ce009d19c
2017-10-18 22:04:12 +00:00
Tao Bao
300506e147 Merge "Build repeatable system images with mke2fs."
am: 404af2ca4b

Change-Id: I49a97fe49449b1e2466eb8cd612816c526da0bcb
2017-10-18 18:05:46 +00:00
Tao Bao
fa863c86b7 releasetools: Remove the workarounds for mkyaffs2image.
Test: `m dist` on Linux and macOS.
Test: Use an existing target_files.zip for bullhead. Remove IMAGES/*
      and rebuild the images with 'add_img_to_target_files.py -a'. It
      generates idential images as in the original TF.zip.
Change-Id: I803656bf2c924dce53f2271dcb967a94fff48440
2017-10-18 10:21:33 -07:00
Treehugger Robot
404af2ca4b Merge "Build repeatable system images with mke2fs." 2017-10-18 17:20:00 +00:00
Colin Cross
bb8322e08b Merge "Follow renames of conscrypt and bouncycastle to remove -host suffix" am: f4f94ab567 am: 94ddb28a26 am: 4d5c09aad9
am: ee0dcd825e

Change-Id: I607dbefe79590a5d580dcf7ff36a9171f9c38458
2017-10-18 14:55:53 +00:00
Colin Cross
ee0dcd825e Merge "Follow renames of conscrypt and bouncycastle to remove -host suffix" am: f4f94ab567 am: 94ddb28a26
am: 4d5c09aad9

Change-Id: I5124abc4f48bea0931a75a9eef2133411e809a7b
2017-10-18 11:57:46 +00:00
Colin Cross
94ddb28a26 Merge "Follow renames of conscrypt and bouncycastle to remove -host suffix"
am: f4f94ab567

Change-Id: I9c978fb748ec3ce15cc9ea238193606a4726ae8f
2017-10-18 10:51:53 +00:00
Treehugger Robot
f4f94ab567 Merge "Follow renames of conscrypt and bouncycastle to remove -host suffix" 2017-10-18 09:41:11 +00:00
Tom Cherry
671fcedf7b Merge "Allow ro. properties to have arbitrary lengths" am: 1d6e8e31d0 am: 47b3003e9b am: 646f3c2651
am: 70f86d2f96

Change-Id: I1a4af547ee4345f7aba12c8d8c302f8ef4ce70b9
2017-10-17 22:58:44 +00:00
Tom Cherry
70f86d2f96 Merge "Allow ro. properties to have arbitrary lengths" am: 1d6e8e31d0 am: 47b3003e9b
am: 646f3c2651

Change-Id: Ic1398ce6dee690b94e53e781296e8cbcddc4bfbf
2017-10-17 22:52:05 +00:00
Tom Cherry
47b3003e9b Merge "Allow ro. properties to have arbitrary lengths"
am: 1d6e8e31d0

Change-Id: I4a3872a59ba39289bf58741e19ca05b9b9c7bbee
2017-10-17 22:42:04 +00:00
Tom Cherry
1d6e8e31d0 Merge "Allow ro. properties to have arbitrary lengths" 2017-10-17 22:33:11 +00:00
Colin Cross
b34d45ad65 Follow renames of conscrypt and bouncycastle to remove -host suffix
Test: m checkbuild
Change-Id: I72bd7249cf6bdc4a2251f6877c776f439649da81
2017-10-17 15:27:52 -07:00
Tao Bao
d86e3114fc Build repeatable system images with mke2fs.
We have added support in mkuserimg_mke2fs.sh that allows specifying
filesystem UUID and hash seed UUID. This CL generates and passes the
UUIDs based on the image name and build fingerprint. This way we can
rebuild and get identical images.

Note that this only applies to images generated with `m dist` and with
signing tools (sign_target_files_apks.py and
add_img_to_target_files.py). Images under $OUT (built with `make`) are
not affected.

Bug: 64994964
Test: lunch marlin-userdebug; run `m dist` twice (after deleting the
      intermediate files under $OUT/obj/PACKAGING), and compare the
      generated images.
Change-Id: I41cf4e5869582bb930af2f35a8e9c79bff43b2a2
(cherry picked from commit 3aa21e6bb9)
2017-10-16 22:48:33 -07:00
Ryan Campbell
02871f24cf Merge "Create product sysprops on vendor partition." into oc-mr1-dev am: 5dbc0cab73
am: 4a57b1645e

Change-Id: Icd72104e98f0ad13f3c1bf15a57a02612d7c75f6
2017-10-17 02:15:41 +00:00
Ryan Campbell
4a57b1645e Merge "Create product sysprops on vendor partition." into oc-mr1-dev
am: 5dbc0cab73

Change-Id: I13705b6d8337720dcf5d89d1a019a01a805e1c6c
2017-10-17 01:42:58 +00:00
Bowgo Tsai
50b8e537a6 Merge "Adding Android verified boot 1.0 metadata into ENG builds" am: 5f958ccad5 am: 86c4f8ed54 am: 08a05cd9ae
am: 0e1ada16ce

Change-Id: I87610d125ec4238c7b62774a053ee65fd1838368
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

Change-Id: Ie7471976439616452b0c830b19471be1748a750a
2017-10-15 03:26:24 +00:00
Bowgo Tsai
86c4f8ed54 Merge "Adding Android verified boot 1.0 metadata into ENG builds"
am: 5f958ccad5

Change-Id: I54405288a18db3940b0721d5638127e66b7cac3e
2017-10-15 02:48:17 +00:00
Ryan Campbell
aea0f92ff3 Create product sysprops on vendor partition.
Duplicate essential product sysprops for manufacturer, model, brand, name, and device
from system on vendor so that mixed builds (vendor.img + GSI system.img) have correct
product information in their CTS/VTS reports.

Test: make
Bug: 64458205
Change-Id: Ib63b37772be493b9e035d9b7e8c5e2cf66f2fa8c
2017-10-13 15:47:58 -07:00
Tom Cherry
47c4eb4680 Allow ro. properties to have arbitrary lengths
Bug: 23102347
Bug: 34954705
Test: provide a fingerprint >92 characters long and see that it
      successfully works

Change-Id: Ida9ffd5266acb3b432b208780804a08e8f7391b4
2017-10-12 09:21:48 -07: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
TreeHugger Robot
800b7a3b2f Merge "Specify --max_timestamp when calling brillo_update_payload." 2017-10-09 21:41:49 +00:00
Dan Willemsen
905b2e00f1 Ignore zip comments in dump-package-stats
Use -q to silence zip comments, which also silences the first line.

Bug: 67345114
Test: find vendor -name '*.apk' | xargs build/tools/dump-package-stats
Change-Id: Icb319c603de7c29644c58520213940179f67b7e4
2017-10-03 18:57:18 -07:00
Chih-Hung Hsieh
a0a1e3a2c8 Merge "Use -Werror in build/make" am: 2d1681c804 am: 7dba41687e am: 87b8c55312
am: cc60af86c4

Change-Id: I2cc6461d93d1389c719ad4395902281e10310aea
2017-10-03 23:08:29 +00:00
Dan Willemsen
8bbeef7c0c Merge "Ignore zip comments in dump-package-stats" am: 75cc5bf9ae am: c4c502e751 am: c624182c0c
am: 05a1495e41

Change-Id: Ia3bd9a4530c943823581c70689698f67689525ed
2017-10-03 23:07:14 +00:00
Chih-Hung Hsieh
cc60af86c4 Merge "Use -Werror in build/make" am: 2d1681c804 am: 7dba41687e
am: 87b8c55312

Change-Id: I12ebc5273e1e95bf5907390d5e6ca8894ac82c6f
2017-10-03 23:00:15 +00:00
Dan Willemsen
05a1495e41 Merge "Ignore zip comments in dump-package-stats" am: 75cc5bf9ae am: c4c502e751
am: c624182c0c

Change-Id: I252d77518c0b6ce0b1d4934255c99c66bba86e50
2017-10-03 22:51:56 +00:00
Chih-Hung Hsieh
7dba41687e Merge "Use -Werror in build/make"
am: 2d1681c804

Change-Id: If94e0a0210c7e47880729ad18b7a24e26be4d597
2017-10-03 22:47:22 +00:00
Dan Willemsen
c4c502e751 Merge "Ignore zip comments in dump-package-stats"
am: 75cc5bf9ae

Change-Id: If9f2fa10f24aa90234bd01bdd00177308d80aa9e
2017-10-03 22:40:09 +00:00
Treehugger Robot
2d1681c804 Merge "Use -Werror in build/make" 2017-10-03 22:38:24 +00:00
Tao Bao
ed08bc4a22 Specify --max_timestamp when calling brillo_update_payload.
Bug: 36232423
Test: Create OTA packages (full, incremental and downgrade) with
      ota_from_target_files.py; check the parameters passed down to
      brillo_update_payload.
Change-Id: I3af397f05fe16f4a9f0eb73e8272bac6afdc002a
2017-10-03 14:18:33 -07:00
Chih-Hung Hsieh
2a5bc9dfbf Use -Werror in build/make
* Remove unused local variables.

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: Iced5bb903902f49d7cd5cf5f572906a512c75e18
2017-10-03 13:53:13 -07:00
Dan Willemsen
093075304b Ignore zip comments in dump-package-stats
Use -q to silence zip comments, which also silences the first line.

Bug: 67345114
Test: find vendor -name '*.apk' | xargs build/tools/dump-package-stats
Change-Id: Icb319c603de7c29644c58520213940179f67b7e4
2017-10-03 12:56:09 -07:00
Tao Bao
34d99c17f4 Merge "Use computed salt for AVB-signed images." am: 4655de40c1 am: 815b445c14
am: 431b213f70

Change-Id: I49f904aba86b1f97774bfdd482692cacf099245f
2017-09-29 19:58:56 +00:00
Tao Bao
815b445c14 Merge "Use computed salt for AVB-signed images."
am: 4655de40c1

Change-Id: Ifd379a8b90b09ea40f56d15e65c17545024d76dc
2017-09-29 19:53:46 +00:00
Tao Bao
2b6dfd6689 Use computed salt for AVB-signed images.
We want the generated images being identical for the same source files.
Currently the generated ext4 image (either from make_ext4fs or mke2fs)
is reproducible, but the AVB footer added by avbtool contain changes
because of the random salt being used.

This CL changes the avbtool invocation to specify "--salt <hexstring>"
(already supported by avbtool) to use reproducible salt that's computed
based on fingerprints (or thumbprints if applicable).

Bug: 67023482
Test: Regenerate images from the same source as follows:
  Use a target_files.zip from an AVB-enabled target.
    $ zip -d target_files.zip IMAGES/\*
    $ ./build/make/tools/releasetools/add_img_to_target_files.py \
          -v target_files.zip
  Repeat the above commands and compare the generated images.
Change-Id: Id9db17ae0132ca3a820b4be5a5ef06ca3fef71ed
(cherry picked from commit 8f05cca1d9)
2017-09-29 10:47:40 -07:00
Tao Bao
16cda2fbff Use computed salt for AVB-signed images.
We want the generated images being identical for the same source files.
Currently the generated ext4 image (either from make_ext4fs or mke2fs)
is reproducible, but the AVB footer added by avbtool contain changes
because of the random salt being used.

This CL changes the avbtool invocation to specify "--salt <hexstring>"
(already supported by avbtool) to use reproducible salt that's computed
based on fingerprints (or thumbprints if applicable).

Bug: 67023482
Test: Regenerate images from the same source as follows:
  Use a target_files.zip from an AVB-enabled target.
    $ zip -d target_files.zip IMAGES/\*
    $ ./build/make/tools/releasetools/add_img_to_target_files.py \
          -v target_files.zip
  Repeat the above commands and compare the generated images.
Change-Id: Id9db17ae0132ca3a820b4be5a5ef06ca3fef71ed
Merged-In: Id9db17ae0132ca3a820b4be5a5ef06ca3fef71ed
(cherry picked from commit 8f05cca1d9)
2017-09-29 10:44:57 -07:00