Commit Graph

83036 Commits

Author SHA1 Message Date
Rico Wind
cb0c4b717d Merge "Don't run resource shrinking for eng builds" into main am: c3e6594a0d am: e79230c639
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3075498

Change-Id: I74d7d3fbc1f29c634dc220d0c73c8e3c6f136f2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-14 04:47:04 +00:00
Rico Wind
e79230c639 Merge "Don't run resource shrinking for eng builds" into main am: c3e6594a0d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3075498

Change-Id: If110eeba2d32202c0a5f90af28172931547f1ba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-14 04:26:45 +00:00
Rico Wind
c3e6594a0d Merge "Don't run resource shrinking for eng builds" into main 2024-05-14 04:04:17 +00:00
Justin Yun
297565ac5b Soong filesystem may install aconfig_flags.pb am: 74f3f30ae4 am: b2c9f6a8f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3046652

Change-Id: I030ba183d5ba347e8aeef8c2069daa4e61b9f6ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-14 01:54:49 +00:00
Justin Yun
b2c9f6a8f1 Soong filesystem may install aconfig_flags.pb am: 74f3f30ae4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3046652

Change-Id: I3fe0139693348b205a2fa72186b991c6094f696f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-14 01:32:41 +00:00
Treehugger Robot
b61e815c10 Merge "Add the primary file to EXTRA_INSTALL_ZIPS" into main am: 82d7cdc547 am: f17dc26a26
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3081585

Change-Id: Ib035c6e25e0c9bb0a1017dcb288035c16d3e9be6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-13 23:39:53 +00:00
Treehugger Robot
f17dc26a26 Merge "Add the primary file to EXTRA_INSTALL_ZIPS" into main am: 82d7cdc547
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3081585

Change-Id: Ic6907edc0772fcefa861b4f4cde525cbe3ee5643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-13 23:17:59 +00:00
Justin Yun
74f3f30ae4 Soong filesystem may install aconfig_flags.pb
By setting aconfig_flags: true, soong filesystem module installs the
aconfig_flags.pb file to its etc directory.

We need to define aconfigFilePaths to ModuleBase to store the list of
aconfig file paths that is generated from the GenerateBuildActions().
The aconfigFilePaths are collected when build the filesystem module
to build the aconfig_flags.pb for the filesystem image.

Bug: 335363964
Test: compare the cache list with those generated from make.
Change-Id: Ia32b566bf43174e94b9e610b9503608c6b583899
2024-05-13 23:14:42 +00:00
Treehugger Robot
82d7cdc547 Merge "Add the primary file to EXTRA_INSTALL_ZIPS" into main 2024-05-13 22:56:45 +00:00
Colin Cross
4052bae4d0 Merge "Add $ORIGIN to rpath for cc_test modules" into main am: 783fa37807 am: 37ba7771d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3083002

Change-Id: I5dbc0b065af303982347848832f40bc5c8a9135e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-13 21:40:09 +00:00
Colin Cross
37ba7771d5 Merge "Add $ORIGIN to rpath for cc_test modules" into main am: 783fa37807
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3083002

Change-Id: I0b3ae062fda3c154864318cd641428982ad1bf87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-13 21:25:33 +00:00
Treehugger Robot
5fd0aa3abe Merge "Fix a check for the ninja_log" into main am: 77583741b6 am: a2b9aced73
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3083546

Change-Id: I4ecb17f7f61504a3ef5994e8c283d37756b07eac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-13 21:02:26 +00:00
Colin Cross
783fa37807 Merge "Add $ORIGIN to rpath for cc_test modules" into main 2024-05-13 20:59:01 +00:00
Treehugger Robot
a2b9aced73 Merge "Fix a check for the ninja_log" into main am: 77583741b6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3083546

Change-Id: I93afdef722b46fe3412d1ce407ba175e3a36d646
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-13 20:40:33 +00:00
Treehugger Robot
77583741b6 Merge "Fix a check for the ninja_log" into main 2024-05-13 20:20:04 +00:00
Cole Faust
6bb2832c15 Fix a check for the ninja_log
soong_build uses / as it's cwd, so we need to specify the top directory
when checkign for files.

Test: add a printf in the if statement; touch out/soong/Android.bp && m nothing; ensure printf doesn't fire
Change-Id: Iba9773765547b22a03dbca33aa6b8c75359cb5ff
2024-05-13 11:57:16 -07:00
Cole Faust
07c4537424 Add the primary file to EXTRA_INSTALL_ZIPS
Make needs to know the primary file, because the zip is only extracted
when the primary file is installed.

Bug: 337869220
Test: m out/target/product/emu64x/obj/PACKAGING/system_intermediates/file_list.txt and checking it for the extra NetworkStackGoogle apks, with a local NetworkStackGoogle android_app_set added into the tree
Change-Id: I5cb7243d214f4730e3f9efb6746793f3bf4b8214
2024-05-13 11:04:18 -07:00
Rico Wind
936754c599 Don't run resource shrinking for eng builds
Since we will not shrink the resources anyway this is a waste of time

Bug: 338429777
Test: m SystemUI
Change-Id: I388f045294131a304920756607792091627921bc
2024-05-13 12:32:33 +02:00
Hsin-Yi Chen
cdb004561c Merge "Ensure opt-in platform ABI dumps are configured with ref_dump_dirs" into main am: d75bc49454 am: 3c8f5f2bc0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3081204

Change-Id: Ia8b41d72f4645b0cf96cabb8f5c62ec38d27963f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-13 03:45:38 +00:00
Hsin-Yi Chen
3c8f5f2bc0 Merge "Ensure opt-in platform ABI dumps are configured with ref_dump_dirs" into main am: d75bc49454
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3081204

Change-Id: I155696480f1059449873414b16382e70d4ab004f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-13 03:24:07 +00:00
Hsin-Yi Chen
d75bc49454 Merge "Ensure opt-in platform ABI dumps are configured with ref_dump_dirs" into main 2024-05-13 03:01:44 +00:00
Jiyong Park
6c37d5e046 Merge changes from topic "reland_embedded_jni" into main am: b544a8b9ec am: fdc7f1d37e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3079286

Change-Id: I14324929dddff89b80f95dab5b2dc42d0e59623a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-10 23:31:22 +00:00
Jiyong Park
fdc7f1d37e Merge changes from topic "reland_embedded_jni" into main am: b544a8b9ec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3079286

Change-Id: Iee42bf1b5d6dc79425f9c99a3b54ff8cf639a4a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-10 23:13:08 +00:00
Jiyong Park
b544a8b9ec Merge changes from topic "reland_embedded_jni" into main
* changes:
  Install transitive deps of jni libs, but not the jni libs themselves
  Add SkipToTransitiveDepsTag interface for dependency tags
  Revert "Revert "Collect transitve deps of jni libs only for bund..."
  Revert^2 "Always embed jni libs and store uncompressed"
2024-05-10 22:53:08 +00:00
Tomasz Wasilczyk
12dda3b595 Disable cc_cmake_snapshot outside of Linux am: d848dcc9e6 am: dc59ca9f03
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3083527

Change-Id: If76536ff024b85b00707b9cd8beec68b04bac29f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-10 22:17:21 +00:00
Tomasz Wasilczyk
dc59ca9f03 Disable cc_cmake_snapshot outside of Linux am: d848dcc9e6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3083527

Change-Id: Ib4d86b6f90ff7e257894b115754781138fa83346
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-10 21:54:53 +00:00
Tomasz Wasilczyk
d848dcc9e6 Disable cc_cmake_snapshot outside of Linux
Test: cd build/soong/cc && go test
Bug: 339782737
Change-Id: Ide6693123c741a39d37164a1a39841be1bd84862
2024-05-10 21:32:23 +00:00
Colin Cross
b881e324d2 Add $ORIGIN to rpath for cc_test modules
cc_test modules can use data_libs to put shared libraries alongside
the test.  Add $ORIGIN to rpath so they can load them as DT_NEEDED
libraries or with dlopen.

Test: treehugger
Change-Id: I4227d16ff80e70dfecb481a2de6dd15af66348bc
2024-05-10 20:27:32 +00:00
Tomasz Wasilczyk
6a7e55374e Merge "Skip cmake_snapshot_test(s)" into main am: cd8dc70806 am: 782d6a92a7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3082227

Change-Id: I625c3af6394a4f03ee23bc80ec970137cb6b5e45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-10 15:35:44 +00:00
Tomasz Wasilczyk
782d6a92a7 Merge "Skip cmake_snapshot_test(s)" into main am: cd8dc70806
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3082227

Change-Id: Ie9a06eb41fd682f290989d6f782d5e25dc638eee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-10 15:21:08 +00:00
Tomasz Wasilczyk
cd8dc70806 Merge "Skip cmake_snapshot_test(s)" into main 2024-05-10 15:00:34 +00:00
Tomasz Wasilczyk
ea2fbd6787 Skip cmake_snapshot_test(s)
These tests fail on sdk-sdk_mac-trunk_staging because this feature is
not intended to run outside of Linux. Let's skip these tests for now
until we figure out how to disable snapshot feature properly.

Bug: 339782737
Test: go test
Change-Id: Ibe70a0e3dc92262c78ce9e3a8af58f2da3bfeda2
2024-05-10 14:20:15 +00:00
Justin Yun
2448ce6385 Remove duplicated CollectDependencyAconfigFiles() am: 40182b6ff3 am: 6928bcfa4a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3074027

Change-Id: I03e902b51aa19cb89b651cc580ccebf27a705707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-10 07:16:35 +00:00
Justin Yun
6928bcfa4a Remove duplicated CollectDependencyAconfigFiles() am: 40182b6ff3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3074027

Change-Id: I320ca165db15ee7a405d65e912d3945b338819af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-10 07:02:32 +00:00
Jiyong Park
e716807083 Install transitive deps of jni libs, but not the jni libs themselves
Consider this case:

app --(jni_libs)--> libfoo --(shared_libs)--> libprivate

Only libfoo is embedded into the app. libprivate is not embedded because
libprivate is very likely to be depended on by other components in the
platform, in which case it will anyway be installed to /system/lib.
Embedding libprivate into the app will increase the storage usage as a
whole. Furthermore, if libprivate is not a shared lib but a config file
(of type prebuilt_etc), it can't be embedded and therefore must be
installed outside of the app.

However, a problem occurs when libprivate is not depended on by anyone
else. Then libprivate is not installed to the system partition, causing
an error at runtime.

This CL fixes that by making the jni_libs dependency to implement the
new SKipToTransitiveDepsTag interface. Now, jni_libs themselves are not
installed, but their transitive deps are depended on by the app
containing the jni libs.

Bug: 330276359
Test: m NfcNci and check if libnfc-nci.config is installed.
Test: m CarService and check android.hardware.automotive.evs-V2-ndk.so
is installed as well.
Test: go test ./... under soong/java

Change-Id: I04cc92b7fad768a20ec60a02b3e7534641b1e74d
2024-05-10 14:03:07 +09:00
Jiyong Park
1fb7c35129 Add SkipToTransitiveDepsTag interface for dependency tags
Consider this dependency graph:

A --> B --> C

And let's assume that B is built into A (e.g. static_libs), while B -->
C is a runtime dependency (e.g. required).

We want to install C (but not B of course) when A gets installed.
However, before this change, it was not supported because the dependency
A -> B was not tracked in computeInstallDeps. One had to explicitly add
a A -> C dependency.

This change fixes the problem by introducing the new interface
SkipToTransitiveDepsTag. computeInstallDeps uses it to decide whether to
take all install files and packaging specs or only those from transitive
dependencies. In the above example, if the dependency A --> B implements
the new interface and returns true, B's transitive dependencies (i.e. C)
are added into A's transitive dependencies. B's outputs are not added.

Bug: N/A
Test: go test ./... under soong/android
Change-Id: I3ca03a21633883f320ecb9e5bc82eb134519cd88
2024-05-10 14:03:04 +09:00
LaMont Jones
079fbb7ef1 [automerger skipped] Merge "sort _all_release_configs variable before we write it" into 24D1-dev am: b39a506723 -s ours
am skip reason: Merged-In Icbf9a8f84a62b60469ed636f69818c9179d2ddf6 with SHA-1 80ef5ce7bc is already in history

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

Change-Id: I7b45f8e648d7c4767a8f2cee3d5b65ea57762387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-10 01:39:45 +00:00
LaMont Jones
83d5ea4c04 [automerger skipped] sort _all_release_configs variable before we write it am: 7ca4a9953b -s ours
am skip reason: Merged-In Icbf9a8f84a62b60469ed636f69818c9179d2ddf6 with SHA-1 80ef5ce7bc is already in history

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

Change-Id: I0e7d549e946473228ca96f511a91a8e427e84328
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-10 01:39:43 +00:00
LaMont Jones
b39a506723 Merge "sort _all_release_configs variable before we write it" into 24D1-dev 2024-05-10 01:21:08 +00:00
Justin Yun
40182b6ff3 Remove duplicated CollectDependencyAconfigFiles()
android.ModuleBase already calls aconfigUpdateAndroidBuildActions()
that is the same with CollectDependencyAconfigFiles(). Remove the
CollectDependencyAconfigFiles() to avoid duplication with
aconfigUpdateAndroidBuildActions().

To make the aconfig information available in
GenerateAndroidBuildActions() of all modules, call
aconfigUpdateAndroidBuildActions() before calling
GenerateAndroidBuildActions() of each module.

Also, we don't need SetAconfigFileMkEntries(), which is a duplicate
of aconfigUpdateAndroidMkData()

Bug: 335363964
Test: diff `adb shell printflags` before and after the change.
Change-Id: I52808e442e9fed7db1eae7b7c5ed0b1c5ba74f5d
2024-05-10 10:00:14 +09:00
Cole Faust
844777e315 Merge "Create EXTRA_INSTALL_ZIPS variable" into main am: dd056e087e am: e194ae5c8f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3079840

Change-Id: Ib0fb452910a3e69504738c2dcb34709f9257ab62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-10 00:51:14 +00:00
Cole Faust
e194ae5c8f Merge "Create EXTRA_INSTALL_ZIPS variable" into main am: dd056e087e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3079840

Change-Id: Ia1f9a267b8d4d2ff3800e138a97654308a776917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-10 00:31:56 +00:00
LaMont Jones
20967110d7 [automerger skipped] crunch_flags: handle non-string ACONFIG_VALUE_SETS am: 4fe89fdfbc -s ours
am skip reason: Merged-In Ie8f262d6408b1564ec7a3918f8654ccfa9bc5940 with SHA-1 6f3ca9eea1 is already in history

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

Change-Id: I9e5fdc261ef9c56a02f657944a9b9fb16b3e069d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-10 00:31:48 +00:00
Tomasz Wasilczyk
4057a2f7e2 Merge "Implement cc_cmake_snapshot" into main am: ae0d23fc18 am: 6ea0167a42
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2798713

Change-Id: I92072e42c04cee2e5246f93e141167dadfee0beb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-10 00:25:20 +00:00
Treehugger Robot
e8aa1a33b2 Merge "sort _all_release_configs variable before we write it" into main am: 0820b61d8c am: 71d9a1c394
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3079842

Change-Id: Idbce0c5d16bedff8167e7d2eeb6d15a42cbf3163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-10 00:25:07 +00:00
Treehugger Robot
d8bbc3865a Merge "Rename release_variable to release_flag in selects" into main am: ef14cae605 am: 7ea99bfb3c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3081788

Change-Id: If2e7efc078c3310fc416c2d208a507bdf9e29e1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-10 00:23:51 +00:00
Cole Faust
dd056e087e Merge "Create EXTRA_INSTALL_ZIPS variable" into main 2024-05-10 00:11:16 +00:00
LaMont Jones
4fe89fdfbc crunch_flags: handle non-string ACONFIG_VALUE_SETS
If the default value for RELEASE_ACONFIG_VALUE_SETS is not a string,
the resulting value is the empty string.

Bug: 328495189
Test: manual
Ignore-AOSP-First: cherrypick
Merged-In: Ie8f262d6408b1564ec7a3918f8654ccfa9bc5940
Change-Id: Ie8f262d6408b1564ec7a3918f8654ccfa9bc5940
2024-05-10 00:07:44 +00:00
Tomasz Wasilczyk
6ea0167a42 Merge "Implement cc_cmake_snapshot" into main am: ae0d23fc18
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2798713

Change-Id: I511e89d3ca1c0f77ef47d63051d509bc426a976f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-10 00:02:05 +00:00
Treehugger Robot
71d9a1c394 Merge "sort _all_release_configs variable before we write it" into main am: 0820b61d8c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3079842

Change-Id: Ia6d5eb602ef4459202e050163fbaa6a1999024c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-10 00:01:54 +00:00