Commit Graph

85496 Commits

Author SHA1 Message Date
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
Jooyung Han
1955d600d6 Merge changes Ia9f2186e,Ibe567d3b into main am: 0a9eb7f657 am: e1b039d184
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3247637

Change-Id: I70cf56e14a9bc13b1c8499037f8ddca3e54b0dd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-04 01:40:10 +00:00
Jooyung Han
e1b039d184 Merge changes Ia9f2186e,Ibe567d3b into main am: 0a9eb7f657
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3247637

Change-Id: Id4ffacffb58ebb547db8d2df49110b1c2d91fdf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-04 01:29:53 +00:00
Treehugger Robot
3c3abd6c55 Merge "Add an explanation to ndk_library." into main am: 28b190bc83 am: e0ce0ce310
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3252080

Change-Id: I402e8da52cbed3f332106b22c26a3f0b474a3e04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-04 01:29:12 +00:00
Jooyung Han
0a9eb7f657 Merge changes Ia9f2186e,Ibe567d3b into main
* changes:
  Refactor around apex aconfig files (#2)
  Refactor around apex aconfig files
2024-09-04 01:23:31 +00:00
Treehugger Robot
e0ce0ce310 Merge "Add an explanation to ndk_library." into main am: 28b190bc83
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3252080

Change-Id: Id50dee31764088accf28d09d90eb6cab565e98fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-04 01:19:59 +00:00
Treehugger Robot
28b190bc83 Merge "Add an explanation to ndk_library." into main 2024-09-04 01:14:59 +00:00
Yihan Dong
34ffc2e337 Merge "Apply apimapper instrument tool on android tests" into main am: a596b12878 am: b5c5c1a8de
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3249673

Change-Id: I30973ce9341aabf54ef96cf4c9fefc35aa4c7845
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-04 01:01:34 +00:00
Yihan Dong
b5c5c1a8de Merge "Apply apimapper instrument tool on android tests" into main am: a596b12878
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3249673

Change-Id: Ifd8f3a190c3794aed0dec5d872915fa294440db7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-04 00:59:51 +00:00
Yihan Dong
a596b12878 Merge "Apply apimapper instrument tool on android tests" into main 2024-09-04 00:52:09 +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
Dan Albert
ba9f9262a3 Add an explanation to ndk_library.
Bug: http://b/357711733
Test: None
Change-Id: I56fde036f7fe49ccf8b3a47a4eaaa4abac008fc7
2024-09-03 23:05:46 +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
Jooyung Han
a3fddf40ca Refactor around apex aconfig files (#2)
Aconfig files are treated like other files in APEX. This way, we can
dedup the code hanlding those files (copy commands, fs_config, etc).

Bug: n/a
Test: m nothing --no-skip-soong-tests
Change-Id: Ia9f2186e4e54e92ad90c7a9c00474cb0f7519a31
2024-09-03 13:22:21 +09:00
Jooyung Han
6186ef9004 Refactor around apex aconfig files
We can iterate over the collection of apex file.

Bug: n/a
Test: m nothing --no-skip-soong-tests
Change-Id: Ibe567d3b251c54d656793dc443eb68fb9137f42f
2024-09-03 11:14:19 +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
Yihan Dong
8be09c2075 Apply apimapper instrument tool on android tests
Apimapper is a tool to instrument android tests to log potentail API calls at the run time.

The real tool is developed internally. We use a placeholder binary in
AOSP before the real tool is ready.

The tool will only take affect when the enviroment var EMMA_API_MAPPER
is set to true.

Test: m cts
Bug: 328699028

Change-Id: Iece53b8afdb9803334b7393527f4fa24e22f71a8
2024-09-02 09:02:08 +08: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