StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,479 Commits 1 Branch 0 Tags
67da923130ae3f2f23f206d8478cfbe29e4843ab
Commit Graph

85479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Treehugger Robot
58f4e5ecff Merge "Fix End() of Rule" into main am: aebccc735a am: 13174d9627 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3249948

Change-Id: Ie9e584e752b4a0b704cf08041d93c0416d9fd8b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-03 22:33:52 +00:00
Treehugger Robot
13174d9627 Merge "Fix End() of Rule" into main am: aebccc735a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3249948

Change-Id: Ia5bbbe788503cd719872ad1dbbe509887aef791b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-03 22:23:57 +00:00
Treehugger Robot
aebccc735a Merge "Fix End() of Rule" into main 2024-09-03 22:18:51 +00:00
Dan Albert
e5dfae2c04 Merge "Revert "Truely re-export export_header_libs from ndk_library"" into main am: fc4607a412 am: 027708c015 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3252576

Change-Id: I1717c28f0ab404f7dc161a29ad6f868b6c6b3847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-03 21:23:15 +00:00
Dan Albert
027708c015 Merge "Revert "Truely re-export export_header_libs from ndk_library"" into main am: fc4607a412 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3252576

Change-Id: I5e4c30c8b82754219ff2753bdde80afd07dc10d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-03 21:14:28 +00:00
Dan Albert
fc4607a412 Merge "Revert "Truely re-export export_header_libs from ndk_library"" into main 2024-09-03 21:07:54 +00:00
Dan Albert
7f1ae59d94 Revert "Truely re-export export_header_libs from ndk_library" 
This reverts commit 88c768dd7f.

Reason for revert: not how this module type is supposed to be used

Change-Id: Iced1ad336c5fe5d630bb8e268b08d652e80f262d
 2024-09-03 19:55:06 +00: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
Spandan Das
c965be6ca2 Merge "HideFromMake in apexTransitionMutator should respect special cases" into main 2024-09-03 16:32:29 +00:00
Min Yun
e9cc403553 Fix End() of Rule 
If a directive appears in the middle of a Rule,
the Rule does not reflect its length.
This must be reflected to obtain the correct End() position of the Rule.

Change-Id: I67a78f95487829c639b0c1414ac4cc096faa6363
 2024-09-03 20:36:47 +09:00
Jiyong Park
a574d535b5 Make overrides work in Soong 
This change adds `overrides` property to all module types. It is used
to prevent another module (or modules) from being installed or packaged.

Bug: 330141242
Test: go test ./...

Change-Id: I4f05c603f0c5dbb699d00327882c7498472b59de
 2024-09-02 19:58:38 +09:00
PODISHETTY KUMAR (xWF)
6635f02096 Merge "Revert "Clean environment variables to account for sandbox work directory."" into main am: cdd70d268a am: c4145fe78f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3252253

Change-Id: I0849db83ae1a578563b843c4d45cb6448cc8841c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-02 07:13:09 +00:00
PODISHETTY KUMAR (xWF)
c4145fe78f Merge "Revert "Clean environment variables to account for sandbox work directory."" into main am: cdd70d268a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3252253

Change-Id: I912d74d6db395068763a80cc2d17c019a48193f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-02 07:03:56 +00:00
PODISHETTY KUMAR (xWF)
cdd70d268a Merge "Revert "Clean environment variables to account for sandbox work directory."" into main 2024-09-02 06:57:34 +00:00
PODISHETTY KUMAR (xWF)
9543d19b4b Revert "Clean environment variables to account for sandbox work directory." 
This reverts commit 0af8ea14fc.

Reason for revert: <Droidmonitor created revert due to b/363848580. Will be verifying through ABTD before submission.>

Change-Id: Iafba28897ad27df67ef8ae8904454196c482216d
 2024-09-02 03:54:36 +00:00
Tongbo Liu
c31e450c54 [automerger skipped] [RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14 am: 7e1a854d08 -s ours am: 1b7c2078b1 -s ours am: dd10dde7df -s ours 
am skip reason: contains skip directive

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

Change-Id: If5216684f6a41de7f0e80924bc2a339d2e377ed0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-01 06:04:54 +00:00
Tongbo Liu
dd10dde7df [automerger skipped] [RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14 am: 7e1a854d08 -s ours am: 1b7c2078b1 -s ours 
am skip reason: contains skip directive

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

Change-Id: I8f6d2fd4b5d4c2bfae410d39f8b05a9119d1cf1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-01 05:55:30 +00:00
Tongbo Liu
1b7c2078b1 [automerger skipped] [RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14 am: 7e1a854d08 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ice60a0734268d8366d755b87a418a7a4ed3f5bf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-01 05:45:19 +00:00
Taylor Santiago
3f26c6e67f Merge "Clean environment variables to account for sandbox work directory." into main am: 3cd732bcd1 am: 9d0b2884f8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3233564

Change-Id: I6d3553cc399d33484504035ea800bfa4a03aecf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-31 04:23:11 +00:00
Taylor Santiago
9d0b2884f8 Merge "Clean environment variables to account for sandbox work directory." into main am: 3cd732bcd1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3233564

Change-Id: I9d5c45810ab66f0df835ee44e115fcb906c50654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-31 04:14:05 +00:00
Taylor Santiago
3cd732bcd1 Merge "Clean environment variables to account for sandbox work directory." into main 2024-08-31 04:04:22 +00:00
Spandan Das
afa3add57e HideFromMake in apexTransitionMutator should respect special cases 
At ToT, platform variants of modules are hidden from make, unless the module
has `//apex_available:platform` in its Android.bp file. However, there
are special cases which always require the platform variant to be
visible to make - e.g. bootstrap bionic libraries.

`markPlatformAvailability` handles these special cases. This CL updates
the subsequent apexTransitionMutator to hide the platform variant when
module.NotAvailableForPlatform is true in addition to the existing
module type specific `AvailableFor` check

Test: no diff in file_list.txt
Bug: 281077552
Change-Id: Ie9d7341e206276ff96d3d64fec21b8f5dcfd6ceb
 2024-08-31 02:26:35 +00:00
Steven Moreland
e03daf9327 Merge "Truely re-export export_header_libs from ndk_library" into main am: 729c770b02 am: 6c467d5473 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3249712

Change-Id: I8e46276c658a64e24fb05f623a5210f70163ef8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-30 22:16:19 +00:00
Steven Moreland
6c467d5473 Merge "Truely re-export export_header_libs from ndk_library" into main am: 729c770b02 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3249712

Change-Id: I1bd6c42f847ea440e3d3d2eed80d21fc122b2ba5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-30 22:06:38 +00:00
Steven Moreland
729c770b02 Merge "Truely re-export export_header_libs from ndk_library" into main 2024-08-30 22:02:30 +00:00
Jihoon Kang
a5a744226b Merge "Revert^4 "Implement detecting container violations."" into main am: 7344482ff3 am: 9e40f8f9b4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3248019

Change-Id: I77818bede2be74dc6755a55c5a8e69a1c6a7f64c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-30 20:31:34 +00:00
Jihoon Kang
9e40f8f9b4 Merge "Revert^4 "Implement detecting container violations."" into main am: 7344482ff3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3248019

Change-Id: I440053bd684fa56172b82b4012348bd0a93e84c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-30 20:21:28 +00:00
Jihoon Kang
7344482ff3 Merge "Revert^4 "Implement detecting container violations."" into main 2024-08-30 20:18:53 +00:00
Treehugger Robot
0ecc6c1d64 Merge "Define additional non-vendor non-aosp container violations" into main 2024-08-30 18:01:44 +00:00
Paul Duffin
2c6850424c Retry: Allow modules to override --error-when-new UnflaggedApi am: c540beef74 am: cf2b25eef6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3251391

Change-Id: I07757c0c59f098923e2301615d63fa24b8f54469
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-30 17:26:14 +00:00
Paul Duffin
cf2b25eef6 Retry: Allow modules to override --error-when-new UnflaggedApi am: c540beef74 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3251391

Change-Id: I9fe7fa27e39e932fab60434540d0b88240df814c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-30 17:16:59 +00:00
Paul Duffin
c540beef74 Retry: Allow modules to override --error-when-new UnflaggedApi 
Some `java_sdk_library` and `droidstubs` modules already specify
`--error UnflaggedApi` but they are currently ignored because they are
added before the `--error-when-new UnflaggedApi` automatically added by
Soong and Metalava uses the last setting. That means adding
`--error-when-new UnflaggedApi` in change https://r.android.com/3248013
actually reduced the severity of the issue for those modules making it
more likely that they would be missed.

This change only adds the `--error-when-new UnflaggedApi` if it does
not already appear in the metalava command.

Bug: 361582214
Test: m checkapi
Change-Id: I7228bf9794b1c7e27d7acf7a461956b30f3335f5
 2024-08-30 15:27:07 +01:00
Jiyong Park
88c768dd7f Truely re-export export_header_libs from ndk_library 
Bug: 357711733
Test: m CtsNdkBinderTestCases
Change-Id: If498f42cb93904c117129cd96286b437607d6b0a
 2024-08-30 11:41:45 +09:00
Treehugger Robot
aff68005f3 Merge "Add aconfig_storage_reader_java to the global container violation allowlist" into main am: 7a2a25492a am: dd209716cc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3248020

Change-Id: Ie52382a829fb02bfe022c8c696abf508018bb735
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-29 23:38:16 +00:00
Jihoon Kang
7eef112eb1 Define additional non-vendor non-aosp container violations 
These internal only violations are non-vendor. Without these allowlist
entries, branches without vendor will emit container violation errors
given that the internal allowlist is included in vendor/google/release
project.

Ignore-AOSP-First: Intended internal only change
Test: m nothing
Bug: 338660802
Change-Id: I417880c1689390ebdc9caabef705bce739bb0baf
 2024-08-29 23:32:42 +00:00
Treehugger Robot
dd209716cc Merge "Add aconfig_storage_reader_java to the global container violation allowlist" into main am: 7a2a25492a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3248020

Change-Id: I9f5a38caa0104d798622fb63aab7e280885151bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-29 23:29:18 +00:00
Treehugger Robot
7a2a25492a Merge "Add aconfig_storage_reader_java to the global container violation allowlist" into main 2024-08-29 23:26:15 +00:00
Pirama Arumuga Nainar
257401ce1c Merge "Revert^2 "Enable -Wsingle-bit-bitfield-constant-conversion"" into main am: 7bab95be6c am: df6f1f9e45 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3247535

Change-Id: I26ef661d2e39b97839308ec31dda258bd0167871
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-29 21:10:04 +00:00
Pirama Arumuga Nainar
df6f1f9e45 Merge "Revert^2 "Enable -Wsingle-bit-bitfield-constant-conversion"" into main am: 7bab95be6c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3247535

Change-Id: I79494004466856873ec78cc71255f9aef0b935c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-29 21:00:53 +00:00
Pirama Arumuga Nainar
7bab95be6c Merge "Revert^2 "Enable -Wsingle-bit-bitfield-constant-conversion"" into main 2024-08-29 20:49:57 +00:00
Taylor Santiago
0af8ea14fc Clean environment variables to account for sandbox work directory. 
Unset HOME to prevent username leak.

Bug: 363037195

Change-Id: I7a8694f746d58de8f6e41adb6ad52abbaf955ef4
 2024-08-29 20:12:35 +00:00
Priyanka Advani (xWF)
2749834180 Merge "Revert "Allow modules to override --error-when-new UnflaggedApi"" into main am: 2075155076 am: c420be6e76 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3247908

Change-Id: I2af8667182db7166abbea62970f92618a67120f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-29 19:16:11 +00:00
Priyanka Advani (xWF)
c420be6e76 Merge "Revert "Allow modules to override --error-when-new UnflaggedApi"" into main am: 2075155076 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3247908

Change-Id: I697bdf0d2391b838d7a59a6db409b7baa7196871
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-29 19:07:07 +00:00
Priyanka Advani (xWF)
2075155076 Merge "Revert "Allow modules to override --error-when-new UnflaggedApi"" into main 2024-08-29 18:56:17 +00:00
Jihoon Kang
bf65d1b631 Add aconfig_storage_reader_java to the global container violation allowlist 
The module is implicitly added as a dependency for all
java_aconfig_library modules, but does not generate the stubs.

Test: CI
Bug: 338660802
Change-Id: I6ef0f5f5f445e6f70debc3f79e3fd81ed2331366
 2024-08-29 18:49:00 +00:00
Priyanka Advani (xWF)
b09c0d25c9 Revert "Allow modules to override --error-when-new UnflaggedApi" 
This reverts commit 3001ce3bf5.

Reason for revert: Droidmonitor created revert due to b/363016109

Change-Id: Iaf3ca41520b4328fc727af8837e5dff6def41f2b
 2024-08-29 18:48:14 +00:00