Treehugger Robot
9563d43a64
Merge "Add create_brick_ota to otatools.zip" am: 05cffb1b2a
am: fa7573bf19
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2547515
Change-Id: I73d22b92ad840f432c099773992c760c963f4a8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 11:09:13 +00:00
Kelvin Zhang
ca812338a2
Add create_brick_ota to otatools.zip
...
This allows create_brick_ota binary to be used by downloading
otatools.zip from ab, instead of having to build it locally.
Bug: 278925744
Change-Id: I704355b74bc2de7e8d5b881deb01efbee0fdda2a
2023-04-19 19:15:07 -07:00
Cole Faust
05bc3db3cd
Create art_debug_opt_flag soong config variable
...
For use in art_debug_defaults.
Bug: 247785938
Test: See other cl in topic
Change-Id: I3d272b893ba05d65f21fdf65bf4f06dc172adfd8
2023-04-19 13:44:55 -07:00
Wei Li
4f8f32b14f
Merge "Copy SBOM files of unbundled APKs to dist directory." am: 0ab788ee83
am: 54854098e9
am: b3565b4aa4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2534800
Change-Id: I234246245c1c9d63a9c7758d9fab8196e8b8475e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 19:34:48 +00:00
Wei Li
b3565b4aa4
Merge "Copy SBOM files of unbundled APKs to dist directory." am: 0ab788ee83
am: 54854098e9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2534800
Change-Id: I73b004a77e8cfa8f39dd2f901103be21855dcd31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 18:21:26 +00:00
Wei Li
0ab788ee83
Merge "Copy SBOM files of unbundled APKs to dist directory."
2023-04-19 16:36:36 +00:00
Vinh Tran
ebce49601a
Split PRODUCT_AFDO_PROFILES into two variables
...
Currently, PRODUCT_AFDO_PROFILES is generally applied to all products and is not semantically treated as a product config varilable.
Splitting this allows us:
1. Explicitly tell that PRODUCT_AFDO_PROFILES takes precedence over product-agnostic profiles in AFDO_PROFILES
2. Add PRODUCT_AFDO_PROFILES to _product_vars_list
Ignore-AOSP-First: ag/22604900 in the same topic is in internal repo
Test: Define PRODUCT_AFDO_PROFILES in a product config and make sure it appears first in the soong var AfdoProfiles
Bug: 277215393
Change-Id: I284f6308d456994bb72129cb0d7be7cd091993ae
2023-04-19 15:54:13 +00:00
Colin Cross
64fae70977
Merge "Move old installed file cleanup logic below build/make/core/Makefile" am: 4cd2568acc
am: b8dad832a7
am: d844885259
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2544890
Change-Id: I70c0736a9c50524e21c6e20c44e473210e2b0451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:12:30 +00:00
Colin Cross
d844885259
Merge "Move old installed file cleanup logic below build/make/core/Makefile" am: 4cd2568acc
am: b8dad832a7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2544890
Change-Id: I61bc49e29f62e3b39dbb60f67bf6a882176b6274
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 04:23:50 +00:00
Wei Li
49af939a23
Copy SBOM files of unbundled APKs to dist directory.
...
Bug: 266726655
Test: CIs
Test: tapas Browser2 Calendar arm userdebug && m dist
Change-Id: I82328dc4916451a99ad0bf6d7bb945c9b98d0bea
2023-04-18 15:57:34 -07:00
Colin Cross
bc18b00770
Move old installed file cleanup logic below build/make/core/Makefile
...
build/make/core/Makefile modifies ALL_DEFAULT_INSTALLED_MODULES,
move the cleanup logic below where it is included so that any
additions are covered by the cleanup logic.
Bug: 267014648
Test: manual
Change-Id: If3ab59aa19273fb20f171a3bb74ea1a2c3841585
2023-04-18 11:32:24 -07:00
Inseob Kim
168ab6af74
Remove lunch target from appcompat log
...
This is to reduce build rule divergence among targets. We only need the
path under PRODUCT_OUT.
Bug: 277662244
Test: build and boot
Change-Id: Ica8776d1779c47305c3c74015be2b3597cbdf95c
2023-04-18 14:02:52 +09:00
Florian Mayer
074dce314c
Merge "Include hwasan lib and runtime on arm64 system images" am: ed97847d9a
am: b98ff26c7d
am: aca0515f1b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2526599
Change-Id: Ibd295e9a35a9494fae156090330274173cecab14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-15 00:42:08 +00:00
Florian Mayer
aca0515f1b
Merge "Include hwasan lib and runtime on arm64 system images" am: ed97847d9a
am: b98ff26c7d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2526599
Change-Id: I4ea6e13d7297e5b6546475bd55428c1bec6a5fbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-14 23:55:55 +00:00
Florian Mayer
ed97847d9a
Merge "Include hwasan lib and runtime on arm64 system images"
2023-04-14 23:27:56 +00:00
Florian Mayer
201eb3b6cc
Include hwasan lib and runtime on arm64 system images
...
This is needed so we can run hwasan-enabled apps for debugging on normal
system images.
Bug: 276930343
Change-Id: Ie572d77307e5e6268b851ea5c96aae05d588dae3
2023-04-13 17:39:25 -07:00
Treehugger Robot
73f61e7ede
Merge "Make sort as part of the inner command" am: 859d43a1bd
am: 29a137ab3e
am: c129df521c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2517275
Change-Id: I6bce6615763f6e2d5d1fb1faba0f2879a0704b35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 20:09:07 +00:00
Treehugger Robot
c129df521c
Merge "Make sort as part of the inner command" am: 859d43a1bd
am: 29a137ab3e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2517275
Change-Id: Ie5cc79ab5616cb59828b7506f53ca28f0f7e763e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 19:04:08 +00:00
Treehugger Robot
859d43a1bd
Merge "Make sort as part of the inner command"
2023-04-13 17:55:03 +00:00
Wei Li
b05968e183
Merge "Copy SBOM files to directory dist/sbom instead of dist/." am: 4dfc33e4dd
am: 96fead867b
am: f27ff5e616
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2534191
Change-Id: I23fa0c10ae08c9b80e93aa051e8f960ffb24fe14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 17:30:04 +00:00
Wei Li
f27ff5e616
Merge "Copy SBOM files to directory dist/sbom instead of dist/." am: 4dfc33e4dd
am: 96fead867b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2534191
Change-Id: I04420fa2bb20743249e515a47a51e2d0dcc87c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 16:43:58 +00:00
Wei Li
c4d0a61ee3
Copy SBOM files to directory dist/sbom instead of dist/.
...
There will be more SBOM files for unbundled APEXs/APks, so collect all in sbom/ for scilo ingestion later.
Bug: 266726655
Test: CIs
Test: lunch aosp_cf_x86_64_phone-userdebug && m dist
Change-Id: Iff4f1177df425095cef3c95c7bf4b85c62fa2e8d
2023-04-13 02:12:32 +00:00
Treehugger Robot
09ead5b787
Merge "Merge TQ2A.230405.003"
2023-04-12 17:22:26 +00:00
Wei Li
cbeaa85076
Merge "Revert "Revert "Copy SBOM to dist directory when running "m dist".""" am: 2e8993e882
am: e7937f2c3b
am: 82bf15a96d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2525828
Change-Id: I3bbd10804b31aeccf1d1d386bb9c829d0b8cc27e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 07:33:47 +00:00
Wei Li
82bf15a96d
Merge "Revert "Revert "Copy SBOM to dist directory when running "m dist".""" am: 2e8993e882
am: e7937f2c3b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2525828
Change-Id: I4628607b633cc2d485bdb6ac29c8396ed2dbf603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 07:00:47 +00:00
Wei Li
ff8e18cf3e
Revert "Revert "Copy SBOM to dist directory when running "m dist".""
...
This reverts commit fd358ae340
.
Reason for revert: fixed the issues in aosp/2529028 and aosp/2524438.
Change-Id: Ieb4e6189a9357dafe81f15c72d5603166d9caa4d
2023-04-11 23:43:54 +00:00
Treehugger Robot
f85af51468
Merge changes from topic "presubmit-am-e7bd37b8d4a54cc5a85736dbe59d11b1" into tm-qpr-dev-plus-aosp am: cbcde78d22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22561221
Change-Id: If47f10b8d733055b04e0c9a81f525011de706765
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-11 20:59:31 +00:00
Xin Li
c350dd238e
Merge TQ2A.230405.003
...
Bug: 271343657
Merged-In: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
Change-Id: I2d6e182e3ac754c66bd6814abe96789a4bdcb701
2023-04-11 00:00:10 -07:00
Steve Berbary
83110082f8
[automerge] Update Security String to 2023-06-05 2p: 908e3504d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22561221
Bug: 277078610
Change-Id: I5046a63eda6de8307fbc94d86746c2906d444688
2023-04-11 01:55:59 +00:00
Steve Berbary
908e3504d8
Update Security String to 2023-06-05
...
Bug: 277078610
Change-Id: I4b2ea3956c34aa56cc6f54bab7148f116c34759e
2023-04-11 01:54:58 +00:00
Alex Buynytskyy
e7a6a78032
Merge "UpsideDownCake is now 34" into udc-dev
2023-04-11 01:17:31 +00:00
Jooyung Han
5b11f313cd
Merge "Add TARGET_USES_AOSP_FOR_WLAN soong variable" am: c3610a1ae7
am: ac31a9eee0
am: ac1368846a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2508495
Change-Id: I315975e654f43fe0632ca97039c7d69d4c448803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-10 09:33:14 +00:00
Jooyung Han
ac1368846a
Merge "Add TARGET_USES_AOSP_FOR_WLAN soong variable" am: c3610a1ae7
am: ac31a9eee0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2508495
Change-Id: I45f62954cf5cc3a858d2915815dc1f0a91dadbc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-10 09:02:48 +00:00
Jooyung Han
c3610a1ae7
Merge "Add TARGET_USES_AOSP_FOR_WLAN soong variable"
2023-04-10 08:00:51 +00:00
Jooyung Han
06075e6543
Add TARGET_USES_AOSP_FOR_WLAN soong variable
...
It's set and used in many .mk files. Adding this to "wifi" soong config
namespace helps migration of those .mk files into .bp files.
Bug: 273376293
Test: m libwifi-hal libwifi-hal-qcom
Merged-In: Ie0fad26305d50f70076b7e538fd1a7fa03e397cb
Change-Id: Ie0fad26305d50f70076b7e538fd1a7fa03e397cb
2023-04-10 04:02:06 +00:00
Alex Buynytskyy
e7dc4736dc
UpsideDownCake is now 34
...
Ignore-AOSP-First: UpsideDownCake Finalization
Bug: 275409981
Test: build
Change-Id: I956555f9e767cca52a410536a9cd832e9f7a0f05
2023-04-09 15:13:20 +00:00
Treehugger Robot
347607b177
Merge "Remove device.mk" am: 3665d8dfa8
am: 85d032fb46
am: b01b05bf69
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2529027
Change-Id: I69642a3d1ae9886ce256ce9b8530c62970fb16ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-08 05:08:07 +00:00
Treehugger Robot
b01b05bf69
Merge "Remove device.mk" am: 3665d8dfa8
am: 85d032fb46
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2529027
Change-Id: Ica5ebc5e3f8112d5eeb7d33690f6a10d93bdff96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-08 04:37:42 +00:00
Cole Faust
5752005ee4
Remove device.mk
...
It just consisted of unused functions/variables, and had no edits
since the initial publish of android to git. It appears like it was
panned to have a device config similar to product config but was never
completed.
Test: Presubmits
Change-Id: I0ffcef1ae8bfd0611f1bede387f0c3e01fe53581
2023-04-07 16:03:58 -07:00
Treehugger Robot
fd24e2486b
Merge "Add partition compatibility symlinks to installed file list." am: 4ae1b2e2b1
am: d7de9d7a9d
am: fbf81f8b10
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2514021
Change-Id: I63f934320589cf6b81d7cc3b4044181de107f5e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-07 04:24:45 +00:00
Treehugger Robot
fbf81f8b10
Merge "Add partition compatibility symlinks to installed file list." am: 4ae1b2e2b1
am: d7de9d7a9d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2514021
Change-Id: Ifd196ee3ed21cf117a94ece9c9c80c1cf04793f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-07 03:57:15 +00:00
Treehugger Robot
4ae1b2e2b1
Merge "Add partition compatibility symlinks to installed file list."
2023-04-07 02:45:45 +00:00
Inseob Kim
30d4860a38
Merge "Remove 28.0 compat support" am: 3875d6c82f
am: c32b330031
am: e7d0b7a394
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2519775
Change-Id: I00f2661a69e93a96e27c58c595e9330ca4958950
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-07 02:28:34 +00:00
Inseob Kim
e7d0b7a394
Merge "Remove 28.0 compat support" am: 3875d6c82f
am: c32b330031
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2519775
Change-Id: I52d6ede32f3716bae22e2798ad29ce25a7702f27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-07 02:00:23 +00:00
Inseob Kim
3875d6c82f
Merge "Remove 28.0 compat support"
2023-04-07 00:52:30 +00:00
Treehugger Robot
2918de2847
Merge "Adapt to rearranged NDK sysroot." am: 40472c2371
am: 166753a939
am: a0a725c18e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2518135
Change-Id: I52180dcc092b24f6ac7e0470f81c69a39c766ab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 22:09:23 +00:00
Treehugger Robot
a0a725c18e
Merge "Adapt to rearranged NDK sysroot." am: 40472c2371
am: 166753a939
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2518135
Change-Id: I21ef090d4b06ad872bf67b88605ee33023269a3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 21:40:59 +00:00
Treehugger Robot
40472c2371
Merge "Adapt to rearranged NDK sysroot."
2023-04-06 20:46:41 +00:00
TreeHugger Robot
975bbc523e
Merge "Optionally include afdo_profiles.mk if available" into tm-qpr-dev-plus-aosp am: 6f523ecca3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22501717
Change-Id: Id180150b57c8875d27d3d43a039c3a1dc033f9ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 17:28:50 +00:00
TreeHugger Robot
6f523ecca3
Merge "Optionally include afdo_profiles.mk if available" into tm-qpr-dev-plus-aosp
2023-04-06 17:12:33 +00:00