StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,603 Commits 1 Branch 0 Tags
63abf09fd92ab7c12e08bbef5aef3e464207f9f8
Commit Graph

8704 Commits

Author SHA1 Message Date
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
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
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
Krzysztof Kosiński
3b5380e126 Merge "Add ARMv9.2-a arch option." into main am: b379955f0e am: 6126b6792f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3255916

Change-Id: If2648c6246ccb90ee2cdc55a8371ba470e8370f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 14:58:12 +00:00
Krzysztof Kosiński
6126b6792f Merge "Add ARMv9.2-a arch option." into main am: b379955f0e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3255916

Change-Id: I38a8a9a214f4e3f22a9665591eb4f723f72889b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 14:48:09 +00:00
Krzysztof Kosiński
b379955f0e Merge "Add ARMv9.2-a arch option." into main 2024-09-05 14:45:17 +00:00
Bill Yang
3b3aac0088 Revert "Revert "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for..." 
Revert submission 3235656-revert-3195743-compatibility_matrix-KLJOLWYIMW

Reason for revert: The root cause of the break is already be merged. Related changes: ag/29139095, ag/29139608

Reverted changes: /q/submissionid:3235656-revert-3195743-compatibility_matrix-KLJOLWYIMW

Change-Id: Ie23bdd343bebbd077553dc25f0bfd13539daf57a
 2024-09-05 09:22:10 +00:00
Yi Kong
e734af7c63 Merge "Remove workaround for coverage boot failure" into main am: acde746439 am: c36f81ee41 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3239200

Change-Id: Ia9015581a1ed29484441d17fe52d970cf602b536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 07:20:30 +00:00
Yi Kong
c36f81ee41 Merge "Remove workaround for coverage boot failure" into main am: acde746439 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3239200

Change-Id: I78687e68c6fe24517c033bdda37035d1f3a160d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 07:11:05 +00:00
Yi Kong
acde746439 Merge "Remove workaround for coverage boot failure" into main 2024-09-05 07:01:45 +00:00
Treehugger Robot
b22f3b3ed1 Merge "Add VINTF fragment modules into required libs of modules-info" into main am: a136147c9c am: 8a9aaa566b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3249931

Change-Id: Ib83bc157def4927997d56ac9aabdd97ff34051f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 02:04:12 +00:00
Treehugger Robot
8a9aaa566b Merge "Add VINTF fragment modules into required libs of modules-info" into main am: a136147c9c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3249931

Change-Id: Ida2da7f30b8a438b599c938b1830969c8cc76e1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 01:54:53 +00:00
Treehugger Robot
a136147c9c Merge "Add VINTF fragment modules into required libs of modules-info" into main 2024-09-05 01:46:19 +00:00
Colin Cross
c9b4f6b502 Use transitive header jars in classpaths 
Skip combining jars into turbine-combined, combined, and withres jars
and instead collect transitive jars to use in the classpath and to
produce the final dexed jar.

This reduces the size of a `m checkbuild` in git_main by 11%, from
1300 KiB to 1154 KiB.  It may also improve caching and reduce uplink
network bandwidth when building with RBE, as now the classpath inputs
to rules are themselves outputs of previous rules and so already in
the RBE CAS.

The downside is that the classpath inputs to each rule are now much
longer, increasing the Soong ninja file size 11%, from 4.6 GiB to
5.1 GiB.  This could be mitigated in the future by supporting something
like depsets in the generated ninja file to reduce duplication.

Bug: 308016794
Test: TestSimple, TestKotlin, TestClasspath
Flag: build.RELEASE_USE_TRANSITIVE_JARS_IN_CLASSPATH
Change-Id: I2b7b4261375494370da70f98597c8719f1d561cf
 2024-09-04 16:13:46 -07:00
Yu Liu
e97a9ce7cd Merge "Move the caching/restoring code from soong to blueprint to fully skip build actions." into main am: c55b25f125 am: 246315e4fd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3249489

Change-Id: Ib5b0b6fde2d99eb2c0b2c5d8f5595b194af91cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 22:17:13 +00:00
Yu Liu
246315e4fd Merge "Move the caching/restoring code from soong to blueprint to fully skip build actions." into main am: c55b25f125 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3249489

Change-Id: I43e2ee71097e95e313eab8631742acb8048e36d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 22:07:50 +00:00
Yu Liu
c55b25f125 Merge "Move the caching/restoring code from soong to blueprint to fully skip build actions." into main 2024-09-04 22:01:33 +00:00
Krzysztof Kosiński
918d265a06 Add ARMv9.2-a arch option. 
Bug: 364383722
Test: presubmit
Change-Id: Ica7266f6dbac490836f94f7e19685383aba2749f
 2024-09-04 21:25:05 +00:00
Yu Liu
26a716d5e5 Move the caching/restoring code from soong to blueprint to fully skip build actions. 
Bug: 358425833
Test: Manually verified the generated ninja and mk files and CI.
Change-Id: Ieebb822c46f37c0ff55fad08531e9870a76cbd7b
 2024-09-04 19:59:55 +00:00
Steven Moreland
350b54b8de Merge changes from topic "libbinder_ndk-remove-cpp-headers" into main am: 56aed2b0e8 am: 092389231f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3251042

Change-Id: Ia478843b8ea89927d577b903e49c127f2026e0be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 18:42:24 +00:00
Steven Moreland
092389231f Merge changes from topic "libbinder_ndk-remove-cpp-headers" into main am: 56aed2b0e8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3251042

Change-Id: Ib543856a377c18f68a8bb5cad585bc787b04e5c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 18:33:08 +00:00
Steven Moreland
56aed2b0e8 Merge changes from topic "libbinder_ndk-remove-cpp-headers" into main 
* changes:
  ndk_library: limit exports
  Reland "Truely re-export export_header_libs from ndk_library"
  ndk_library depends on the correct arch variant of cc_library_headers
 2024-09-04 18:23:19 +00:00
Colin Cross
3946f9e367 Merge "Move checkbuild targets of Soong modules into Soong" into main am: ca3bf2be39 am: 5f0561e24d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3237626

Change-Id: Ib035416676ead421eea1860e5420a2d8b987030e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 17:24:17 +00:00
Colin Cross
5f0561e24d Merge "Move checkbuild targets of Soong modules into Soong" into main am: ca3bf2be39 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3237626

Change-Id: Id72a093f81785ece92211cc63a73c0a53576fb7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 17:15:12 +00:00
Cole Faust
7811b45d38 Merge "Add tests for configurable PostProcessors" into main am: b9e7915f6f am: dcb8494f44 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3247538

Change-Id: Id7a7dd333e0c0243d59dfdfc0181e86b4410dc07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 17:13:20 +00:00
Colin Cross
ca3bf2be39 Merge "Move checkbuild targets of Soong modules into Soong" into main 2024-09-04 17:12:03 +00:00
Cole Faust
dcb8494f44 Merge "Add tests for configurable PostProcessors" into main am: b9e7915f6f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3247538

Change-Id: I4803d6148c6ed949a2b5a1c7aecf79fc80ec2a49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 17:00:58 +00:00
Cole Faust
b9e7915f6f Merge "Add tests for configurable PostProcessors" into main 2024-09-04 16:49:32 +00:00
Treehugger Robot
cf56cb9e63 Merge "Sandbox environment variables" into main am: 2f33c04a97 am: cc0bc1b3f9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3245994

Change-Id: I4d1f1a067d1b4caadcd1fdfcea76ed939794a7d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 02:41:11 +00:00
Treehugger Robot
cc0bc1b3f9 Merge "Sandbox environment variables" into main am: 2f33c04a97 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3245994

Change-Id: I2af033a7fbbef8928553efffe79b26d55d36e96a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 02:31:56 +00:00
Treehugger Robot
2f33c04a97 Merge "Sandbox environment variables" into main 2024-09-04 02:26:58 +00:00
Jiyong Park
67da923130 Merge "Make overrides work in Soong" into main am: b11c99d084 am: c299c20911 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3241433

Change-Id: Ic9ff8fbf86a0a706038ce7d0c4a9ab9cf5f0dc89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 00:17:23 +00:00
Jiyong Park
c299c20911 Merge "Make overrides work in Soong" into main am: b11c99d084 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3241433

Change-Id: Idff2325ba6387c43ffcfc2ec1403d2ec9f782aae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 00:07:03 +00:00
Jiyong Park
b11c99d084 Merge "Make overrides work in Soong" into main 2024-09-04 00:03:20 +00:00
Cole Faust
63ea1f966e Sandbox environment variables 
So that the build can't access extra information unintentionally.
Particuarly ANDROID_BUILD_TOP is dangerous.

In the future PATH should be locked down as well.

Bug: 307824623
Test: Added a all_genrules target and built that
Change-Id: I88bb0efb0a82529a1c85875a53cf20c8384d07fe
 2024-09-03 16:38:28 -07:00
Steven Moreland
0db999c45e ndk_library: limit exports 
The NDK should stand alone, and the libbinder_ndk case
is created because libbinder_ndk in the NDK used to
contain extra C++ headers, but these were moved into
the SDK to be next to AIDL. Since many modules depend
on these headers, exports are only allowed for this case.

Bug: 357711733
Test: build with neverallow breaking, for instance:

error: frameworks/wilhelm/Android.bp:56:1: module "libOpenSLES.ndk" variant "android_x86_64_silvermont_sdk_shared_21": violates neverallow requirements. Not allowed:
        module types: ["ndk_library"]
        properties matching: "Export_header_libs" matches: .is-set
        EXCEPT in dirs: ["frameworks/native/libs/binder/ndk/"]

Change-Id: I9a32d3cb7f644fb5dbc1e8072894f2f585b2cd6d
 2024-09-03 23:03:37 +00:00
Colin Cross
a6182ab2fa Move checkbuild targets of Soong modules into Soong 
Pass the name of Soong's checkbuild target for each module to
Make so that it can depend on it from the main checkbuild rule.
This will give better control over which files get built, allowing
checkbuild to skip the jar combining step when transitive classpath
jars are enabled.  The per-module checkbuild targets are passed to
make instead of added directly as a dependency of checkbuild in order
to maintain the existing behavior of only building modules exposed
to make in checkbuild.

Also tweak the existing calls to CheckbuildFile and add
InstallFileWithoutCheckbuild to match the files that are
in the Make-based checkbuild.

Bug: 308016794
Test: m checkbuild
Change-Id: Ic5140819381d58f4d00f23a7a12447950c4cf268
 2024-09-03 14:52:19 -07:00
Spandan Das
b8e47ebde5 Merge "HideFromMake in apexTransitionMutator should respect special cases" into main am: c965be6ca2 am: ed93a620c6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3249488

Change-Id: I543449187d32658ceb6ae30324825358e9d1cd12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-03 16:49:29 +00:00
Spandan Das
ed93a620c6 Merge "HideFromMake in apexTransitionMutator should respect special cases" into main am: c965be6ca2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3249488

Change-Id: I4911340085cb4e41229a81875ff27c24c61a04ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-03 16:38:07 +00:00