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
Vinh Tran
dc158cff8b
Optionally include afdo_profiles.mk if available
...
Previously, the product var is defined in pixel product config only. This breaks SDK finalization for udc (google3/configs/wireless/android/busytown/platform/git_udc/git_udc-release.gcl). In SDK finalization, we need to ensure performance/usage of libraries are consistent across all builds that don't set SKIP_ABI_CHECKS.
This CL optionally includes the afdo_profiles if available so that afdo is on all products by default.
Ignore-AOSP-First: The topic has internal-only CLs
Test: CI
Bug: 276672785
Change-Id: I2cc51412de141c4e6ad69f49cef378121e0b3b87
2023-04-06 00:44:03 -04:00
Treehugger Robot
3c1a2d8b33
Merge "Quote the value of product mfr in case it contains space." am: 557a4d56c9
am: 7171df5985
am: 407d194de4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2524438
Change-Id: I3c0c927ee3ad47dcd9e671f5343f30942b2faa95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 22:51:10 +00:00
Treehugger Robot
407d194de4
Merge "Quote the value of product mfr in case it contains space." am: 557a4d56c9
am: 7171df5985
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2524438
Change-Id: Ic7d66f960673a8985c2535016f2da5ca07cb6b1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 22:21:20 +00:00
Android Build Coastguard Worker
0f559666ab
Version bump to TQ2A.230505.002 [core/build_id.mk]
...
Change-Id: Iaa614601992916e12fdfd73eea9a472702389849
2023-04-05 21:49:42 +00:00
Wei Li
e64367cf29
Add partition compatibility symlinks to installed file list.
...
Bug: 272358980
Test: CIs
Test: build/soong/tests/sbom_test.sh
Change-Id: If7c6b218a13dccc2cb74358b01dd9d5db52998fc
2023-04-05 11:06:40 -07:00
Wei Li
5bb735bd95
Quote the value of product mfr in case it contains space.
...
Bug: 277015970
Test: m sbom
Change-Id: Id18d5b60549a12d71f0eda626bb2a539025aafea
2023-04-05 10:24:12 -07:00
Juho Kim
bcab31298c
Merge "Revert "Copy SBOM to dist directory when running "m dist"."" am: 79e77ec4b5
am: 3d396b837e
am: 0c351860cd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2524655
Change-Id: Ib9851ae8860243b4797cbf2a9f27bf9734eec217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 09:32:16 +00:00
Juho Kim
0c351860cd
Merge "Revert "Copy SBOM to dist directory when running "m dist"."" am: 79e77ec4b5
am: 3d396b837e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2524655
Change-Id: I075cfe61e2412cc0965a5b2b87b8f5f0eeaf77d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 09:01:45 +00:00
Wei Li
95561ab01c
Merge "Copy SBOM to dist directory when running "m dist"." am: 84cd6a78ea
am: 374d334dfc
am: 225a986e87
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2494875
Change-Id: Iae6573b0c25cac36e7daf9bb116a0bff51dae1ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 07:50:49 +00:00
Wei Li
225a986e87
Merge "Copy SBOM to dist directory when running "m dist"." am: 84cd6a78ea
am: 374d334dfc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2494875
Change-Id: I73ec02bf070378ed9994e88cb6f016e9de32bb31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 07:13:27 +00:00
Juho Kim
fd358ae340
Revert "Copy SBOM to dist directory when running "m dist"."
...
This reverts commit bc7868b18e
.
Reason for revert: DroidMonitor: Potential culprit for Bug 277015970 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Change-Id: If7d2d070714d5b58e77488d4e26d4003bfc34f79
2023-04-05 07:10:21 +00:00
Dan Albert
1d7f51da6f
Adapt to rearranged NDK sysroot.
...
Soong didn't have any explicit references to these paths because it
depends directly on the modules, but the make side of the build still
needs to construct these paths explicitly.
I removed a bunch of dead code that made the fix less obvious while I
was here.
Bug: None
Test: treehugger
Change-Id: I1a283a3bc98a94fc5481c869b3b0a4eacf69d859
2023-04-04 21:28:51 +00:00
Roberto Gil
5a7c6f0045
[automerge] Bump SDK Extension version to 6 2p: b3300a79f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22427132
Bug: 276851559
Change-Id: If22270b175966050ff1a048ec4de2b72994f28e4
2023-04-04 15:23:13 +00:00
Roberto Gil
b3300a79f6
Bump SDK Extension version to 6
...
This bump includes Adservices, Extservices
Bug: 276851559
Test: The build passes
Ignore-AOSP-first: Finalization is not perform in AOSP
Change-Id: I3b087f0d98212a62728d78b10e4c520ca6745cca
2023-04-04 11:53:45 +00:00
Wei Li
def9517d73
Merge "Filter out installed files of partitions not built for a target product in SBOM generation." am: 32789cd805
am: f1dd146c2b
am: a086cd0154
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2512055
Change-Id: I8202595ee7082b5072b5589a6181a250a489baa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 02:29:13 +00:00
Wei Li
a086cd0154
Merge "Filter out installed files of partitions not built for a target product in SBOM generation." am: 32789cd805
am: f1dd146c2b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2512055
Change-Id: Iddbe801a50cce12969bb4d753c1e613493f1ca26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 01:55:25 +00:00
Wei Li
bc7868b18e
Copy SBOM to dist directory when running "m dist".
...
Bug: 266726655
Test: Run "m dist" and sbom.spdx.json should be in dist directory.
Test: CIs
Change-Id: Iabd3b980863fcb62dd75b6f778c49447073b9cdf
2023-04-04 00:56:52 +00:00
Wei Li
32789cd805
Merge "Filter out installed files of partitions not built for a target product in SBOM generation."
2023-04-04 00:55:38 +00:00
Treehugger Robot
c06f8bbf19
Merge "Set PRODUCT_AFDO_PROFILES to AfdoProfiles product var"
2023-04-03 22:35:25 +00:00
Wei Li
ec0881e0c3
Filter out installed files of partitions not built for a target product in SBOM generation.
...
Also collect some information of all prebuilt partition images for later use in SBOM generation.
Bug: 272360068
Test: CIs
Test: build/soong/tests/sbom_test.sh
Change-Id: I82cd93a50e4230123d47feab9a558211c4276425
2023-04-03 20:01:34 +00:00
Ulya Trofimovich
72ed6869a4
Merge "Revert "Disable dexpreopt for aosp_riscv64"" am: 1d3c4ae036
am: 86b1dd2b00
am: 33267272ab
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2511036
Change-Id: Ie54445d1a99fdb569319c3b31a6d6622f8edb0eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 13:08:32 +00:00
Ulya Trofimovich
33267272ab
Merge "Revert "Disable dexpreopt for aosp_riscv64"" am: 1d3c4ae036
am: 86b1dd2b00
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2511036
Change-Id: I76ac0b1cd690b2a019ab0b23bf3b2f01eb6a7fac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 12:37:37 +00:00
Ulya Trofimovich
1d3c4ae036
Merge "Revert "Disable dexpreopt for aosp_riscv64""
2023-04-03 11:31:42 +00:00
Inseob Kim
df74fa7504
Remove 28.0 compat support
...
Treble doesn't support U system + P vendor, so removing P (28.0)
prebuilts and compat files.
Bug: 267692547
Test: build
Change-Id: I943a1f70b3600918a375ff62a20d45cfae2f673e
2023-04-03 15:18:28 +09:00
Peter Collingbourne
5c17c38778
Merge "Make kernel prebuilts writable after copying them." am: b327befaae
am: 34fa001f55
am: 101d0c4a79
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2506189
Change-Id: I943abb51b134871262b85d3eba9124b06b46773a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-01 02:39:52 +00:00
Peter Collingbourne
101d0c4a79
Merge "Make kernel prebuilts writable after copying them." am: b327befaae
am: 34fa001f55
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2506189
Change-Id: Iae457c184385f6e384520a6bfaf2aa4361974ab7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-01 01:54:05 +00:00
Peter Collingbourne
b327befaae
Merge "Make kernel prebuilts writable after copying them."
2023-04-01 00:33:43 +00:00
Vinh Tran
2b2f6685ab
Set PRODUCT_AFDO_PROFILES to AfdoProfiles product var
...
Ignore-AOSP-First: Ignore-AOSP-First: Other CLs in the same topic are internal-only
Test: m nothing
Bug: 267229065
Change-Id: I2d71daa6af97eeb0050e1084b27b03900d2d75ef
Merged-In: I2d71daa6af97eeb0050e1084b27b03900d2d75ef
2023-03-31 17:54:49 -04:00
TreeHugger Robot
a770aad52b
Merge "Set PRODUCT_AFDO_PROFILES to AfdoProfiles product var" into tm-qpr-dev-plus-aosp am: fca574ed5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22256816
Change-Id: Iaa8c329f1a3d144aacd942489e581dee2793f6ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 20:20:50 +00:00
Vinh Tran
f45a8d6e43
Set PRODUCT_AFDO_PROFILES to AfdoProfiles product var
...
Ignore-AOSP-First: Ignore-AOSP-First: Other CLs in the same topic are internal-only
Test: m nothing
Bug: 267229065
Change-Id: I2d71daa6af97eeb0050e1084b27b03900d2d75ef
2023-03-31 14:29:48 +00:00
Kousik Kumar
3357cf912e
Make sort as part of the inner command
...
It turns out, in Cog workspaces, the order of files returned by "find"
command is inherently non-deterministic (they use an absl::HashMap which
intentionally tries to NOT guarantee sort order). This results in
varying order for the inner variable, which actually causes invalidation
and regeneration of the build graph (I'm guessing when "y" changes in
$(sort $(y)), it causes an invalidation in Make). Hence made the sort a
part of the inner command itself.
Tested: Ran the build with Cog and ensured graph wasn't regenerated
across reruns.
Bug: b/276397558
Change-Id: Ie772572048785793067f74c08ac3994ef6cbaa43
2023-03-31 09:57:01 +00:00
Treehugger Robot
5bd32b231f
Merge "Create otatools build target with dist" am: a4721a5e6b
am: 88b9b11bf8
am: 7cc1967008
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2515235
Change-Id: I6e49941a91a9a2c0481ead0d5d30c614358efe74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 03:56:54 +00:00
Treehugger Robot
7cc1967008
Merge "Create otatools build target with dist" am: a4721a5e6b
am: 88b9b11bf8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2515235
Change-Id: I79167fb274075801ea2717a87fb5f718d67c2a02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 03:23:24 +00:00
Treehugger Robot
a4721a5e6b
Merge "Create otatools build target with dist"
2023-03-31 01:12:45 +00:00
Dennis Shen
5acfb9c4c6
Create otatools build target with dist
...
BUG: b/275545565
TEST: m otatools-dist dist
Change-Id: I8484a7927955bf694221937ba778db7065b83eb2
2023-03-30 20:10:17 +00:00
Paul Duffin
3490f88416
Merge "Prevent enabling prebuilts by default for builds that don't support them" am: 31860f66c7
am: ac6008302e
am: f54ad07923
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2513775
Change-Id: I2b561a2d09d055b9a8641bc2fe5dbb4604716e72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 19:32:19 +00:00