Commit Graph

60471 Commits

Author SHA1 Message Date
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
fce49d95be Merge "Allow bootjars in system_ext." am: ad0329462b am: c0793d73f4
Change-Id: I95ad6ae1700d98372d3f2541f4762a8828a1c584
2020-05-05 21:33:58 +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
Dmitri Plotnikov
b99d94f9b2 Remove service-jobscheduler and service-blobstore from SERVICECLASSPATH
Test: atest android.jobscheduler.cts
Bug: 155631167
Change-Id: I5873c15513cfc63771e7d5c73791708105dff002
2020-05-05 13:28:34 -07:00
Treehugger Robot
ade423cbb0 [automerger skipped] Merge "Allow passing in codename_to_api_level_map to sign_apex." am: bcf9ffa819 am: 389b441362 -s ours
am skip reason: Change-Id I93a90ae066b0e9eeb1b2ff26d9cb9b07a11fe68c with SHA-1 8424f2e56c is in history

Change-Id: I3d5d0a945189e93eb4f2e56a3f0e8d6efc6a9cf1
2020-05-05 19:28:40 +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
b1ee30d728 Merge "Fix check target files vintf test." am: 2637f8bec7 am: 90095aeb1f
Change-Id: I0db3785d55ac50a4744fed0857bf9d2944bc0754
2020-05-05 15:49:38 +00:00
Yifan Hong
90095aeb1f Merge "Fix check target files vintf test." am: 2637f8bec7
Change-Id: I4ce9b9a9578271d5716c35ddbe94f24b081b9ffe
2020-05-05 15:37:02 +00:00
Jeff Sharkey
2a5b9342f0 Merge "Split MediaProvider into its own target." into rvc-dev am: f068a60e8a
Change-Id: I7efc2e73ce5798c19432f4004b7cf913599ccbd1
2020-05-05 15:37:01 +00:00
Yifan Hong
2637f8bec7 Merge "Fix check target files vintf test." 2020-05-05 15:23:17 +00:00
Jeff Sharkey
f068a60e8a Merge "Split MediaProvider into its own target." into rvc-dev 2020-05-05 15:21:13 +00:00
vichang
e57e6fe7a8 Merge "Revert "Move core-icu4j into i18n APEX"" am: a2d0a60b79 am: 0f1deb3a8b
Change-Id: I1d247bd4c515a87a5f944eec8d01cd96f41409a2
2020-05-05 12:16:16 +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
Jiyong Park
127eae76bc 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.

Bug: 150999716
Test: m
Change-Id: I2206f1c28fc0019c0fd726059aa732145f2998ed
2020-05-05 18:49:46 +09:00
vichang
52c7a1f35f Merge "Move core-icu4j into i18n APEX" am: 879d654515 am: 285ae1b0dd
Change-Id: I19b4641d3232f99ad9784e0f7889ca51b66d5491
2020-05-05 09:33:15 +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
a29c164557 Merge "Remove TARGET_PROJECT[_SYSTEM]_INCLUDES" am: 592a675e7d am: 005f14a952
Change-Id: I29b1f2e5c51669af26fd24754037c0b2491fdfda
2020-05-04 23:52:03 +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
Hongguang Chen
ff7d96bb23 Skip _oem_props if oem_dicts is None. am: 3435403284
Change-Id: Id017cc12a169a56aef8bf666559e239061f54622
2020-05-04 22:58:28 +00:00
Hongguang Chen
3435403284 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 skips _oem_props reading if oem_dicts is None to allow this
case.

BUG: 155360923
BUG: 154171021
Test: Sign images with oem_fingerprint_properties.
Change-Id: I6a73feecd9567fd4d85f4eab3d4e11c5df28fe39
Merged-In: Idfd41c8b20b23d50e4895f24500f9a25625b7d98
2020-05-04 20:45:33 +00:00
Treehugger Robot
59abc40f73 Merge "Skip _oem_props if oem_dicts is None." am: 6464edbf3e am: 67893b73c6
Change-Id: I6b68f078908546571917ecf75cc52e4ebf0df10d
2020-05-04 19:33:12 +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
Chris Gross
7f093f7083 Allow bootjars in system_ext.
Bug: 148385042
Test: Built and booted Pixel 3a both with and without a boot jar in system_ext.
Change-Id: I17c95a6347552d4cf0db76c10d762c591b56d48a
2020-05-04 08:26:29 -07:00
P.Adarsh Reddy
d8e24eee70 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.

Change-Id: If40359130b8e6da48cb8c345d8cb079f457fe36f
2020-05-04 14:30:09 +00:00
Victor Chang
a27b703c49 Move core-icu4j into i18n APEX
Bug: 138994281
Test: core-icu4j observed in i18n APEX
Change-Id: I10e6d49485305f84b31d62f858c3c032aba4d3df
2020-05-04 12:46:03 +01:00
Jiyong Park
9a5771cb0d Merge "Revert "mark platform un-availability"" am: af4c62f78a am: bf016c45f3
Change-Id: I56d16b2a38af5bdf09e65e5de06375d48c2c6af4
2020-05-04 11:29:45 +00:00
Jiyong Park
bf016c45f3 Merge "Revert "mark platform un-availability"" am: af4c62f78a
Change-Id: Icfe065dfed5e921fd0e5313bff20c6bd3e17cc14
2020-05-04 11:15:21 +00:00
Jiyong Park
403c255b6f Reland "mark platform un-availability""
This reverts commit 6e1fa4452b.

Reason for revert: relanding a reverted changed

Bug: 153073816
Change-Id: I3735866776cf6eb0320c9fb8c6be8ac0c48baa1c
Test: m
2020-05-04 11:12:00 +00:00
Jiyong Park
af4c62f78a Merge "Revert "mark platform un-availability"" 2020-05-04 10:58:24 +00:00
Jiyong Park
6e1fa4452b Revert "mark platform un-availability"
This reverts commit f9e67a8980.

Reason for revert: broke some targets

Exempt-From-Owner-Approval: reverting

Change-Id: I10af29b0fcf564dba0c3dbc1951b660b24fc58bb
2020-05-04 10:57:26 +00:00
Jiyong Park
f535e50ba2 Merge "mark platform un-availability" am: 8023018b0c am: 327107e3bd
Change-Id: I524c4c2c9130ac270234f1b73ac812f285c7ddf3
2020-05-04 10:34:30 +00:00
Jiyong Park
327107e3bd Merge "mark platform un-availability" am: 8023018b0c
Change-Id: I43d50c99f3709ad716d8f3ac99390726ed9d5764
2020-05-04 10:22:51 +00:00
Jiyong Park
8023018b0c Merge "mark platform un-availability" 2020-05-04 10:10:24 +00:00
Ulyana Trafimovich
20a13769d9 Merge "Use two-column format for PRODUCT_BOOT_JARS components." am: 5f27aa4948 am: b0e411b030
Change-Id: I16fe462adf5cfcbbc8509fe0104a2c04d872f1c9
2020-05-04 09:08:11 +00:00
Ulyana Trafimovich
b0e411b030 Merge "Use two-column format for PRODUCT_BOOT_JARS components." am: 5f27aa4948
Change-Id: I028ce1071ee90a4a78c45af7304a7ae7b64bd1a2
2020-05-04 09:02:10 +00:00
Ulyana Trafimovich
5f27aa4948 Merge "Use two-column format for PRODUCT_BOOT_JARS components." 2020-05-04 08:57:47 +00:00
Dan Willemsen
455e58231a [automerger skipped] Merge "Master is now S" am: 19096a2479 am: 104cf995cc -s ours
am skip reason: Change-Id Icf910c950b5bee32fc04db3b1e61251a5706c109 with SHA-1 de005e83f7 is in history

Change-Id: Id745c8543effac6128c86aa4c33135883c280ac9
2020-05-04 07:34:02 +00:00
Dan Willemsen
104cf995cc Merge "Master is now S" am: 19096a2479
Change-Id: I7b6a39f95f837e328f49a5526c440266d4be1ae3
2020-05-04 07:12:00 +00:00
Dan Willemsen
19096a2479 Merge "Master is now S" 2020-05-04 06:58:10 +00:00