Commit Graph

60471 Commits

Author SHA1 Message Date
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
Jiyong Park
67a7189936 Merge "Reland "mark platform un-availability""" into rvc-dev 2020-05-07 01:05:32 +00:00
Treehugger Robot
150aacfc21 Merge "Editorial: fix indentation" am: 4861b1f099 am: cbbbc1dc30
Change-Id: I1cbe993797138eaa87f53f910790cd8cede581f1
2020-05-06 23:09:01 +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
Dmitri Plotnikov
77b8ea4df3 Merge "Remove service-jobscheduler and service-blobstore from SERVICECLASSPATH" into rvc-dev am: 3a1acc0458
Change-Id: Icd45c0b127f0149fdc0901b5bb132b109823348c
2020-05-06 19:46:56 +00:00
Jaewoong Jung
f25327b4bd Install .idsig files to test suite dirs.
Bug: 153675112
Test: m cts && ls out/host/linux-x86/cts/android-cts/testcases/
Change-Id: I2f24f4567ed3fab1f6ad4d66cc0f798332543b8d
2020-05-06 12:46:30 -07:00
Dmitri Plotnikov
3a1acc0458 Merge "Remove service-jobscheduler and service-blobstore from SERVICECLASSPATH" into rvc-dev 2020-05-06 19:41:49 +00:00
Bill Yi
6245c3c8a2 [automerger skipped] Merge "Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE" am: 468f5b46be -s ours am: 3b6be182d8 -s ours
am skip reason: subject contains skip directive

Change-Id: I19767a700803d92f13a5aee53eca182f6f17e104
2020-05-06 16:24:47 +00: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
f3d6cce5b8 Merge "Reland "mark platform un-availability""" am: dcdd0db41a am: cac3197df5
Change-Id: Id4cb83466c4bff5d1ba447b42f0baaed6c915eea
2020-05-06 12:50:49 +00:00
Jiyong Park
7d40b59c4d Reland "mark platform un-availability""
This reverts commit 6e1fa4452b.

Reason for revert: relanding a reverted changed

Bug: 153073816
Test: m

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

Merged-In: I3735866776cf6eb0320c9fb8c6be8ac0c48baa1c
(cherry picked from commit 403c255b6f)
Change-Id: I3735866776cf6eb0320c9fb8c6be8ac0c48baa1c
2020-05-06 21:42:25 +09: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
aa887670ae Merge "releasetools: Fallback to "mkbootimg_args" if "recovery_mkbootimg_args" not found." am: ec8abc0eb3 am: ec788a7f58
Change-Id: Id69aafe1eb55e2f126f53d302dfaf91740015f0f
2020-05-06 08:08:57 +00:00