Commit graph

99285 commits

Author SHA1 Message Date
Treehugger Robot
7b7c602bf2 Merge "Allow experimental use of Java 21 by default in makefiles" into main am: 0aeb964be8 am: f3aab9de59
Original change: https://android-review.googlesource.com/c/platform/build/+/3125236

Change-Id: I3b2fbc5778f93013f7bce95a7e572e9c1b502b8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-13 19:27:18 +00:00
Treehugger Robot
f3aab9de59 Merge "Allow experimental use of Java 21 by default in makefiles" into main am: 0aeb964be8
Original change: https://android-review.googlesource.com/c/platform/build/+/3125236

Change-Id: I3591e94a4a92ec6a3f5b822ce44de20993d1614f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-13 19:19:32 +00:00
Treehugger Robot
0aeb964be8 Merge "Allow experimental use of Java 21 by default in makefiles" into main 2024-06-13 19:15:50 +00:00
LaMont Jones
e3e84fc1b7 Require protobuf for build flags
This change forces build flags from .scl to .textproto format.

Bug: 328495189
Bug: 338450506
Test: manual, TH
Merged-In: Ia33aae158d62c12666d97449cea0c02b60550a21
Change-Id: Ia33aae158d62c12666d97449cea0c02b60550a21
2024-06-13 10:54:21 -07:00
Treehugger Robot
2272f73be4 Merge "Shift the preprocess mk before build emulator packages" into main am: 9566130852 am: 03468748d3
Original change: https://android-review.googlesource.com/c/platform/build/+/3128074

Change-Id: Ifc53cab5d2003963d77fcdafef52212fdfe72c5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-13 08:44:06 +00:00
Treehugger Robot
03468748d3 Merge "Shift the preprocess mk before build emulator packages" into main am: 9566130852
Original change: https://android-review.googlesource.com/c/platform/build/+/3128074

Change-Id: Ia51da8f3a3da18ce26af01d6503c2c2dc6491792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-13 08:36:39 +00:00
Treehugger Robot
9566130852 Merge "Shift the preprocess mk before build emulator packages" into main 2024-06-13 08:26:54 +00:00
Herbert Xue
9852b95ff3 Shift the preprocess mk before build emulator packages
Test run:
- https://android-build.corp.google.com/builds/abtd/run/L68900030004495469

Bug: 344588337
Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk_g3caiman_x86_64 TARGET_RELEASE=trunk TARGET_BUILD_VARIANT=userdebug droid dist
Change-Id: I7d050428d5cc17de8078f8824991b71b7915a4a4
2024-06-13 14:36:13 +08:00
Treehugger Robot
1b6940c175 Merge "Move license metadata declaration of bramble/Android.mk into meta-lic.mk" into main am: f94c02c7f3 am: c17b8e9aa6
Original change: https://android-review.googlesource.com/c/platform/build/+/3127554

Change-Id: Ia0d68d147b21ab878d3d6a24197307b5e0e1747d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-13 02:51:19 +00:00
Treehugger Robot
c17b8e9aa6 Merge "Move license metadata declaration of bramble/Android.mk into meta-lic.mk" into main am: f94c02c7f3
Original change: https://android-review.googlesource.com/c/platform/build/+/3127554

Change-Id: I3eb52390b1da643d2e28e373560bde96d35076e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-13 02:43:51 +00:00
Treehugger Robot
f94c02c7f3 Merge "Move license metadata declaration of bramble/Android.mk into meta-lic.mk" into main 2024-06-13 02:34:51 +00:00
Nelson Li
4abfb5c09e Move clean-oat-host to build/core/tasks/art.mk
Since Soong genrules now run in sandboxed mode, they cannot execute
commands like `rm -rf` within `clean-oat-target` to remove physical
directories.

The only solution is to move the `clean-oat-target` commands into
`build/core/tasks`.

Bug: 345133095
Test: m clean-oat; m clean-oat-host
Change-Id: Ifce4d5dc4bdb8e3735784135cf6f2ff143e90fe9
2024-06-13 02:09:35 +00:00
Treehugger Robot
402b9a476f Merge "Convert appcompat.sh to a Python binary" into main am: 3dcc84df5c am: 200880c0b7
Original change: https://android-review.googlesource.com/c/platform/build/+/3106579

Change-Id: Ie88312e551afb32262c7de40fddbdaa63ec491b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-13 01:43:42 +00:00
Treehugger Robot
200880c0b7 Merge "Convert appcompat.sh to a Python binary" into main am: 3dcc84df5c
Original change: https://android-review.googlesource.com/c/platform/build/+/3106579

Change-Id: I5bdfde8f27751ae817596c1a1dbcb1411c31f3c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-13 01:06:05 +00:00
Treehugger Robot
3dcc84df5c Merge "Convert appcompat.sh to a Python binary" into main 2024-06-13 00:51:27 +00:00
Android Build Coastguard Worker
847536f30b Make change and version bump to AP3A.240613.001
Snap for 11959661 from 73ecbdbbc0 to 24Q3-release

Change-Id: If36fc809403953dc7ebfc818269fc039f15d1fa2
2024-06-12 23:50:33 +00:00
Ankur Bakshi
6698302289 [automerger skipped] Update Security String to 2024-08-01 am: f61420f4c1 am: 596cbaabd3 am: c9e6fc3439 am: b19e7c527b am: 94101e9adb am: 5d6e7f7d6e am: c064cceaa6 am: f21f19b490 -s ours am: b8eeee38f4 -s ours am: 8d4afba565 -s ours am: 5411bf0cd0 -s ours
am skip reason: Merged-In Iefbd1fff39d557fa352a53662d70bc734a255564 with SHA-1 f61420f4c1 is already in history

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

Change-Id: I8be3055b5b497d88521efa7a8f8cb1b9b25cc229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 18:28:21 +00:00
Ankur Bakshi
835e3fcfe1 [automerger skipped] Update Security String to 2024-08-01 am: f61420f4c1 am: 596cbaabd3 am: c9e6fc3439 am: b19e7c527b am: 94101e9adb am: 5d6e7f7d6e am: f6f39f6d6d am: 8bf3df2e86 am: cfc3a2f054 am: 1fcf4d1177 -s ours
am skip reason: Merged-In Iefbd1fff39d557fa352a53662d70bc734a255564 with SHA-1 f61420f4c1 is already in history

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

Change-Id: Ie7d871a82e95b7e97a5a5ae77e7cd3a677852187
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 18:28:02 +00:00
Ankur Bakshi
46c9b1db19 [automerger skipped] Update Security String to 2024-08-01 am: f61420f4c1 am: 596cbaabd3 am: c9e6fc3439 am: b19e7c527b am: 94101e9adb am: 5d6e7f7d6e am: c064cceaa6 am: f21f19b490 -s ours am: b8eeee38f4 -s ours am: b16deea228 -s ours
am skip reason: Merged-In Iefbd1fff39d557fa352a53662d70bc734a255564 with SHA-1 f61420f4c1 is already in history

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

Change-Id: I2492ff0f43ab05146ca0c6a0d4e8fc12ddb65d3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 18:11:43 +00:00
Ankur Bakshi
5411bf0cd0 [automerger skipped] Update Security String to 2024-08-01 am: f61420f4c1 am: 596cbaabd3 am: c9e6fc3439 am: b19e7c527b am: 94101e9adb am: 5d6e7f7d6e am: c064cceaa6 am: f21f19b490 -s ours am: b8eeee38f4 -s ours am: 8d4afba565 -s ours
am skip reason: Merged-In Iefbd1fff39d557fa352a53662d70bc734a255564 with SHA-1 f61420f4c1 is already in history

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

Change-Id: I8042256e102f218c57b783c10a592bb9b13b5534
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 18:11:36 +00:00
Ankur Bakshi
1fcf4d1177 Update Security String to 2024-08-01 am: f61420f4c1 am: 596cbaabd3 am: c9e6fc3439 am: b19e7c527b am: 94101e9adb am: 5d6e7f7d6e am: f6f39f6d6d am: 8bf3df2e86 am: cfc3a2f054
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/27779597

Change-Id: I7927e951f2ced870a0630d642435f7dde7a5c5f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 18:11:26 +00:00
Ankur Bakshi
bf64c27523 [automerger skipped] Update Security String to 2024-08-01 am: f61420f4c1 am: 596cbaabd3 am: c9e6fc3439 am: b19e7c527b am: 94101e9adb am: 5d6e7f7d6e am: f6f39f6d6d am: 8bf3df2e86 am: 885e091500 -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/+/27779597

Change-Id: I1e6834f169a9532584f70ef9bb2efa885b893828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 18:11:19 +00:00
Ankur Bakshi
b16deea228 [automerger skipped] Update Security String to 2024-08-01 am: f61420f4c1 am: 596cbaabd3 am: c9e6fc3439 am: b19e7c527b am: 94101e9adb am: 5d6e7f7d6e am: c064cceaa6 am: f21f19b490 -s ours am: b8eeee38f4 -s ours
am skip reason: Merged-In Iefbd1fff39d557fa352a53662d70bc734a255564 with SHA-1 f61420f4c1 is already in history

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

Change-Id: I08fd61055b8bd855eea714dafd4770cf082aa1ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 17:53:33 +00:00
Ankur Bakshi
885e091500 Update Security String to 2024-08-01 am: f61420f4c1 am: 596cbaabd3 am: c9e6fc3439 am: b19e7c527b am: 94101e9adb am: 5d6e7f7d6e am: f6f39f6d6d am: 8bf3df2e86
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/27779597

Change-Id: Ic29796577feade610a0d4e6a17662c20dd3c3b4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 17:53:24 +00:00
Ankur Bakshi
8d4afba565 [automerger skipped] Update Security String to 2024-08-01 am: f61420f4c1 am: 596cbaabd3 am: c9e6fc3439 am: b19e7c527b am: 94101e9adb am: 5d6e7f7d6e am: c064cceaa6 am: f21f19b490 -s ours am: b8eeee38f4 -s ours
am skip reason: Merged-In Iefbd1fff39d557fa352a53662d70bc734a255564 with SHA-1 f61420f4c1 is already in history

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

Change-Id: I6ef1858a80800bdd05d113c3f33905f42d0573e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 17:53:00 +00:00
Ankur Bakshi
cfc3a2f054 Update Security String to 2024-08-01 am: f61420f4c1 am: 596cbaabd3 am: c9e6fc3439 am: b19e7c527b am: 94101e9adb am: 5d6e7f7d6e am: f6f39f6d6d am: 8bf3df2e86
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/27779597

Change-Id: I3b60a986de75b365a937249fbe020c9f2fe4c9d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 17:52:50 +00:00
Ankur Bakshi
b8eeee38f4 [automerger skipped] Update Security String to 2024-08-01 am: f61420f4c1 am: 596cbaabd3 am: c9e6fc3439 am: b19e7c527b am: 94101e9adb am: 5d6e7f7d6e am: c064cceaa6 am: f21f19b490 -s ours
am skip reason: Merged-In Iefbd1fff39d557fa352a53662d70bc734a255564 with SHA-1 f61420f4c1 is already in history

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

Change-Id: I0b3830c4e796495c538718328d95f5209cbc7584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 17:47:39 +00:00
Ankur Bakshi
8bf3df2e86 Update Security String to 2024-08-01 am: f61420f4c1 am: 596cbaabd3 am: c9e6fc3439 am: b19e7c527b am: 94101e9adb am: 5d6e7f7d6e am: f6f39f6d6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/27779597

Change-Id: I4791bb7e774a7d07e5633f61a60cc087cb8120ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 17:28:20 +00:00
Ankur Bakshi
f21f19b490 Update Security String to 2024-08-01 am: f61420f4c1 am: 596cbaabd3 am: c9e6fc3439 am: b19e7c527b am: 94101e9adb am: 5d6e7f7d6e am: c064cceaa6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/27779597

Change-Id: I4d21b44932526fc16e250f63547fc13eba926c2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 17:27:48 +00:00
Ankur Bakshi
c064cceaa6 Update Security String to 2024-08-01 am: f61420f4c1 am: 596cbaabd3 am: c9e6fc3439 am: b19e7c527b am: 94101e9adb am: 5d6e7f7d6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/27779597

Change-Id: Ia4794af99b22d4ec163271fd054026d0f10cd0aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 16:53:47 +00:00
Ankur Bakshi
f6f39f6d6d Update Security String to 2024-08-01 am: f61420f4c1 am: 596cbaabd3 am: c9e6fc3439 am: b19e7c527b am: 94101e9adb am: 5d6e7f7d6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/27779597

Change-Id: I50780d4942370fdcef0cfa9c5e7c3585e1f2452b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 16:53:42 +00:00
Ankur Bakshi
5d6e7f7d6e Update Security String to 2024-08-01 am: f61420f4c1 am: 596cbaabd3 am: c9e6fc3439 am: b19e7c527b am: 94101e9adb
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/27779597

Change-Id: I446a241e17496e29c26507468ab29e7d6d6c41ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 16:32:23 +00:00
Ankur Bakshi
94101e9adb Update Security String to 2024-08-01 am: f61420f4c1 am: 596cbaabd3 am: c9e6fc3439 am: b19e7c527b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/27779597

Change-Id: Id94e91bb9b26ed9a33d5c2db195d332d4227e8dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 16:07:27 +00:00
Ankur Bakshi
b19e7c527b Update Security String to 2024-08-01 am: f61420f4c1 am: 596cbaabd3 am: c9e6fc3439
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/27779597

Change-Id: I13cd5b6e00f322273093c4c8da1db517bead54fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 15:47:54 +00:00
Ankur Bakshi
c9e6fc3439 Update Security String to 2024-08-01 am: f61420f4c1 am: 596cbaabd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/27779597

Change-Id: I5e4ab59ba05dca381ac4eb41856a8e8d4cf42c80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 15:18:26 +00:00
Ankur Bakshi
596cbaabd3 Update Security String to 2024-08-01 am: f61420f4c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/27779597

Change-Id: I1627ae4050f240c6c0aabb085bcba31b6a1aa72d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 14:57:59 +00:00
Android Build Coastguard Worker
e851dc47cb Version bump to AP3A.240612.002 [core/build_id.mk]
Change-Id: Ic30a820363f7718e56ac5c75f55ef81d581690e1
2024-06-12 14:34:43 +00:00
Android Build Coastguard Worker
f8a9548eb3 [coastguard skipped] Merge sparse cherrypicks from sparse-11949999-L49800030004468874 into 24Q3-release.
COASTGUARD_SKIP: I0aeedc9bcdf8e19e73b0de59ed145ea1f776d4e8

Change-Id: Ie15db30e3303845ce4f3a0c3b1f2b25ba9568f6e
2024-06-12 12:56:54 +00:00
Android Build Coastguard Worker
ee8f9bb579 Version bump to AP3A.240611.001.X1 [core/build_id.mk]
Change-Id: I0aeedc9bcdf8e19e73b0de59ed145ea1f776d4e8
2024-06-12 12:53:17 +00:00
Herbert Xue
5c71b1af0e Move license metadata declaration of bramble/Android.mk into meta-lic.mk
Bug: 346457924
Test: NA
Change-Id: Ie0fcb71bd3a10d54700256f3e19296a6aaac1298
2024-06-12 14:34:31 +08:00
Yihan Dong
73ecbdbbc0 Merge "Add Android Media Better Together team" into main am: de53f614f4 am: bfcfb660e5
Original change: https://android-review.googlesource.com/c/platform/build/+/3124555

Change-Id: I5edaa5810881ab0417067b9d6cd19445c853a154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 06:27:20 +00:00
Yihan Dong
bfcfb660e5 Merge "Add Android Media Better Together team" into main am: de53f614f4
Original change: https://android-review.googlesource.com/c/platform/build/+/3124555

Change-Id: Ie9e7a1b9ceddd608495f2317a728d9742afbebe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 06:04:30 +00:00
Yihan Dong
de53f614f4 Merge "Add Android Media Better Together team" into main 2024-06-12 05:43:44 +00:00
Yihan Dong
2880eac1a3 Add Android Media Better Together team
Bug: 342941281
Change-Id: Ib96e26fe625511bd9e9cc3086f3ff12a234dc588
Test: m noting
2024-06-12 01:16:45 +00:00
Android Build Coastguard Worker
631c6b233f Make change and version bump to AP3A.240612.001
Snap for 11954976 from 001cdbf26b to 24Q3-release

Change-Id: Ic3c562b4291502ed18bcae36dc111100327a1860
2024-06-11 23:51:32 +00:00
Lance Chang
fbc3231fcb Merge "Change TARGET_BUILD_APPS_WITH_BUILD_NUMBER to a product variable" into main 2024-06-11 23:27:08 +00:00
Treehugger Robot
459fe75055 Merge "Set widevine apex signed with dev key" into main am: 683eb4b502 am: 5a648e50c9
Original change: https://android-review.googlesource.com/c/platform/build/+/3101237

Change-Id: I08eca6771fba7f14892609b5df21d72108979d1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-11 23:17:43 +00:00
Treehugger Robot
5a648e50c9 Merge "Set widevine apex signed with dev key" into main am: 683eb4b502
Original change: https://android-review.googlesource.com/c/platform/build/+/3101237

Change-Id: I58b8a290fcbcda4ff8e3cc478ba2e3d0328f35f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-11 23:04:03 +00:00
Treehugger Robot
683eb4b502 Merge "Set widevine apex signed with dev key" into main 2024-06-11 22:46:44 +00:00
Kyle Zhang
cc21bf8b29 Set widevine apex signed with dev key
Bug: 341134913
Change-Id: Ied39e2a1dd4b715afc2ee4d35c18b52eabfc417f
2024-06-11 21:45:34 +00:00