Commit Graph

58572 Commits

Author SHA1 Message Date
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 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
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
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
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
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 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
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 60b649f32f Merge "Add boringssl_self_test to base PRODUCT_PACKAGES." 2020-05-07 17:18:14 +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
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 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 cbbbc1dc30 Merge "Editorial: fix indentation" am: 4861b1f099
Change-Id: Ifec4e3cbe613918f3d1189ec74fef70303bc4ad6
2020-05-06 22:55:03 +00:00
Treehugger Robot 4861b1f099 Merge "Editorial: fix indentation" 2020-05-06 22:40:17 +00:00
Sasha Smundak f15ff83b07 Editorial: fix indentation
Test: treehugger
Change-Id: Ie461f7244c52c0ea5f463409290901c16e424636
2020-05-06 13:46:30 -07:00
Bill Yi 3b6be182d8 [automerger skipped] Merge "Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE" am: 468f5b46be -s ours
am skip reason: Change-Id Ief4b514032bfad1fad1a81c68b4f5e360569f105 with SHA-1 db9b1bd6fd is in history

Change-Id: Ic1f35401b300869eadba9eb64728492f61026b5b
2020-05-06 16:15:35 +00:00
Bill Yi 468f5b46be Merge "Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE" 2020-05-06 15:59:08 +00:00
Treehugger Robot cac3197df5 Merge "Reland "mark platform un-availability""" am: dcdd0db41a
Change-Id: I3497499030933a6da487e4b8790f7d8b122d3cac
2020-05-06 12:38:59 +00:00
Treehugger Robot dcdd0db41a Merge "Reland "mark platform un-availability""" 2020-05-06 12:28:02 +00:00
Jiyong Park 157ac24d6b rename libvixl to libvixl.com.android.art.debug
With I1889653812a980f6a2e3b6b25e7647f7c5919606, libvixl is not available
to the platform as it is included in the ART APEX. To use the APEX
variant of the library, we use the <name>:<apex_name> notation.

Exempt-From-Owner-Approval: cherry-pick from internal

Bug: 150999716
Test: m
Merged-In: I2206f1c28fc0019c0fd726059aa732145f2998ed
(cherry picked from commit 127eae76bc)
Change-Id: I2206f1c28fc0019c0fd726059aa732145f2998ed
2020-05-06 17:48:10 +09:00
Treehugger Robot ec788a7f58 Merge "releasetools: Fallback to "mkbootimg_args" if "recovery_mkbootimg_args" not found." am: ec8abc0eb3
Change-Id: Ide9def470d3372c50f6abf88612f057701060a50
2020-05-06 07:55:22 +00:00
Treehugger Robot ec8abc0eb3 Merge "releasetools: Fallback to "mkbootimg_args" if "recovery_mkbootimg_args" not found." 2020-05-06 07:32:12 +00:00
Chris Gross c0793d73f4 Merge "Allow bootjars in system_ext." am: ad0329462b
Change-Id: I0147d623ba947a1f68f2822f1add922aa481de16
2020-05-05 21:15:42 +00:00
Chris Gross ad0329462b Merge "Allow bootjars in system_ext." 2020-05-05 21:12:39 +00:00
Bill Yi e1fe634c3f Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE
Change-Id: I3a011850a108e0c66a10033e7df7ec45cd65320b
Merged-In: I474bf28ef86c76dd604fbece203c15a91e7ce92a
Merged-In: I61b7ab63d9bfa44259e3219903f551df5904505b
Merged-In: I4393eea75a53f90e23a53020b4a551228564e3cc
Merged-In: Ie843b46958b008073dc60d426e9dff4134db2430
Merged-In: Ief4b514032bfad1fad1a81c68b4f5e360569f105
2020-05-05 20:47:21 +00:00
Treehugger Robot 389b441362 Merge "Allow passing in codename_to_api_level_map to sign_apex." am: bcf9ffa819
Change-Id: I6e2378c012ebf8090a7bba68a69b6a6941f1559a
2020-05-05 19:14:07 +00:00
Treehugger Robot bcf9ffa819 Merge "Allow passing in codename_to_api_level_map to sign_apex." 2020-05-05 19:00:11 +00:00
Victor Chang ce051d16a4 "Move core-icu4j into i18n APEX" Attempt 2
This reverts commit b72f1e1a8a.
Reland https://r.android.com/1284676

Bug: 138994281
Test: core-icu4j observed in i18n APEX
Change-Id: If773316261fb1f5fb37b56c5233efcc4a434354a
2020-05-05 19:16:30 +01:00
Yifan Hong 90095aeb1f Merge "Fix check target files vintf test." am: 2637f8bec7
Change-Id: I4ce9b9a9578271d5716c35ddbe94f24b081b9ffe
2020-05-05 15:37:02 +00:00
Yifan Hong 2637f8bec7 Merge "Fix check target files vintf test." 2020-05-05 15:23:17 +00:00
vichang 0f1deb3a8b Merge "Revert "Move core-icu4j into i18n APEX"" am: a2d0a60b79
Change-Id: I0b6acbf4e78e4c9852edf0802cd10fc01b1dc1f2
2020-05-05 12:00:53 +00:00
vichang a2d0a60b79 Merge "Revert "Move core-icu4j into i18n APEX"" 2020-05-05 11:46:51 +00:00
vichang b72f1e1a8a Revert "Move core-icu4j into i18n APEX"
Revert "Move libpac into i18n APEX"

Revert "Add shared library into i18n APEX and add the required s..."

Revert "Make com_android_i18n namespace visible"

Revert submission 1299494-i18nApex

Reason for revert: Breaking aosp_x86-eng on aosp-master
Reverted Changes:
I30fc3735b:Move ICU from ART APEX to i18n APEX
Icb7e98b5c:Calling @IntraCoreApi from core-icu4j should not c...
Ic7de63fe3:Move core-icu4j into I18n APEX
I65b97bdba:Make com_android_i18n namespace visible
Ia4c83bc15:Move v8 and libpac into i18n APEX
I10e6d4948:Move core-icu4j into i18n APEX
I8d989cad7:Move ICU from ART APEX into i18n APEX
I72216ca12:Move ICU into i18n APEX
Ief9dace85:Add shared library into i18n APEX and add the requ...
I7d97a10ba:Move libpac into i18n APEX
I90fff9c55:Move ICU from ART APEX into i18n APEX

Change-Id: I12a7d609d43620edaf2c5f12711eb3ca3a570d79
2020-05-05 11:11:30 +00:00
vichang 285ae1b0dd Merge "Move core-icu4j into i18n APEX" am: 879d654515
Change-Id: I875045ec42de409700255c98e86a89becb11bef6
2020-05-05 09:03:58 +00:00
vichang 879d654515 Merge "Move core-icu4j into i18n APEX" 2020-05-05 08:52:21 +00:00
Treehugger Robot 005f14a952 Merge "Remove TARGET_PROJECT[_SYSTEM]_INCLUDES" am: 592a675e7d
Change-Id: Iadfed0dd57a6714734d0f15c92f0f356d70495fb
2020-05-04 23:38:09 +00:00
Treehugger Robot 592a675e7d Merge "Remove TARGET_PROJECT[_SYSTEM]_INCLUDES" 2020-05-04 23:25:20 +00:00
Treehugger Robot 67893b73c6 Merge "Skip _oem_props if oem_dicts is None." am: 6464edbf3e
Change-Id: I7418265b5ecc573e65ed5351b589e697ecff4a42
2020-05-04 19:14:18 +00:00
Treehugger Robot 6464edbf3e Merge "Skip _oem_props if oem_dicts is None." 2020-05-04 18:54:35 +00:00
Hongguang Chen d7c160ffbf Skip _oem_props if oem_dicts is None.
The oem_dicts in BuildInfo is only available to ota_from_target_files
when it's called with "--oem_settings" input. However, aosp/1135332
starts to use BuildInfo in add_img_to_target_files w/o oem_dicts. An
assert is triggered due to it when oem_fingerprint_properties is in the
info_dict.
This change skip _oem_props reading if oem_dicts is None to allow to
this case.

BUG: 155360923
BUG: 154171021
Test: Sign images with oem_fingerprint_properties.
Change-Id: I6a73feecd9567fd4d85f4eab3d4e11c5df28fe39
2020-05-04 16:54:10 +00:00