Yihan Dong
8cdfdb1720
Merge "Create the TEST_MAPPING file" into main am: 8c0cb8f5e3
am: 33ca96ab66
am: 61ecce75c2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2719153
Change-Id: Ibff5934ce9729b92a6a042849195f56ee7bc07eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-22 10:10:39 +00:00
Yihan Dong
61ecce75c2
Merge "Create the TEST_MAPPING file" into main am: 8c0cb8f5e3
am: 33ca96ab66
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2719153
Change-Id: I29b758565d0c9e9ea82ed7445d01d62b8ce71cf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-22 09:34:35 +00:00
Yihan Dong
33ca96ab66
Merge "Create the TEST_MAPPING file" into main am: 8c0cb8f5e3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2719153
Change-Id: I451328541a8084229a1229cbeb72f8f632d348b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-22 08:56:16 +00:00
Yihan Dong
8c0cb8f5e3
Merge "Create the TEST_MAPPING file" into main
2023-08-22 08:39:36 +00:00
Chun-Yi Lee
43c81c6fda
Merge "Revert "Ignore vndk compat symlinks in artifact path requirements"" into main am: 6f09d105ef
am: b704f738af
am: 6d0f94b1f0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2720714
Change-Id: I3d21b2780752462960ffe60bc999ff28a95c5813
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-22 04:09:09 +00:00
Treehugger Robot
1b4eec5bee
Merge "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN" into main am: 0f5090934f
am: 013135c684
am: 2394053656
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2716817
Change-Id: I24806a2d487e3ac91cc337dc018179e7daa1cf85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-22 04:08:47 +00:00
Kelvin Zhang
cde8734295
Build a boot image for 16K kernel
...
This image can be used to switch the device to 16K kernel.
Test: th
Bug: 293313353
Change-Id: Iea3ad29e0b3789f0c499004f3f346ab3c460f39e
2023-08-21 21:05:43 -07:00
Chun-Yi Lee
6d0f94b1f0
Merge "Revert "Ignore vndk compat symlinks in artifact path requirements"" into main am: 6f09d105ef
am: b704f738af
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2720714
Change-Id: I2f8859ece12585bddcbbc302483097d95e4c21ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-22 03:33:12 +00:00
Treehugger Robot
2394053656
Merge "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN" into main am: 0f5090934f
am: 013135c684
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2716817
Change-Id: I54abbaae80bbec143c4e74a706a16c5d4a1ee633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-22 03:32:47 +00:00
Chun-Yi Lee
b704f738af
Merge "Revert "Ignore vndk compat symlinks in artifact path requirements"" into main am: 6f09d105ef
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2720714
Change-Id: I2d686e4603e5451efff3d82ea5c323e5672c54bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-22 02:56:57 +00:00
Treehugger Robot
013135c684
Merge "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN" into main am: 0f5090934f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2716817
Change-Id: I458874b2327622847f9a7c0fe06a6452cef36d5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-22 02:55:57 +00:00
Chun-Yi Lee
6f09d105ef
Merge "Revert "Ignore vndk compat symlinks in artifact path requirements"" into main
2023-08-22 02:11:23 +00:00
Treehugger Robot
0f5090934f
Merge "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN" into main
2023-08-22 02:09:45 +00:00
Chun-Yi Lee
ed72d33a9a
Revert "Ignore vndk compat symlinks in artifact path requirements"
...
Revert submission 2718295-colefaust_track_apex_compat_symlinks
Reason for revert: To validate if this change is causing the build breakage.
Reverted changes: /q/submissionid:2718295-colefaust_track_apex_compat_symlinks
Change-Id: I781cd6869daaf5931c5fabb5ca109502b1b52b3e
2023-08-22 01:18:51 +00:00
Lokesh Kumar Goel
7574b0a0e0
[automerger skipped] Update Security String to 2023-10-01 am: e257bf1863
am: e3e3c51f6d
am: 683f82977d
am: 428f6a0f8b
-s ours am: 13ca7fb1bc
-s ours am: e7a8201e1f
-s ours
...
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426048
Change-Id: I6d6d21e32a1ac49ac4f6ae45efd2e033a8c38568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-22 01:11:25 +00:00
Lokesh Kumar Goel
d6b6493463
[automerger skipped] Update Security String to 2023-10-01 am: e257bf1863
am: e3e3c51f6d
am: 05e112562d
-s ours am: 155dba296b
-s ours am: c021af522b
-s ours
...
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426048
Change-Id: I64fc0d6bf8762257d43bf4f81009766b5cef2d74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-22 01:10:32 +00:00
Lokesh Kumar Goel
89955802bc
[automerger skipped] Update Security String to 2023-10-01 am: e257bf1863
am: e3e3c51f6d
am: 683f82977d
am: 428f6a0f8b
-s ours am: 13ca7fb1bc
-s ours am: 4bb2deae8b
-s ours
...
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426048
Change-Id: Ib3363e896e0d6016018ec0d83c3aabc40bd428e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-22 00:36:56 +00:00
Lokesh Kumar Goel
80dcb425d8
[automerger skipped] Update Security String to 2023-10-01 am: e257bf1863
am: e3e3c51f6d
am: 05e112562d
-s ours am: 155dba296b
-s ours am: da9342ba92
-s ours
...
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426048
Change-Id: I0f372995024b22e943ff6878a1751cfc8985e7ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-22 00:36:10 +00:00
Lokesh Kumar Goel
e7a8201e1f
[automerger skipped] Update Security String to 2023-10-01 am: e257bf1863
am: e3e3c51f6d
am: 683f82977d
am: 428f6a0f8b
-s ours am: 13ca7fb1bc
-s ours
...
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426048
Change-Id: Iaebc7a07fbe8df8c7de1d122b6d83770340c3af7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 23:55:08 +00:00
Lokesh Kumar Goel
c021af522b
[automerger skipped] Update Security String to 2023-10-01 am: e257bf1863
am: e3e3c51f6d
am: 05e112562d
-s ours am: 155dba296b
-s ours
...
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426048
Change-Id: I78280a12408580ca2b47d45b481a22748b6326ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 23:54:36 +00:00
Lokesh Kumar Goel
4bb2deae8b
[automerger skipped] Update Security String to 2023-10-01 am: e257bf1863
am: e3e3c51f6d
am: 683f82977d
am: 428f6a0f8b
-s ours am: 13ca7fb1bc
-s ours
...
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426048
Change-Id: I6e6a22bd717fc92a6e0f0bca775b182af5156f8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 23:52:41 +00:00
Lokesh Kumar Goel
da9342ba92
[automerger skipped] Update Security String to 2023-10-01 am: e257bf1863
am: e3e3c51f6d
am: 05e112562d
-s ours am: 155dba296b
-s ours
...
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426048
Change-Id: Ib460c3923c35633826ba00901d085fb4cac61874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 23:52:19 +00:00
Lokesh Kumar Goel
13ca7fb1bc
[automerger skipped] Update Security String to 2023-10-01 am: e257bf1863
am: e3e3c51f6d
am: 683f82977d
am: 428f6a0f8b
-s ours
...
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426048
Change-Id: I34e42f72b1b8ac251c1945a5b904e598b489b3c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 23:50:47 +00:00
Cole Faust
cf483e91fb
Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 303e0450a6
am: 1b107d4b5f
am: b023d21043
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2719916
Change-Id: Ic8949f2ea588ebc5e956d578ed0a6559c9150a96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 23:26:36 +00:00
Treehugger Robot
1739b30f34
Merge changes I2920d8b0,I55cd3340 into main am: de9df1dcf6
am: a865decd76
am: 959ed71cf2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2717716
Change-Id: Ia1f63688bdd3a55f52a6008576b8645e25ae04f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 23:26:21 +00:00
Cole Faust
b023d21043
Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 303e0450a6
am: 1b107d4b5f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2719916
Change-Id: I042a54db2f74c465f6b3c82a384fa1719519dda3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 22:52:21 +00:00
Lokesh Kumar Goel
155dba296b
[automerger skipped] Update Security String to 2023-10-01 am: e257bf1863
am: e3e3c51f6d
am: 05e112562d
-s ours
...
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426048
Change-Id: I712a1c2993fbbf4b4608a0dbb840e2e38c22c111
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 22:52:10 +00:00
Treehugger Robot
959ed71cf2
Merge changes I2920d8b0,I55cd3340 into main am: de9df1dcf6
am: a865decd76
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2717716
Change-Id: I5eee4d94c0559271d27683d167161189ccdb4230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 22:52:06 +00:00
Lokesh Kumar Goel
428f6a0f8b
Update Security String to 2023-10-01 am: e257bf1863
am: e3e3c51f6d
am: 683f82977d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426048
Change-Id: Icab679a5e0bf1eb832d8d5207ae7f28a6798827b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 22:47:13 +00:00
Cole Faust
1b107d4b5f
Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 303e0450a6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2719916
Change-Id: I6c0f11717ecf654b8060fb87aea35ee2ad4cf441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 22:15:24 +00:00
Treehugger Robot
a865decd76
Merge changes I2920d8b0,I55cd3340 into main am: de9df1dcf6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2717716
Change-Id: Ic2ae64ee5c1ad43cfd2341d41f0d808063aec896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 22:14:51 +00:00
Cole Faust
303e0450a6
Merge "Ignore vndk compat symlinks in artifact path requirements" into main
2023-08-21 21:54:37 +00:00
Lokesh Kumar Goel
683f82977d
Update Security String to 2023-10-01 am: e257bf1863
am: e3e3c51f6d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426048
Change-Id: Ic024fe708d4bb66efb04413096bae0706feb4df9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 21:34:25 +00:00
Lokesh Kumar Goel
05e112562d
Update Security String to 2023-10-01 am: e257bf1863
am: e3e3c51f6d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426048
Change-Id: I2a2b1b98bc88b8c9f64c243b3496aea231175c5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 21:34:17 +00:00
Treehugger Robot
de9df1dcf6
Merge changes I2920d8b0,I55cd3340 into main
...
* changes:
Add 16K ramdisk to vendor_boot
Move 16K kernel modules to /lib/modules/`uname -r`_16k
2023-08-21 21:32:02 +00:00
Lokesh Kumar Goel
e3e3c51f6d
Update Security String to 2023-10-01 am: e257bf1863
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24426048
Change-Id: I19517c6e9970b6c6f7dbbe7ecd41f6ca73639175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 20:33:43 +00:00
Cole Faust
f7554e3735
Ignore vndk compat symlinks in artifact path requirements
...
A change is being made to properly track apex compat symlinks in
the installation logic, which causes the artifact path requirements
to start complaining about them. Exclude them from the artifact path
requirements.
Bug: 205632228
Test: m nothing
Change-Id: I46150c3b7a4eaac16c2daa80fec2a5640e32b61b
2023-08-21 11:47:39 -07:00
Treehugger Robot
9fc27b2e17
Merge "Add a fake library that contains the minimum DeviceConfig that aconfig code needs to compile." into main am: f7171f4dff
am: a0bfc6a05e
am: 1f73966b36
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2718434
Change-Id: I34fd4b310cb9dc26fa7cb6eb4e21e6e63d89e508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 18:17:21 +00:00
Treehugger Robot
1f73966b36
Merge "Add a fake library that contains the minimum DeviceConfig that aconfig code needs to compile." into main am: f7171f4dff
am: a0bfc6a05e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2718434
Change-Id: Iad2c9412e9ce10a51c83055873a9433a93adfa04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 17:43:39 +00:00
Lokesh Kumar Goel
e257bf1863
Update Security String to 2023-10-01
...
Bug: 295937899
Change-Id: Iceeda64124c3152e9b31c0b6fa994fe77f90fa3b
Merged-In: Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f
Merged-In: I0e2c4746c9042f7caf76cafa1db50f7c93cd211f
2023-08-21 17:25:13 +00:00
Lokesh Kumar Goel
5954b245b7
Update Security String to 2023-10-01
...
Bug: 295937899
Change-Id: Ib26af3dc31e14f6dfe466ba0f73cf9a25a860b71
Merged-In: Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f
Merged-In: Iceeda64124c3152e9b31c0b6fa994fe77f90fa3b
Merged-In: I0e2c4746c9042f7caf76cafa1db50f7c93cd211f
2023-08-21 17:23:48 +00:00
Treehugger Robot
a0bfc6a05e
Merge "Add a fake library that contains the minimum DeviceConfig that aconfig code needs to compile." into main am: f7171f4dff
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2718434
Change-Id: Ibcacfc6230a0fdef46e4662c79faa4b2ee6adb52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 17:09:13 +00:00
Kangping Dong
1fb1dd701c
Revert "add com.android.threadnetwork to base_system.mk"
...
This reverts commit 286e55ad94
.
Reason for revert: the com.android.threadnetwork module is merged to com.android.tethering module
Bug: 296211911
Change-Id: Id601ab8b6f160d8fc2b7a9720652842cc2c194ba
2023-08-22 00:51:40 +08:00
Treehugger Robot
f7171f4dff
Merge "Add a fake library that contains the minimum DeviceConfig that aconfig code needs to compile." into main
2023-08-21 16:30:53 +00:00
Eran Messeri
e90f0b7324
Merge "Remove the empty property of attestation." into main am: 66832f6525
am: e24afe8cfb
am: cec42e3849
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2711615
Change-Id: I9e960c45eece56c1b6eb3e2bcd359732b6edb941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 15:31:39 +00:00
Treehugger Robot
897ff17e3d
Merge "Add dependency for combined aconfig files" into main am: a3cd7dcd29
am: 84b3f07b31
am: a2429cece4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2717642
Change-Id: If72866879ec4c4e6a082796e3d15c6d1ca2c7377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 15:31:21 +00:00
Eran Messeri
cec42e3849
Merge "Remove the empty property of attestation." into main am: 66832f6525
am: e24afe8cfb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2711615
Change-Id: Ib96bad858b7b545a688ad36afe4173e2882b3beb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 14:57:57 +00:00
Treehugger Robot
a2429cece4
Merge "Add dependency for combined aconfig files" into main am: a3cd7dcd29
am: 84b3f07b31
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2717642
Change-Id: If15ec203536e8636dca4830e8e3cae3a64be1386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 14:57:42 +00:00
Eran Messeri
e24afe8cfb
Merge "Remove the empty property of attestation." into main am: 66832f6525
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2711615
Change-Id: I96218b2a21c805a6c193a2f5692100d5d5f2a3b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-21 14:56:45 +00:00
Eran Messeri
66832f6525
Merge "Remove the empty property of attestation." into main
2023-08-21 14:34:49 +00:00