Commit Graph

60740 Commits

Author SHA1 Message Date
Greg Kaiser b21e48b499 Revert "Calculate the runtime fingerprint prefixes from build prop"
Revert submission 1297095

Bug: 156131275
Reason for revert: Broken build
Reverted Changes:
I2fe7e93a2:Add a wrapper class PartitionBuildProp
Iac093a40d:Calculate the runtime fingerprint prefixes from bu...

Change-Id: I8b1262c6e94a1db349de39896e56f366c8d64d4c
2020-05-09 00:30:33 +00:00
Tianjie Xu e9dc695f60 Merge changes Iac093a40,I2fe7e93a am: 8aba9ec7c8 am: 93eec51aa4
Change-Id: I3f20e7d90ccf0d83aab03f6d89e3b2522b596ffc
2020-05-08 21:26:19 +00:00
Tianjie Xu 93eec51aa4 Merge changes Iac093a40,I2fe7e93a am: 8aba9ec7c8
Change-Id: I7d79d696d261945c7287336e080064d24fc2e5da
2020-05-08 21:09:41 +00:00
Tianjie Xu 8aba9ec7c8 Merge changes Iac093a40,I2fe7e93a
* changes:
  Calculate the runtime fingerprint prefixes from build prop
  Add a wrapper class PartitionBuildProp
2020-05-08 20:59:27 +00:00
Dan Shi f60056f219 Merge "Revert "Add vts related artifacts to vts-core package"" am: fb42b79210 am: 7815818869
Change-Id: I60db7fb585bd76866a10fd4b6eb1b0e8d89f99f1
2020-05-08 20:38:01 +00:00
Dan Shi 7815818869 Merge "Revert "Add vts related artifacts to vts-core package"" am: fb42b79210
Change-Id: Icd1823ee487ef7b3209f50d556ba7f2a4795d63b
2020-05-08 20:16:36 +00:00
Dan Shi fb42b79210 Merge "Revert "Add vts related artifacts to vts-core package"" 2020-05-08 20:03:06 +00:00
Dan Shi c4fa187094 Revert "Add vts related artifacts to vts-core package"
This reverts commit 5e06288e7c.

Bug: 149249068
Test: build
Change-Id: I8245f1b7a4a74e133c0b7958e0f2908e4e8efd05
2020-05-08 10:52:31 -07:00
David Zeuthen d5505f2c74 Update Keymaster AIDL to V2 in VNDK list
Bug: 156076333
Test: atest VtsHalIdentityTargetTest
Test: atest android.security.identity.cts
Change-Id: I293f4cca815b62bbbaf6334b36a83c669694fd12
2020-05-08 12:50:44 -04:00
Treehugger Robot 1f32f67ce2 [automerger skipped] Merge "Build com.android.inprocess.tethering for Go variant" am: 47f2597490 am: 27e8fbcac3 -s ours
am skip reason: Change-Id I1c5ac07e72068a617fa20797496dd022f279d88e with SHA-1 d70896c24a is in history

Change-Id: I5886e79dec8035c564e735bf7e4612a0aa6756a0
2020-05-08 12:47:29 +00:00
Treehugger Robot 27e8fbcac3 Merge "Build com.android.inprocess.tethering for Go variant" am: 47f2597490
Change-Id: I3ffc3c2f95e816947c7e35e11f035dab0ff0d59a
2020-05-08 12:29:38 +00:00
Treehugger Robot 47f2597490 Merge "Build com.android.inprocess.tethering for Go variant" 2020-05-08 12:11:47 +00:00
markchien ddb0f0ab3b Build com.android.inprocess.tethering for Go variant
Bug: 155604224
Test: build
Change-Id: I1c5ac07e72068a617fa20797496dd022f279d88e
Merged-In: I1c5ac07e72068a617fa20797496dd022f279d88e
2020-05-08 09:33:42 +00:00
Bowgo Tsai 0f95ac7e8c Enables signing for generic boot images
Enables signing for them so we can verify that the boot partition
contains a valid generic boot image during the compliance test.

This change also adds the chained partition descriptor of
boot partition into vbmeta.img, which contains the corresponding
public key used to verify the boot partition.

Bug: 151094943
Test: lunch aosp_arm64-user, `make` and use `avbtool info_image`
      to check that GKI images are properly signed.
Test: `make dist` and checks that GKI images in the image zip file
      are properly signed.
Change-Id: I2fd69964f9dc62526a813875fa9193913aa4935b
2020-05-08 08:16:25 +00:00
Tianjie 0d2fcd50d7 Calculate the runtime fingerprint prefixes from build prop
In practice, some partners use the 'import' statement to override
the device fingerprint at runtime. The runtime fingerprint will
later add to the metadata of OTA package, so that the OTA server
can deliver the package to corresponding devices correctly.

This CL supports parsing a subset of import statement that the init
process recognizes. And we loose the restriction based on how the
dynamic fingerprint is used in practice. Right now, we only searches
for the override of brand, name and device. And the placeholder
format should be ${placeholder}, with its value supplied by the
script caller.

As part of the implementation, we generate all the possible
combinations of the input boot variables. And recalculate the
fingerprint for each of the combination. Though we load the
build.prop multiple times, the logic is easier to follow. Also,
it's more convenient to enhance the logic if we only want to
allow some of the boot variables combination later.

Bug: 152167826
Test: unittests pass
Change-Id: Iac093a40dc6f873c5e1858efa44cb2bd6082508a
2020-05-07 23:52:07 -07:00
Inseob Kim f369fefbce DO NOT MERGE Add 30.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS
Bug: 153661471
Test: m selinux_policy
Change-Id: If1c77d867e5f454c6a159fcf9ba563dc9ec16e58
2020-05-08 11:16:29 +09:00
Yifan Hong ae6e0d5d28 Use add_slot_suffix function in edify script
Whenever a device is retrieved from fstab, wrap it with
add_slot_suffix() if it has slotselect option.

Test: change fstab (changes boot image, which is a static partition),
      change system partition (a dynamic partition),
      generate incremental OTA with --force_non_ab and apply it on
      cuttlefish
Bug: 153581609
Change-Id: Id3f8e4425b65176baf1b0ff1ee07ab3d820a3a7f
2020-05-07 16:55:39 -07:00
Jaewoong Jung 718f363ddd [automerger skipped] Merge "Install .idsig files to test suite dirs." am: 9150e7a65c am: 66f94d57fe -s ours
am skip reason: Change-Id I2f24f4567ed3fab1f6ad4d66cc0f798332543b8d with SHA-1 f25327b4bd is in history

Change-Id: I519e5948be29a7f593e26bfb3d634f361d4ed01c
2020-05-07 22:16:22 +00:00
Jaewoong Jung 66f94d57fe Merge "Install .idsig files to test suite dirs." am: 9150e7a65c
Change-Id: I366a89aeb051945145fdfc3ac3dabdae19ac7b53
2020-05-07 22:02:46 +00:00
Jaewoong Jung 9150e7a65c Merge "Install .idsig files to test suite dirs." 2020-05-07 21:48:07 +00:00
TreeHugger Robot 3d2c4e7f62 [automerger skipped] Merge "Add boringssl_self_test to base PRODUCT_PACKAGES." into rvc-dev am: 3c0a90932c -s ours
am skip reason: Change-Id I77b2921d1d7b6be493cd581c46adbadd1f186fb0 with SHA-1 f5a05c4a4b is in history

Change-Id: Iec28c6f6fb107cd4b7bc52d6a42dd130f2702eb3
2020-05-07 19:50:44 +00:00
Yifan Hong 7169f754cc Support forcefully generating non-AB packages.
Force generate a non-A/B update package when requested.

Bug: 154344887
Test: ota_from_target_files.py --force_non_ab ...
Test: apply it as well

Change-Id: I5e81eb161722e07ef50081b6a16685cbc9963ae2
2020-05-07 12:48:17 -07:00
TreeHugger Robot 3c0a90932c Merge "Add boringssl_self_test to base PRODUCT_PACKAGES." into rvc-dev 2020-05-07 19:35:08 +00:00
Jaewoong Jung c8faeb574c Install .idsig files to test suite dirs.
(This is a cherry-pick change.)

Bug: 153675112
Test: m cts && ls out/host/linux-x86/cts/android-cts/testcases/
Change-Id: I2f24f4567ed3fab1f6ad4d66cc0f798332543b8d
Merged-In: I2f24f4567ed3fab1f6ad4d66cc0f798332543b8d
2020-05-07 11:54:22 -07:00
Ivan Lozano 4d2107aff7 Merge "Add support for Rust coverage files from Soong." am: 34f82e1af2 am: 2510cdfeb7
Change-Id: Ic4b5604d9f4fc2954a142668ab15890fa673452b
2020-05-07 18:41:29 +00:00
Ivan Lozano 2510cdfeb7 Merge "Add support for Rust coverage files from Soong." am: 34f82e1af2
Change-Id: I2719ce038eef8cc08353b79653fe53229abe550c
2020-05-07 18:07:50 +00:00
Ivan Lozano 34f82e1af2 Merge "Add support for Rust coverage files from Soong." 2020-05-07 17:56:43 +00:00
TreeHugger Robot d2ff2961d1 [automerger skipped] Merge "releasetools: Fallback to "mkbootimg_args" if "recovery_mkbootimg_args" not found." into rvc-dev am: 60f3ee6406 -s ours
am skip reason: Change-Id If40359130b8e6da48cb8c345d8cb079f457fe36f with SHA-1 d8e24eee70 is in history

Change-Id: I9b7d49e672e1181bac1257328096f3510f717785
2020-05-07 17:56:15 +00:00
Pete Bentley 933077d15c Merge "Add boringssl_self_test to base PRODUCT_PACKAGES." am: 60b649f32f am: a3be9bfa10
Change-Id: Ic7df3a7d52ff9a334ddbcd0ff788ad12fb265124
2020-05-07 17:50:03 +00:00
TreeHugger Robot 60f3ee6406 Merge "releasetools: Fallback to "mkbootimg_args" if "recovery_mkbootimg_args" not found." into rvc-dev 2020-05-07 17:42:42 +00:00
Pete Bentley a3be9bfa10 Merge "Add boringssl_self_test to base PRODUCT_PACKAGES." am: 60b649f32f
Change-Id: I48cf330ab95240f6a683c5830b40923c23a8ed17
2020-05-07 17:29:37 +00:00
Pete Bentley c85cd10008 Add boringssl_self_test to base PRODUCT_PACKAGES.
When building from source this gets installed as a requirement
from Conscrypt, but needs to be present when Conscrypt is
shipped as a pre-built too.

I think the correct solution here is actually to make libcrypto
rather than Conscrypt require boringssl_self_test but Soong
considers that a circular dependency.

Bug: 155520949
Test: m installclean && m

Change-Id: I77b2921d1d7b6be493cd581c46adbadd1f186fb0
Merged-In: I77b2921d1d7b6be493cd581c46adbadd1f186fb0
(cherry picked from commit f5a05c4a4b)
2020-05-07 18:28:17 +01:00
Pete Bentley 60b649f32f Merge "Add boringssl_self_test to base PRODUCT_PACKAGES." 2020-05-07 17:18:14 +00:00
P.Adarsh Reddy e4d5d568a3 releasetools: Fallback to "mkbootimg_args" if "recovery_mkbootimg_args" not found.
For older target_files.zip, since "recovery_mkbootimg_args" may not be
set fallback to the earlier config -"mkbootimg_args" for recovery image.
This will make releasetools backward compatible, and usable for
older/already generated target-files package.

Bug: 155708400
Change-Id: If40359130b8e6da48cb8c345d8cb079f457fe36f
Merged-In: If40359130b8e6da48cb8c345d8cb079f457fe36f
2020-05-07 09:15:57 -07:00
Jaewoong Jung 6211a0fda1 Merge "Install .idsig files to test suite dirs." into rvc-dev am: d4297e0b64
Change-Id: Ie98177b2249df23a74c338e53331e50f4c08e38a
2020-05-07 15:32:01 +00:00
Mark Chien 588a250747 Merge "Build com.android.inprocess.tethering for Go variant" into rvc-dev am: 6e9704ed5c
Change-Id: I6c194e5b88cbd817e22d83d779c30b512c58dede
2020-05-07 15:31:50 +00:00
Jaewoong Jung d4297e0b64 Merge "Install .idsig files to test suite dirs." into rvc-dev 2020-05-07 15:20:05 +00:00
Mark Chien 6e9704ed5c Merge "Build com.android.inprocess.tethering for Go variant" into rvc-dev 2020-05-07 15:15:59 +00:00
Pete Bentley f5a05c4a4b Add boringssl_self_test to base PRODUCT_PACKAGES.
When building from source this gets installed as a requirement
from Conscrypt, but needs to be present when Conscrypt is
shipped as a pre-built too.

I think the correct solution here is actually to make libcrypto
rather than Conscrypt require boringssl_self_test but Soong
considers that a circular dependency.

Bug: 155520949
Test: m installclean && m

Change-Id: I77b2921d1d7b6be493cd581c46adbadd1f186fb0
2020-05-07 14:35:54 +01:00
markchien d70896c24a Build com.android.inprocess.tethering for Go variant
Bug: 155604224
Test: build
Change-Id: I1c5ac07e72068a617fa20797496dd022f279d88e
2020-05-07 20:07:42 +08:00
vichang 4f61cf6540 Merge ""Move core-icu4j into i18n APEX" Attempt 2" am: 5520858b97 am: 843604223e
Change-Id: Ifaa3f0abd3962016d44e3ba27e5bbd8aedf2bf14
2020-05-07 10:12:05 +00:00
vichang 843604223e Merge ""Move core-icu4j into i18n APEX" Attempt 2" am: 5520858b97
Change-Id: I1cbad50fa99e6a95573f6c4c011bdcb6622e8a5a
2020-05-07 09:51:23 +00:00
vichang 5520858b97 Merge ""Move core-icu4j into i18n APEX" Attempt 2" 2020-05-07 09:34:51 +00:00
Tianjie fd3883f159 Add a wrapper class PartitionBuildProp
The build prop for a partition used to be a simple key:value
dictionary. But we need more fields to hold the alternative build
props overriden by the 'import' statement. Therefore, add a new
class as a wrapper for these props first.

Bug: 152167826
Test: unittests pass
Change-Id: I2fe7e93a2f4de8e55f5f8051b000b96b5efdc85a
2020-05-06 22:09:44 -07:00
Jiyong Park 781ea24496 [automerger skipped] Merge "rename libvixl to libvixl.com.android.art.debug" am: dc8a239c69 am: 10c7950e0f -s ours
am skip reason: Change-Id I2206f1c28fc0019c0fd726059aa732145f2998ed with SHA-1 127eae76bc is in history

Change-Id: Id5cd2548ecb1dc247df1e27a8307e54f9202d0cb
2020-05-07 04:11:29 +00:00
Jiyong Park 10c7950e0f Merge "rename libvixl to libvixl.com.android.art.debug" am: dc8a239c69
Change-Id: I1af14e2e6b0e294b7946020705ae141f5e1be757
2020-05-07 03:53:57 +00:00
Jiyong Park dc8a239c69 Merge "rename libvixl to libvixl.com.android.art.debug" 2020-05-07 03:35:03 +00:00
TreeHugger Robot a87b814b1b Merge "rename libvixl to libvixl.com.android.art.debug" into rvc-dev am: 8f33cc8f65
Change-Id: If68a7d8fdfacb090e5c0b42942ef3d1f83a4ee85
2020-05-07 02:25:18 +00:00
TreeHugger Robot 8f33cc8f65 Merge "rename libvixl to libvixl.com.android.art.debug" into rvc-dev 2020-05-07 02:09:30 +00:00
Jiyong Park 687f2c1562 [automerger skipped] Merge "Reland "mark platform un-availability""" into rvc-dev am: 67a7189936 -s ours
am skip reason: Change-Id I3735866776cf6eb0320c9fb8c6be8ac0c48baa1c with SHA-1 403c255b6f is in history

Change-Id: I925447190c905ef34dbafb426877fe5f62e322a7
2020-05-07 01:22:54 +00:00