Commit Graph

85791 Commits

Author SHA1 Message Date
Treehugger Robot
6f67fe16ae Merge "Sandbox com.google.pixel.camera.hal.manifest" into main am: 58e82f6c9c am: 8f077d96f9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3260062

Change-Id: I859590cd91c108c1d099ce76bf133a7d9ad35615
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-10 17:48:21 +00:00
Treehugger Robot
8f077d96f9 Merge "Sandbox com.google.pixel.camera.hal.manifest" into main am: 58e82f6c9c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3260062

Change-Id: I68875233b6f8c641aa53a8c3c31a785e906b0d56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-10 17:38:18 +00:00
Treehugger Robot
58e82f6c9c Merge "Sandbox com.google.pixel.camera.hal.manifest" into main 2024-09-10 17:29:40 +00:00
Cole Faust
527dc30f42 Revert "Add BUILD_BROKEN_PYTHON_IS_PYTHON2"
This reverts commit b1fbc79206.

Removing the build broken flag to progress the python3 migration. It's been here for over a year and I haven't heard of any users.

Bug: 203436762
Test: Presubmits
Change-Id: Icfd2d25986abda934c60fd868ed5525dc384fbf3
2024-09-10 10:04:19 -07:00
Jim Tang
914832444e Support apk for product_variables.debuggable
Bug: 365707065
Test: m FactoryOtaPrebuilt
Change-Id: I880b9d48b52d49cbf8c1eca6a67d3ffadc8ea0fc
2024-09-10 18:06:22 +08:00
Treehugger Robot
fad576fab8 Merge "Update $PRODUCT_OUT from the soong system image files" into main am: 3507a28d75 am: 88a81fe2f9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3247732

Change-Id: I0c047a0d0b9d9a14139b614278de760b759c710c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-10 01:48:24 +00:00
Treehugger Robot
88a81fe2f9 Merge "Update $PRODUCT_OUT from the soong system image files" into main am: 3507a28d75
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3247732

Change-Id: If8969c2a5aa4d5b2aee7ec9f165af31419eaa4b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-10 01:38:53 +00:00
Treehugger Robot
3507a28d75 Merge "Update $PRODUCT_OUT from the soong system image files" into main 2024-09-10 01:27:05 +00:00
Cole Faust
4ce4f8893e Remove BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES
It's been available for over a year, lets progress the python3 migration
by removing it.

Bug: 203436762
Test: Presubmits
Change-Id: I46a6477ec65e98b7e6df5cc1359f676dcbd0f08e
2024-09-09 18:08:49 -07:00
Treehugger Robot
4767e005ae Merge "Remove zeros from build number" into main am: 47d151befe am: a8d03ebc80
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3260641

Change-Id: I41794556942fbbe6d5de8fc86e99f326ca7b4142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-10 01:06:35 +00:00
Treehugger Robot
a8d03ebc80 Merge "Remove zeros from build number" into main am: 47d151befe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3260641

Change-Id: Idc70c7810f90c4c0b167526e7e180f288cf58472
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-10 00:55:06 +00:00
Treehugger Robot
47d151befe Merge "Remove zeros from build number" into main 2024-09-10 00:52:26 +00:00
Cole Faust
2fec4128e0 Make globs compatible with hash-based ninja semantics
Previously, globs worked by having soong_build rewrite a ninja file
that ran the globs, and then dependended on the results of that ninja
file. soong_build also pre-filled their outputs so that it wouldn't
be immediately rerun on the 2nd build.

However, the pre-filling of outputs worked for ninja, because although
it updated their timestamps, the soong ninja file was then touched
by soong_build after that, so the soong_build ninja file was newer
and ninja wouldn't rerun soong. But N2 reruns actions if their inputs'
mtimes change in any way, not just if they're newer. Similarly,
hashed-based ninja implementations could not enforce an order on
file contents, so they would have the same problem.

To fix this, lift the glob checking out of ninja and into soong_ui.
Soong_build will output a globs report file every time it's run, and
every time soong_ui is run it will check the globs file, and if any
globs change, update an input to soong_build. soong_ui is essentially
doing what was done in ninja with bpglob actions before.

Bug: 364749114
Test: m nothing, m nothing again doesn't reanalyze, create a new file under a glob directory, m nothing again reanalyzes
Change-Id: I0dbc5ec58c89b869b59cd0602b82215c4972d799
2024-09-09 17:42:49 -07:00
Spandan Das
cea4f96853 Remove extra space in error message am: ca9ccec822 am: b6d261875b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3261293

Change-Id: Iaebeb88ccb692696bcb9cf2c4c25eba0afcb4fce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-10 00:23:09 +00:00
Spandan Das
b6d261875b Remove extra space in error message am: ca9ccec822
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3261293

Change-Id: If8d44188efa96217e1c592665fb0570a6d0ece67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-10 00:13:18 +00:00
Cole Faust
3ae36f42dc Remove zeros from build number
The zeros were kept in place of the timestamp in case people were
parsing it. Let's try to remove the zeros now and see what breaks.

Test: Presubmits
Change-Id: Ic52168f6be05a74323d8e47935de5c6a5cf15516
2024-09-09 16:54:16 -07:00
Cole Faust
65922b20fa Sandbox com.google.pixel.camera.hal.manifest
It's now taking advantage of the uses_order_only_build_number_file
feature of genrules, and doesn't need to be excempted from sandboxing.

Bug: 307824623
Test: Presubmits
Change-Id: I6ae5da7518990fbf4083aeac1aaba770210a4be1
2024-09-09 16:50:37 -07:00
Spandan Das
ca9ccec822 Remove extra space in error message
Change-Id: I45420afc37736ec8fecd0c489c35c14b377a71a5
Test: N/A
2024-09-09 22:58:11 +00:00
Krzysztof Kosiński
b8c5e95e26 Add missing pieces of ARMv9.2-A support.
aosp/3255916 didn't add all of the required infrastructure.
Refactor it to be more like x86_64 so it requires less
boilerplate code.

Bug: 364383722
Test: presubmit
Change-Id: Idc5279ffc5fe964bea9f98873c01468944d90091
2024-09-07 03:11:25 +00:00
Xin Li
2ee87c785e [automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: aa8ceca851 -s ours am: 78e9685a65 -s ours
am skip reason: Merged-In If48f56757e069a467a8ae0466820f27f97b011a8 with SHA-1 4508ca9e70 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3257957

Change-Id: I530cf8e41553938ddcb85db893c99dadaf9d02a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-07 01:21:31 +00:00
Xin Li
37841fa1f5 [automerger skipped] Merge 24Q3 to AOSP main am: 530714edba -s ours am: 7ae2da33ea -s ours
am skip reason: Merged-In If48f56757e069a467a8ae0466820f27f97b011a8 with SHA-1 4508ca9e70 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3257957

Change-Id: Idb5c2acd1d0740b98fa2706e98ce3a9e79184c72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-07 01:21:28 +00:00
Xin Li
78e9685a65 [automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: aa8ceca851 -s ours
am skip reason: Merged-In If48f56757e069a467a8ae0466820f27f97b011a8 with SHA-1 4508ca9e70 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3257957

Change-Id: I69c82f8cfad313740f5e980b99a35dc659513898
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-07 01:15:27 +00:00
Xin Li
7ae2da33ea [automerger skipped] Merge 24Q3 to AOSP main am: 530714edba -s ours
am skip reason: Merged-In If48f56757e069a467a8ae0466820f27f97b011a8 with SHA-1 4508ca9e70 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3257957

Change-Id: I8bffb412e04727675afbcd41ab728103b8938cc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-07 01:15:23 +00:00
Xin Li
aa8ceca851 Merge "Merge 24Q3 to AOSP main" into main 2024-09-07 01:12:30 +00:00
Treehugger Robot
b35a9f40b9 Merge "Fix ravenizer when transitive classpath is enabled" into main am: 2618069b9f am: 41f189fc81
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3255133

Change-Id: If61b9180fd0a8b0a4c358cfb0c2fab224f2c2659
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-06 23:57:40 +00:00
Treehugger Robot
41f189fc81 Merge "Fix ravenizer when transitive classpath is enabled" into main am: 2618069b9f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3255133

Change-Id: Ief138e5873d79c2eecd08defaa9e1ee9f28dcf41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-06 23:30:22 +00:00
Treehugger Robot
2618069b9f Merge "Fix ravenizer when transitive classpath is enabled" into main 2024-09-06 23:06:52 +00:00
Colin Cross
7e86385f1b Fix ravenizer when transitive classpath is enabled
Ravenizer and the other rules that modify the output jar also need to
replace the implementation jar depset with the modified output jar.

Bug: 308016794
Test: atest CtsOsTestCasesRavenwood
Flag: build.RELEASE_USE_TRANSITIVE_JARS_IN_CLASSPATH
Change-Id: I87ec143431c09ed878f8e1c3541b56d8077e23b5
2024-09-06 14:42:38 -07:00
Cole Faust
720d25a1e2 Merge "Make the java static_libs property configurable" into main am: 219009f606 am: ace2d9884a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3254302

Change-Id: I9e691f10c574e768392532e22f55ccafbcc3cd34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-06 18:51:55 +00:00
Cole Faust
ace2d9884a Merge "Make the java static_libs property configurable" into main am: 219009f606
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3254302

Change-Id: I708599b3007151e4e525f5c647f79861d4968923
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-06 18:41:58 +00:00
Cole Faust
219009f606 Merge "Make the java static_libs property configurable" into main 2024-09-06 18:36:35 +00:00
Treehugger Robot
63abf09fd9 Merge "Remove asset dir glob files" into main am: f2c204c655 am: 9d269b6956
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3257951

Change-Id: I14d1f997a18e08b46333c5bcf376b5841d34e8b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-06 16:42:36 +00:00
Colin Cross
ab8082c117 Merge "Use transitive header jars in classpaths" into main am: 399ff4019d am: f6c08dba54
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3214782

Change-Id: Ia95c786776fdfba7b1e0144febce6f0ecd5984dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-06 16:42:19 +00:00
Treehugger Robot
9d269b6956 Merge "Remove asset dir glob files" into main am: f2c204c655
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3257951

Change-Id: I49203ac5f042cad529c4f5f56186f4385a5126b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-06 16:31:20 +00:00
Colin Cross
f6c08dba54 Merge "Use transitive header jars in classpaths" into main am: 399ff4019d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3214782

Change-Id: I034fe6ddbd7bcafb40807cd00973d7f0f36e6339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-06 16:30:58 +00:00
Treehugger Robot
f2c204c655 Merge "Remove asset dir glob files" into main 2024-09-06 16:22:06 +00:00
Colin Cross
399ff4019d Merge "Use transitive header jars in classpaths" into main 2024-09-06 16:19:41 +00:00
Treehugger Robot
6666d6bb1c Merge changes I505a7ad8,I92d88199 into main am: fae5ec8bbc am: 68168d7b56
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3258011

Change-Id: I3ff37fd8fe971ffc9cab1fc164fe9885abad7015
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-06 06:27:44 +00:00
Treehugger Robot
68168d7b56 Merge changes I505a7ad8,I92d88199 into main am: fae5ec8bbc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3258011

Change-Id: I227940176b231d987f6b8481e624af178c7d3d5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-06 06:16:13 +00:00
Treehugger Robot
fae5ec8bbc Merge changes I505a7ad8,I92d88199 into main
* changes:
  Disable source apex variant using apex_available_name
  Skip `contents` validation of source bootclasspath fragments
2024-09-06 06:07:42 +00:00
Spandan Das
003452ff9c Disable source apex variant using apex_available_name
There are two versions of aosp extservices - one for Tplus and one for
Sminus. When prebuilts are active, the `contents` validation of both
variants of extservices bootclasspath fragments should be disabled to
account for BCP jar skew.

This CL adds ApexAvailableName to ApexInfo to achive that. If an
api_domain matching the ApexAvailableName has been selected in
`all_apex_contributions`, the source apex variants will be disabled.

Bug: 361771739

Test: lunch cf_x86_64_phone-next-userdebug
Test: m nothing with ag/28851886
Change-Id: I505a7ad8295c258e2eeef7f183669f7a75a1c88e
2024-09-06 05:10:41 +00:00
Spandan Das
1679192d7d Skip contents validation of source bootclasspath fragments
... if prebuilts are selected.

This is a special case of b/361771739 where a apex starts contributing a
jar to the BCP. `disableSourceApexVariant` uses
`PrebuiltSelectionInfoProvider` and this gets populated via the
following dep chain
```
source --> prebuilt --> all_apex_contributions
```

This runs into issues if a prebuilt bootclasspath_fragment does not
exist.

This CL creates a dependency edge between the source module and
all_apex_contributions singleton module so that
`PrebuiltSelectionInfoProvider` is available for
`disableSourceApexVariant`

Bug: 361771739
Test: lunch cf_x86_64-next-userdebug
Test: m nothing with ag/28851886
Change-Id: I92d88199a27579d3c9879d40fd354653370efcce
2024-09-06 05:10:29 +00:00
Treehugger Robot
34ea09a835 Merge "Revert "Revert "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for..."" into main am: 4301e29a02 am: 55976063db
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3256523

Change-Id: I22599f143fd908ec3ac344fa57fd7373f62b179e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-06 01:03:27 +00:00
Treehugger Robot
55976063db Merge "Revert "Revert "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for..."" into main am: 4301e29a02
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3256523

Change-Id: Iefa9b866ff57f5c0903d5a9b0f38b7ac2f36e2c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-06 00:53:23 +00:00
Treehugger Robot
4301e29a02 Merge "Revert "Revert "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for..."" into main 2024-09-06 00:48:26 +00:00
Xin Li
530714edba Merge 24Q3 to AOSP main
Bug: 357762254
Merged-In: If48f56757e069a467a8ae0466820f27f97b011a8
Change-Id: I63787ef5b57302a68518062ee2d5dcdbc7d4d8c4
2024-09-05 17:02:35 -07:00
Treehugger Robot
78cf2ce84c Merge "Remove Android.bp file input to primaryBuilders" into main am: b32516985d am: fc1cb97e4d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3254274

Change-Id: Id153f18d0573ce2225fcee71dd41e2300c95c7f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 23:44:26 +00:00
Cole Faust
6265120cd2 Remove asset dir glob files
I'm rewriting how globs work in soong to make them compatible with
hash-based ninja implementations. As part of this, I'm removing this
unnecessary usage of globs to make them simpler.

In this case, since we're already globbing the directory at analysis
time and causing soong to rerun, we can ensure the aapt2 action also
reruns by putting a hash of the glob results onto the command line.

Bug: 364749114
Test: m framework-res, touch frameworks/base/core/res/assets/test1.txt, m framework-res rebuilt framework-res.apk, rm frameworks/base/core/res/assets/test1.txt, m framework-res rebuilt framework-res.apk again
Change-Id: I4f666367a9a0fd0dfa42dc51ef3a788a02b41747
2024-09-05 16:36:32 -07:00
Treehugger Robot
fc1cb97e4d Merge "Remove Android.bp file input to primaryBuilders" into main am: b32516985d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3254274

Change-Id: I6a1c05803401fb53e44ae786c49ed4307ff6bcf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-05 23:34:26 +00:00
Treehugger Robot
b32516985d Merge "Remove Android.bp file input to primaryBuilders" into main 2024-09-05 23:26:59 +00:00