Commit Graph

77195 Commits

Author SHA1 Message Date
Cole Faust
ce96639b98 Merge "Revert "Handle symlinks in sbox"" into main am: 25861686fe am: 08f46ee8d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864655

Change-Id: Iee7203f3f75195524bd606b6c74a1ac5e75334d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 01:55:32 +00:00
Cole Faust
08f46ee8d4 Merge "Revert "Handle symlinks in sbox"" into main am: 25861686fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864655

Change-Id: Ic479fd4e9d4f0fec49ba0e11a52370d2cc4a8d5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 01:24:48 +00:00
Cole Faust
25861686fe Merge "Revert "Handle symlinks in sbox"" into main 2023-12-08 00:43:17 +00:00
Colin Cross
11e76784fc Merge aconfig files per-module am: d788b3e6cb am: 48adf4a040
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860765

Change-Id: Ifd5b70064b0af0ed9510ff58255a62749839de6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 23:10:06 +00:00
Colin Cross
09e464d510 Merge aconfig files per-module am: d788b3e6cb am: 4c803a0355
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860765

Change-Id: I507b5b10db90f2b39be425cfd32d6ebe0f98b957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 23:08:30 +00:00
Colin Cross
48adf4a040 Merge aconfig files per-module am: d788b3e6cb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860765

Change-Id: I9eb9134c343f2a3f28422a4f7d51d169b58faa5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 22:37:32 +00:00
Colin Cross
4c803a0355 Merge aconfig files per-module am: d788b3e6cb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860765

Change-Id: Ie43ca8826156ff580618cdeda0337db270a82e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 22:37:13 +00:00
Cole Faust
69b5a5f0bf Revert "Handle symlinks in sbox"
This reverts commit dd9529050d.

Reason for revert: There are at least b/315337725 and b/315036698 issues, reverting this cl while I fix them.

Change-Id: I644bbbe594b9dd53a99a3b6513fbcba68afe0b4a
2023-12-07 21:40:08 +00:00
Colin Cross
d788b3e6cb Merge aconfig files per-module
Passing the list of all transitive aconfig files to Make causes extra
Kati analysis runs when dependencies are changed in Android.bp files.
Since Make is going to merge them anyways, merge them per-module and
pass a single aconfig file to Make for each module.

Fixes: 313698230
Test: m out/target/product/vsoc_x86_64/system/etc/aconfig_flags.pb
Change-Id: Ifde4826bc93bc06e40338f72b4cb39eed26ca08d
2023-12-07 04:17:37 +00:00
LaMont Jones
2b1960e9b7 Merge "cc: export LOCAL_ACONFIG_FILES for printflags" into main am: 7dcbf427f9 am: 78c3daf391
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860706

Change-Id: Ia040751667d67e8aaa2716ac17c56119420ca483
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 19:47:56 +00:00
LaMont Jones
7f291b6947 Merge "cc: export LOCAL_ACONFIG_FILES for printflags" into main am: 7dcbf427f9 am: b2f6d071a4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860706

Change-Id: Icacbee1e62799075f9a82bfbf091abae71ce221e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 19:33:03 +00:00
LaMont Jones
78c3daf391 Merge "cc: export LOCAL_ACONFIG_FILES for printflags" into main am: 7dcbf427f9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860706

Change-Id: Ibe4edfa6bd523d8f4d7850e7935a435734c2c2f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 19:16:59 +00:00
LaMont Jones
b2f6d071a4 Merge "cc: export LOCAL_ACONFIG_FILES for printflags" into main am: 7dcbf427f9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860706

Change-Id: I106ba9459c56890290f515fe2ccc617e9101cc42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 18:59:50 +00:00
LaMont Jones
7dcbf427f9 Merge "cc: export LOCAL_ACONFIG_FILES for printflags" into main 2023-12-06 18:01:17 +00:00
Vilas Bhat
c00e264487 Merge "16k: soong: Update DevicePageSizeAgnostic to DeviceNoBionicPageSizeMacro" into main am: 3ad4cf3a9a am: 630ed2bc87
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2857828

Change-Id: I724c34f2f66375dee2aea399ed73e735e64aa772
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 14:41:35 +00:00
Vilas Bhat
ce0ea6c649 Merge "16k: soong: Update DevicePageSizeAgnostic to DeviceNoBionicPageSizeMacro" into main am: 3ad4cf3a9a am: 3f2cdb2665
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2857828

Change-Id: Id267241fc7ff968611f0a12c1c8ed77598697b0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 14:39:55 +00:00
Vilas Bhat
3f2cdb2665 Merge "16k: soong: Update DevicePageSizeAgnostic to DeviceNoBionicPageSizeMacro" into main am: 3ad4cf3a9a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2857828

Change-Id: Ic5d8c2efc8d41b766812d551607f7f6931060a2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 14:09:16 +00:00
Vilas Bhat
630ed2bc87 Merge "16k: soong: Update DevicePageSizeAgnostic to DeviceNoBionicPageSizeMacro" into main am: 3ad4cf3a9a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2857828

Change-Id: I4c2f957555d98453bf6498515282da8c627525ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 14:08:47 +00:00
Vilas Bhat
3ad4cf3a9a Merge "16k: soong: Update DevicePageSizeAgnostic to DeviceNoBionicPageSizeMacro" into main 2023-12-06 13:16:19 +00:00
Aleksei Vetrov
fa9f9ce598 Merge "Move NDK ABI monitoring enabling flag to release flags" into main am: fb510be871 am: 17565a7c67
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2843703

Change-Id: I1290effae8514f3dc44023f822fc6f2e5b666af8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 13:02:17 +00:00
Aleksei Vetrov
255c274734 Merge "Move NDK ABI monitoring enabling flag to release flags" into main am: fb510be871 am: d193a77232
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2843703

Change-Id: Iec19d80cbf53261580d608c18f2b3b773c69f423
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 13:00:23 +00:00
Aleksei Vetrov
d193a77232 Merge "Move NDK ABI monitoring enabling flag to release flags" into main am: fb510be871
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2843703

Change-Id: I1d32fefcbc05e07d1898f2ffbb1888b2947a594b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 12:29:22 +00:00
Aleksei Vetrov
17565a7c67 Merge "Move NDK ABI monitoring enabling flag to release flags" into main am: fb510be871
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2843703

Change-Id: I528bd3a7792d4be794fc63b8dd85fe026013d32e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 12:29:12 +00:00
Aleksei Vetrov
fb510be871 Merge "Move NDK ABI monitoring enabling flag to release flags" into main 2023-12-06 11:11:35 +00:00
Aditya Choudhary
2d33743e74 Merge changes from topic "code_metadata" into main am: 4c3e2df157 am: ab279a0571
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2852607

Change-Id: I603c630746793e6d22820c3d0582c7aafafbac1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 08:59:41 +00:00
Aditya Choudhary
519452c5ad Merge changes from topic "code_metadata" into main am: 4c3e2df157 am: d798f5c879
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2852607

Change-Id: I7352cd1f8e4d9aa1fd65efd21cd71f6c86278afa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 08:58:01 +00:00
Aditya Choudhary
f1c7380dd6 Add Code Metadata rule to soong/testing. am: 8094b6bf9d am: 7d37796d24
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786121

Change-Id: I24f0fd2728f426f666a78679acb0b912ff4fd0ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 08:57:55 +00:00
Aditya Choudhary
ab279a0571 Merge changes from topic "code_metadata" into main am: 4c3e2df157
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2852607

Change-Id: Idbe1050f36ce3bc7e22bc8210dcabd045d20d7db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 08:11:25 +00:00
Aditya Choudhary
d798f5c879 Merge changes from topic "code_metadata" into main am: 4c3e2df157
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2852607

Change-Id: Icc9c1eda9b93e1ec897425b98cb8f16f83431409
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 08:11:06 +00:00
Aditya Choudhary
7d37796d24 Add Code Metadata rule to soong/testing. am: 8094b6bf9d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786121

Change-Id: I40154b3f9d2c170cb7aacbf6f0b9383b2e87f444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 08:11:01 +00:00
Aditya Choudhary
4c3e2df157 Merge changes from topic "code_metadata" into main
* changes:
  Add source file provider for genrule/srcs, python libraries and rust libraries.
  Add Code Metadata rule to soong/testing.
2023-12-06 07:37:50 +00:00
Jooyung Han
8095a1a5df Merge "Error if vendor apex adds an LLNDK library" into main am: 2588c54d01 am: 82355e9041
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2858985

Change-Id: Ib190a0096e691c11c94dea41ef567284b7bb4488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 03:59:17 +00:00
Jooyung Han
096110cf4a Merge "Error if vendor apex adds an LLNDK library" into main am: 2588c54d01 am: 64a51889e8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2858985

Change-Id: I7d7287c089e07b5c64659cea98ef8ca73b737918
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 03:07:51 +00:00
Jooyung Han
82355e9041 Merge "Error if vendor apex adds an LLNDK library" into main am: 2588c54d01
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2858985

Change-Id: I9b90787281b2818fa0d79e8a38ca9cd1edf097aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 02:59:26 +00:00
Jooyung Han
64a51889e8 Merge "Error if vendor apex adds an LLNDK library" into main am: 2588c54d01
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2858985

Change-Id: I05299415612f82859323831da1acf0c90943d2de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 02:33:55 +00:00
Jooyung Han
2588c54d01 Merge "Error if vendor apex adds an LLNDK library" into main 2023-12-06 01:45:48 +00:00
Cole Faust
ef7db81c27 Add llvm-objcopy to android_sdk_repo_host's implicit tools am: df34caf8b5 am: 37f8b661fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860767

Change-Id: I587fa7d9889d5367f6c4c3a16a00e8bb4b8bea44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 01:26:23 +00:00
Cole Faust
1835b364fc Add llvm-objcopy to android_sdk_repo_host's implicit tools am: df34caf8b5 am: ae4898e3f3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860767

Change-Id: I63d42c476c9f140ac34f24cf44705ff665811ada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 01:13:19 +00:00
Cole Faust
37f8b661fe Add llvm-objcopy to android_sdk_repo_host's implicit tools am: df34caf8b5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860767

Change-Id: Ic24df298c9c4444b59a8bf835e84af0afaa3ea18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 00:52:08 +00:00
Cole Faust
ae4898e3f3 Add llvm-objcopy to android_sdk_repo_host's implicit tools am: df34caf8b5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860767

Change-Id: I84b8348e64fd2462ee241c8411b12428c0ed0a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 00:41:14 +00:00
Aleksei Vetrov
146e9824c5 Move NDK ABI monitoring enabling flag to release flags
Currently NDK ABI monitoring is enabled by switching boolean flag in
soong code. When this flag is switched, it will enable ABI monitoring in
all release configurations at once.

This change moves the flag from soong code to the trunk-stable flags
framework ("build/release/build_flags.scl") that allows to enable it
only in specific configurations like "trunk-staging".

Test: TH
Bug: 156513478
Change-Id: Ibb810a834c0d756b22782b1a2d8ec5a5e575a4b3
2023-12-05 23:52:46 +00:00
Vilas Bhat
b3d2d22a5d 16k: soong: Update DevicePageSizeAgnostic to DeviceNoBionicPageSizeMacro
This is part of a larger change to update the flag
PRODUCT_PAGE_SIZE_AGNOSTIC to PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO.
This is to help clarify that this flag doesn't mean the device
will actually work end-to-end with any page size.

Bug: 312541564
Test:
```
source build/envsetup.sh
lunch aosp_cf_arm64_phone_pgagnostic-trunk-userdebug
m
cat out/soong/build.aosp_cf_arm64_phone_pgagnostic.ninja | grep __BIONIC_NO_PAGE_SIZE_MACRO
```

Change-Id: I33033876d0d4a276d1bb962d40315b71a3968c66
2023-12-05 23:49:50 +00:00
Cole Faust
df34caf8b5 Add llvm-objcopy to android_sdk_repo_host's implicit tools
llvm-strip is actually a symlink to llvm-objcopy. Since aosp/2850015,
rules must add both the symlink and the target of the symlink to
the sandbox to avoid a dangling symlink.

Fixes: 314994282
Test: m sdk sdk_repo dist
Change-Id: I72494596f3597e176222a44c822d0b12cdd4cde4
2023-12-05 14:44:42 -08:00
Hugo Drumond Jacob
1814a3c758 Merge "Revert "Sandbox chre_atoms_log.h and deqp_spvtools_update_build_version"" into main am: fe3777742a am: 567ed1b7b0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2859245

Change-Id: Ibd7465744e70d8f80db2290f16721edfc658dab7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 20:59:03 +00:00
Hugo Drumond Jacob
344d5b6113 Merge "Revert "Sandbox chre_atoms_log.h and deqp_spvtools_update_build_version"" into main am: fe3777742a am: 4b971d7039
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2859245

Change-Id: Iefe9a5e1698a574418ef821cb17201e7f1d091ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 20:56:25 +00:00
Automerger Merge Worker
52c04bf464 Merge "Merge "Handle symlinks in sbox" into main am: 14e1149195 am: ef65c23a22" into udc-qpr-dev-plus-aosp 2023-12-05 20:56:21 +00:00
Cole Faust
e52420154c Merge "Handle symlinks in sbox" into main am: 14e1149195 am: ef65c23a22
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2850015

Change-Id: If27e54d73d6232d51068153d0505ac26784e5033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 20:56:14 +00:00
Cole Faust
b13920fbcc Merge "Handle symlinks in sbox" into main am: 14e1149195 am: 293162ec9e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2850015

Change-Id: I9e8994c1960589497b9b15664751f191d0da1473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 20:56:08 +00:00
LaMont Jones
c71f79e3ff cc: export LOCAL_ACONFIG_FILES for printflags
Bug: 308625757
Test: manual
Change-Id: I211fe4736098bdca040c2a58b8b5e468c9d2e542
2023-12-05 20:46:06 +00:00
Hugo Drumond Jacob
4b971d7039 Merge "Revert "Sandbox chre_atoms_log.h and deqp_spvtools_update_build_version"" into main am: fe3777742a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2859245

Change-Id: Ie9d3b9f9e0b3c15c16eee2c546f48c36d45f05c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 20:02:37 +00:00