Commit Graph

97499 Commits

Author SHA1 Message Date
Hsin-Yi Chen
28e19ef89d Do not copy platform ABI dumps from current
In trunk stable, the ABI dumps in "current" directory are not what we
intend to finalize. They need to be removed. The step will be replaced
with a command that builds ABI dumps.

Ignore-AOSP-First: merge conflict
Test: build/make/tools/finalization/finalize-sdk-rel.sh
Bug: 333532038
Change-Id: I08896b637b34861e73cff4d829941d9fb5c56475
2024-04-19 03:12:55 +00:00
Treehugger Robot
fb30407477 Merge "Make output of MakeVbmeta consistent" into main am: 8b1e29ae7e am: 8466afaa6d
Original change: https://android-review.googlesource.com/c/platform/build/+/3042632

Change-Id: Ic6a994cf5ab9c46fa6b045e4c6a300031192eee2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-15 23:13:22 +00:00
Treehugger Robot
8466afaa6d Merge "Make output of MakeVbmeta consistent" into main am: 8b1e29ae7e
Original change: https://android-review.googlesource.com/c/platform/build/+/3042632

Change-Id: I096ec22871d97e2d38e230edc040f8ae9d860c53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-15 22:54:57 +00:00
Treehugger Robot
8b1e29ae7e Merge "Make output of MakeVbmeta consistent" into main 2024-04-15 22:27:36 +00:00
Ted Bauer
1dce401c1b Merge "aconfig: switch read api lib to cc_library" into main am: 8f9ca8075f am: 725fe1bde4
Original change: https://android-review.googlesource.com/c/platform/build/+/3038459

Change-Id: Ic444325de162d60e8eb4d1851c47e019ce070d53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-15 17:59:23 +00:00
Ted Bauer
725fe1bde4 Merge "aconfig: switch read api lib to cc_library" into main am: 8f9ca8075f
Original change: https://android-review.googlesource.com/c/platform/build/+/3038459

Change-Id: Ic5858559dba99d15a5efe1f8c0f1803e457bc531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-15 17:40:13 +00:00
Ted Bauer
8f9ca8075f Merge "aconfig: switch read api lib to cc_library" into main 2024-04-15 17:22:00 +00:00
Kelvin Zhang
1d9b3daad2 Make output of MakeVbmeta consistent
The order of items in `partitions` map is non-deterministic. To make
sure that builds are hermetic, sort the map before use.

Test: th
Bug: 332550989
Change-Id: I76c7037ef9f03904899339813819fcf985a7c893
2024-04-15 09:45:03 -07:00
Treehugger Robot
d5d20870c8 Merge "Revert^2 "Expose RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES"" into main am: a40c6380a1 am: ec9468ff69
Original change: https://android-review.googlesource.com/c/platform/build/+/3040313

Change-Id: Ib4c00fedb157f85e718ae6cbb15896847c451c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-15 13:00:41 +00:00
Treehugger Robot
ec9468ff69 Merge "Revert^2 "Expose RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES"" into main am: a40c6380a1
Original change: https://android-review.googlesource.com/c/platform/build/+/3040313

Change-Id: I7ea408d5542002157b81db6e6b3c26d63a07f092
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-15 12:27:56 +00:00
Treehugger Robot
a40c6380a1 Merge "Revert^2 "Expose RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES"" into main 2024-04-15 12:06:31 +00:00
Treehugger Robot
db81c8a83e Merge "Revert "16k: Enable PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO on aosp_x86_64"" into main am: 15783cdcff am: 1b948fcbfc
Original change: https://android-review.googlesource.com/c/platform/build/+/3040934

Change-Id: I96fd2a949b779ad0d9fe319c477ab67ee1d6fbbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-15 06:18:38 +00:00
Treehugger Robot
56f5d4e1d8 Merge "Revert "16k: Enable PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO on aosp_arm64"" into main am: 4f9f7219b7 am: d1d6a500a3
Original change: https://android-review.googlesource.com/c/platform/build/+/3040933

Change-Id: I6fe895bb88723c8c560f4cdb8799e3312477c0b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-15 06:18:33 +00:00
Treehugger Robot
c56ddd822e Merge "Revert^3 "16k: core: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets"" into main am: 5fcfa8a3c2 am: b6602d40de
Original change: https://android-review.googlesource.com/c/platform/build/+/3038909

Change-Id: I2d08cec60b360fb1f541747788a272e02830dcc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-15 06:18:26 +00:00
Mårten Kongstad
0639129bd8 Merge "finalization: do not generate the ADB keys" into main 2024-04-15 06:17:40 +00:00
Treehugger Robot
1b948fcbfc Merge "Revert "16k: Enable PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO on aosp_x86_64"" into main am: 15783cdcff
Original change: https://android-review.googlesource.com/c/platform/build/+/3040934

Change-Id: I840b1a9d85b810ba95be1f275714b923323ee53a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-15 05:57:33 +00:00
Treehugger Robot
d1d6a500a3 Merge "Revert "16k: Enable PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO on aosp_arm64"" into main am: 4f9f7219b7
Original change: https://android-review.googlesource.com/c/platform/build/+/3040933

Change-Id: Ia7603555f9e7b901dd6bad52ba55b671ca610a32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-15 05:57:30 +00:00
Treehugger Robot
b6602d40de Merge "Revert^3 "16k: core: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets"" into main am: 5fcfa8a3c2
Original change: https://android-review.googlesource.com/c/platform/build/+/3038909

Change-Id: I84de41b27c6f2c2a29df5829d8f3a863e94f5e44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-15 05:57:26 +00:00
Treehugger Robot
15783cdcff Merge "Revert "16k: Enable PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO on aosp_x86_64"" into main 2024-04-15 05:39:12 +00:00
Treehugger Robot
4f9f7219b7 Merge "Revert "16k: Enable PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO on aosp_arm64"" into main 2024-04-15 05:39:12 +00:00
Treehugger Robot
5fcfa8a3c2 Merge "Revert^3 "16k: core: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets"" into main 2024-04-15 05:39:12 +00:00
Daniel Zheng
83eec49c67 Merge "Revert "Turn on V3 cow"" into main am: 28ca2fc0a0 am: 0addd71144
Original change: https://android-review.googlesource.com/c/platform/build/+/3040935

Change-Id: I36be728b9a31b1ff0bd36c80dc53fa777a88b3e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-13 07:33:11 +00:00
Daniel Zheng
0addd71144 Merge "Revert "Turn on V3 cow"" into main am: 28ca2fc0a0
Original change: https://android-review.googlesource.com/c/platform/build/+/3040935

Change-Id: I69e3d916a8a6b2228e486c7d4da8069b3c7d08a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-13 07:10:13 +00:00
Daniel Zheng
28ca2fc0a0 Merge "Revert "Turn on V3 cow"" into main 2024-04-13 06:50:00 +00:00
Ankur Bakshi
4e0a447a08 [automerger skipped] Update Security String to 2024-06-01 am: 539de4dac0 am: 8f867c5c90 am: 57d27d7031 am: 1ae917b50f am: 6d0d353f0f am: 7c64c8aff7 am: b4defbf675 am: c5ec92952e -s ours am: 70f3363d11 -s ours am: 13a645c84d -s ours am: 951d7f2b42 -s ours
am skip reason: Merged-In Ida6705ee71e4601f976836d73e0dda2ed7033c2a with SHA-1 539de4dac0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26640639

Change-Id: I5154f36c25ef3fbc8eb2e206f447a8888fd1bd97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-13 01:11:29 +00:00
Ankur Bakshi
de20c95392 [automerger skipped] Update Security String to 2024-06-01 am: 539de4dac0 am: 8f867c5c90 am: 57d27d7031 am: 1ae917b50f am: 6d0d353f0f am: 7c64c8aff7 am: 48c8da00e6 am: 9be94ee4b3 am: 70d630dd2d am: 306d0b216c -s ours
am skip reason: Merged-In Ida6705ee71e4601f976836d73e0dda2ed7033c2a with SHA-1 539de4dac0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26640639

Change-Id: Ie33b0f1a1f6332116cb83899adaabe9e0b8f745a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-13 01:11:11 +00:00
Ankur Bakshi
951d7f2b42 [automerger skipped] Update Security String to 2024-06-01 am: 539de4dac0 am: 8f867c5c90 am: 57d27d7031 am: 1ae917b50f am: 6d0d353f0f am: 7c64c8aff7 am: b4defbf675 am: c5ec92952e -s ours am: 70f3363d11 -s ours am: 13a645c84d -s ours
am skip reason: Merged-In Ida6705ee71e4601f976836d73e0dda2ed7033c2a with SHA-1 539de4dac0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26640639

Change-Id: Idb5a695462e249166c370cfe57958c7f5b72d7a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-13 00:55:54 +00:00
Ankur Bakshi
80ef567f9c [automerger skipped] Update Security String to 2024-06-01 am: 539de4dac0 am: 8f867c5c90 am: 57d27d7031 am: 1ae917b50f am: 6d0d353f0f am: 7c64c8aff7 am: b4defbf675 am: c5ec92952e -s ours am: 70f3363d11 -s ours am: 5fffbd3fb1 -s ours
am skip reason: Merged-In Ida6705ee71e4601f976836d73e0dda2ed7033c2a with SHA-1 539de4dac0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26640639

Change-Id: I556da794659717a67a4fa126703c72b9b16c0c15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-13 00:55:44 +00:00
Ankur Bakshi
306d0b216c Update Security String to 2024-06-01 am: 539de4dac0 am: 8f867c5c90 am: 57d27d7031 am: 1ae917b50f am: 6d0d353f0f am: 7c64c8aff7 am: 48c8da00e6 am: 9be94ee4b3 am: 70d630dd2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26640639

Change-Id: I23927871f2cd2eefdc8508a557d3a4e2e1558373
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-13 00:55:41 +00:00
Ankur Bakshi
7f6e9b169f [automerger skipped] Update Security String to 2024-06-01 am: 539de4dac0 am: 8f867c5c90 am: 57d27d7031 am: 1ae917b50f am: 6d0d353f0f am: 7c64c8aff7 am: 48c8da00e6 am: 9be94ee4b3 am: 16721af6f6 -s ours
am skip reason: Merged-In I9edc7171d124f0cfa540fea6f0e06ba877910444 with SHA-1 2666d4443b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26640639

Change-Id: Ibd8d7d921db43d7e651a961fbbebd422647443a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-13 00:55:30 +00:00
Ankur Bakshi
5fffbd3fb1 [automerger skipped] Update Security String to 2024-06-01 am: 539de4dac0 am: 8f867c5c90 am: 57d27d7031 am: 1ae917b50f am: 6d0d353f0f am: 7c64c8aff7 am: b4defbf675 am: c5ec92952e -s ours am: 70f3363d11 -s ours
am skip reason: Merged-In Ida6705ee71e4601f976836d73e0dda2ed7033c2a with SHA-1 539de4dac0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26640639

Change-Id: I39aab573d627a9735f5f63aa38b4fd7253c59a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-13 00:19:15 +00:00
Ankur Bakshi
16721af6f6 Update Security String to 2024-06-01 am: 539de4dac0 am: 8f867c5c90 am: 57d27d7031 am: 1ae917b50f am: 6d0d353f0f am: 7c64c8aff7 am: 48c8da00e6 am: 9be94ee4b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26640639

Change-Id: I9a832d93dbcf6f1a7f4065638b28dae2da454efb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-13 00:19:08 +00:00
Ankur Bakshi
13a645c84d [automerger skipped] Update Security String to 2024-06-01 am: 539de4dac0 am: 8f867c5c90 am: 57d27d7031 am: 1ae917b50f am: 6d0d353f0f am: 7c64c8aff7 am: b4defbf675 am: c5ec92952e -s ours am: 70f3363d11 -s ours
am skip reason: Merged-In Ida6705ee71e4601f976836d73e0dda2ed7033c2a with SHA-1 539de4dac0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26640639

Change-Id: I8ad8727d5eaa5a744c9ab8bbe278f4f586feb067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-13 00:18:53 +00:00
Ankur Bakshi
70d630dd2d Update Security String to 2024-06-01 am: 539de4dac0 am: 8f867c5c90 am: 57d27d7031 am: 1ae917b50f am: 6d0d353f0f am: 7c64c8aff7 am: 48c8da00e6 am: 9be94ee4b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26640639

Change-Id: I06dfd3096ededd3c7929052746f0d22f60b5d80e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-13 00:18:44 +00:00
Ankur Bakshi
70f3363d11 [automerger skipped] Update Security String to 2024-06-01 am: 539de4dac0 am: 8f867c5c90 am: 57d27d7031 am: 1ae917b50f am: 6d0d353f0f am: 7c64c8aff7 am: b4defbf675 am: c5ec92952e -s ours
am skip reason: Merged-In Ida6705ee71e4601f976836d73e0dda2ed7033c2a with SHA-1 539de4dac0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26640639

Change-Id: Idbae8ef5e8843890a7cd71df2cf17b48324cf42e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-13 00:12:24 +00:00
Ankur Bakshi
9be94ee4b3 Update Security String to 2024-06-01 am: 539de4dac0 am: 8f867c5c90 am: 57d27d7031 am: 1ae917b50f am: 6d0d353f0f am: 7c64c8aff7 am: 48c8da00e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26640639

Change-Id: I28770e379f915f4fc75f4117af8270a61153e07e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 23:55:47 +00:00
Ankur Bakshi
c5ec92952e Update Security String to 2024-06-01 am: 539de4dac0 am: 8f867c5c90 am: 57d27d7031 am: 1ae917b50f am: 6d0d353f0f am: 7c64c8aff7 am: b4defbf675
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26640639

Change-Id: I576974d170eaa8058998119fa96268d7d31bb4ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 23:55:21 +00:00
Ankur Bakshi
b4defbf675 Update Security String to 2024-06-01 am: 539de4dac0 am: 8f867c5c90 am: 57d27d7031 am: 1ae917b50f am: 6d0d353f0f am: 7c64c8aff7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26640639

Change-Id: I5623a0726e22c97d723e4f4d9b26ce4bac06f7f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 23:30:33 +00:00
Ankur Bakshi
48c8da00e6 Update Security String to 2024-06-01 am: 539de4dac0 am: 8f867c5c90 am: 57d27d7031 am: 1ae917b50f am: 6d0d353f0f am: 7c64c8aff7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26640639

Change-Id: I5e72bb8ae385a4c123f87400492d17d4500a085a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 23:30:30 +00:00
Ankur Bakshi
7c64c8aff7 Update Security String to 2024-06-01 am: 539de4dac0 am: 8f867c5c90 am: 57d27d7031 am: 1ae917b50f am: 6d0d353f0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26640639

Change-Id: I3d849d5d9e0fb2fad5d7c5cabc49e6035ea94658
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 23:05:40 +00:00
Ankur Bakshi
6d0d353f0f Update Security String to 2024-06-01 am: 539de4dac0 am: 8f867c5c90 am: 57d27d7031 am: 1ae917b50f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26640639

Change-Id: Ib66d29150889d1406562fbb5c1ab6a1df215cc12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 22:48:15 +00:00
Ankur Bakshi
1ae917b50f Update Security String to 2024-06-01 am: 539de4dac0 am: 8f867c5c90 am: 57d27d7031
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26640639

Change-Id: I02561c7990da6722a5004214478812f8d21638b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 22:27:41 +00:00
Daniel Zheng
fa5bfb9d79 Revert "Turn on V3 cow"
Revert submission 2973761-cow_v3_make

Reason for revert: b/333966507

Reverted changes: /q/submissionid:2973761-cow_v3_make

Change-Id: I4f8c19a1d78b9af882e7df51fb2fc0172c0282c3
2024-04-12 22:24:42 +00:00
Vilas Bhat
15e3467d6d Revert^3 "16k: core: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets"
This reverts commit 35839ec1a3.

Reason for revert: CI breakages for 2 targets. Please refer to bug for more details

Bug: 334152807
Change-Id: I0e38583cd3fa57afef432406374ec8d4ddc57e72
2024-04-12 22:20:40 +00:00
Vilas Bhat
25aa14531f Revert "16k: Enable PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO on aosp_x86_64"
This reverts commit 1c4c94d784.

Reason for revert: CI breakages for 2 targets. Please refer to bug for more details

Bug: 334152807
Change-Id: I76853ccfd8a41f99670a7b7513f358f076f9b271
2024-04-12 22:15:59 +00:00
Vilas Bhat
e0d18ffe70 Revert "16k: Enable PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO on aosp_arm64"
This reverts commit 39dcf40403.

Reason for revert: CI breakages for 2 targets. Please refer to bug for more details

Bug: 334152807
Change-Id: Ic2fc942b1769aed03553fc305ac283666eb9e3f5
2024-04-12 22:14:42 +00:00
Ankur Bakshi
57d27d7031 Update Security String to 2024-06-01 am: 539de4dac0 am: 8f867c5c90
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26640639

Change-Id: Id49a6586c3420b7d34d47cef0fc780b907d47247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 22:10:12 +00:00
Ankur Bakshi
8f867c5c90 Update Security String to 2024-06-01 am: 539de4dac0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26640639

Change-Id: Ib590df04a557a8fde88aeaeaf0c5964cdf1f3817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 21:40:48 +00:00
Dennis Shen
36661d4cd0 aconfig: switch read api lib to cc_library
Bug: b/321077378
Test: atest -c
Change-Id: I8d64396797b01a8ce2f4bee165596701940836e4
2024-04-12 21:21:44 +00:00
Treehugger Robot
1fd9a8fac7 Merge "16k: Enable PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO on aosp_arm64" into main am: 112a57658b am: f1bf436fd8
Original change: https://android-review.googlesource.com/c/platform/build/+/3038458

Change-Id: I58e80ed172f7d1845126a592efd314220cae3997
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 20:01:16 +00:00