StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,087 Commits 1 Branch 0 Tags
16.0
Commit Graph

86087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chan Wang
880aa466bf Merge "Temporarily bypass apex availability check for /product apexes with a specific prefix" into main am: 3a9a37cc78 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3276271

Change-Id: I2dfd5c517d0f39e6af0485574b0ec4ae7b133320
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-23 22:57:36 +00:00
Chan Wang
3a9a37cc78 Merge "Temporarily bypass apex availability check for /product apexes with a specific prefix" into main 2024-09-23 22:56:01 +00:00
Liana Kazanova
c561d6d1c3 Merge "Revert "pass read new storage parameter to java codegen"" into main am: 5c1283460c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3277435

Change-Id: I80370e6a23874b25c0ba6aad1418d306d660b797
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-23 22:52:14 +00:00
Spandan Das
5994600572 Remove the internal extractor module created by apex_set am: 9d6e209f44 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3273164

Change-Id: I5d45477ec1c325ec57fdcc6267a3e9ac44ceabdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-23 22:51:47 +00:00
Spandan Das
4ecc11b560 Remove the internal selector module created by prebuilt_apex am: e350e36e7b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3273030

Change-Id: I7f2e648d4dbdd4364953816e2e1ebbeb63f9a91e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-23 22:51:37 +00:00
Liana Kazanova
5c1283460c Merge "Revert "pass read new storage parameter to java codegen"" into main 2024-09-23 22:51:13 +00:00
Liana Kazanova
df1c59a657 Revert "pass read new storage parameter to java codegen" 
This reverts commit 9cf2e8e140.

Reason for revert:DroidMonitor - Potential culprit for http://b/369200837 - Verifying through ABTD before submission. 

Change-Id: I635ba732fba40b7c73b5c419ef204fb14e857cb2
 2024-09-23 21:54:04 +00:00
Spandan Das
9e2377907d Merge changes I0edb681b,I0ea2327f into main am: e2860d9db6 am: c012f4ece4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3273493

Change-Id: Iaa74e0c7332c9a3e8a5180db3bac0abd7edc4318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-23 21:18:32 +00:00
Chan Wang
490a6f9b76 Temporarily bypass apex availability check for /product apexes with a 
specific prefix

Bug: 361501627

Test: m nothing --no-skip-soong-tests
Change-Id: Ifb855bed3514d27ecccddb5cd986537c628683b1
 2024-09-23 21:11:09 +00:00
Spandan Das
9d6e209f44 Remove the internal extractor module created by apex_set 
The build actions will be generated by the top-level apex.

Test: go test ./apex
Test: lunch cf_x86_64_phone-next-userdebug (uses mainline prebuilts)
Test: verified no diff in file_list.txt
Bug: 368337090
Change-Id: I170cf4beec18b54cd950560ea0991bc6f1455d76
 2024-09-23 20:56:12 +00:00
Spandan Das
c012f4ece4 Merge changes I0edb681b,I0ea2327f into main am: e2860d9db6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3273493

Change-Id: I1616399c194df10dd2da09eab4e76cc8ebf75438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-23 20:55:45 +00:00
Zhi Dou
d179e26c90 [automerger skipped] Merge "pass read new storage parameter to java codegen" into main am: 168b3f8581 am: 05de394597 -s ours 
am skip reason: Merged-In Id12816206a16b17c23e3a53832d268f1600107b3 with SHA-1 9612480ee2 is already in history

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

Change-Id: Iafc30210bbb3bcb83cc69673cef45915efe8770b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-23 20:48:40 +00:00
Spandan Das
e350e36e7b Remove the internal selector module created by prebuilt_apex 
Since the deapex actions have been moved to the top-level apex, this
internal module is no longer neessary.

Test: go test ./apex
Test: lunch cf_x86_64_phone-next-userdebug (uses mainline prebuilts)
Test: verified no diff in file_list.txt
Bug: 368337090

Change-Id: I53695e028a36a689fd1b026f5783de7d8567be76
 2024-09-23 20:46:36 +00:00
Spandan Das
e2860d9db6 Merge changes I0edb681b,I0ea2327f into main 
* changes:
  Remove internal deapexer module
  Remove deapex support from java_*_import
 2024-09-23 20:28:36 +00:00
Zhi Dou
05de394597 Merge "pass read new storage parameter to java codegen" into main am: 168b3f8581 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3276672

Change-Id: I9f5190a09672880a3379389451e50cfd78bab04a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-23 20:09:25 +00:00
Zhi Dou
168b3f8581 Merge "pass read new storage parameter to java codegen" into main 2024-09-23 19:49:07 +00:00
Zhi Dou
9cf2e8e140 pass read new storage parameter to java codegen 
When RELEASE_READ_FROM_NEW_STORAGE is true, enable reading from new
storage. So that we can ensure nextfood is not impacted.

Test: m and check cf
Bug: 349874828
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c98032785339de11e34ee3d4f94b3ec3ed70d324)
Merged-In: Id12816206a16b17c23e3a53832d268f1600107b3
Change-Id: I95ad9457e6d9c07a5a5b3074045a383f004113a9
 2024-09-23 19:29:41 +00:00
Yu Liu
03369e7f44 Add an incremental parity test. am: 480c0e5af9 am: eafffb9de7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3273161

Change-Id: If36cad3d3e7b5535bf8c4b555a1e88aefa2224a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-23 18:23:40 +00:00
Jihoon Kang
2d404031e7 Merge changes Ica0cb5a5,If432cdc6,Idb4b0b0a into main am: 1a7d900c78 am: a7906c717c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3272004

Change-Id: I3893d25882248f645c37718793907b7a1a64f0f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-23 18:21:01 +00:00
Yu Liu
eafffb9de7 Add an incremental parity test. am: 480c0e5af9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3273161

Change-Id: I8bb7d4713d56521450ca76e6992faa7cd1600c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-23 17:56:33 +00:00
Jihoon Kang
a7906c717c Merge changes Ica0cb5a5,If432cdc6,Idb4b0b0a into main am: 1a7d900c78 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3272004

Change-Id: Iad9fd40b59238e98dac28d332bcfd521a328c9fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-23 17:54:26 +00:00
Yu Liu
480c0e5af9 Add an incremental parity test. 
This is to ensure the incremental enabled clean
build generates the equivalent ninja statements
as the normal build.

Bug: 358428180
Test: Run the test locally.
Change-Id: I2ecbffb125eced73bd59b63da8ad2a9504ae7cb8
 2024-09-23 17:34:15 +00:00
Jihoon Kang
1a7d900c78 Merge changes Ica0cb5a5,If432cdc6,Idb4b0b0a into main 
* changes:
  Revert^2 "Remove java_sdk_library "magic""
  Revert^2 "Restrict java_sdk_library in libs of java_import and droidstubs modules"
  Revert^2 "Restrict java_sdk_library in libs"
 2024-09-23 17:09:43 +00:00
Android Build Coastguard Worker
dd256788d5 Snap for 12399051 from 2625680b50 to 24Q4-release 
Change-Id: Ic490c7acf4db3d2aa94ce4e7935141e26d453d97
 2024-09-21 21:00:35 +00:00
Android Build Coastguard Worker
ea7965f1fd Snap for 12397640 from ca9aa38b45 to 24Q4-release 
Change-Id: I34a2926e933dbb0383efcdf59ee3825f1144c11e
 2024-09-21 01:00:47 +00:00
Spandan Das
52c01a1897 Remove internal deapexer module 
The build ations will be created by the top-level apex.

Details
1. In GenerateAndroidBuildActions, do a graph walk to determine if the
   apex has exported deps.
2. If there are exported deps, call the newly introduced `deapex`
   function. This registers the build rules and returns a DeapexerInfo
object. This was previously provided by the internal deapexer
dependency.
3. Update `dexpreoptSystemServerJars and `provideApexExportsInfo` to use
   the DeapexerInfo object from (2).

A lot of unit tests that relied on the legacy mechanism of deapexing
have been updated.

Test: go test ./apex
Test: lunch cf_x86_64_phone-next-userdebug (uses mainline prebuilts)
Test: verified no diff in file_list.txt
Bug: 368337090
Change-Id: I0edb681beccac4d2a9ceb73f9a506c081a8a96e0
 2024-09-20 23:47:36 +00:00
Spandan Das
a326b320ab Remove deapex support from java_*_import 
prebuilt_apex/apex_set currently supports its deapexed contents to be
returned via a sibling java_import/java_sdk_import module. This is
necesssary for
1. dexpreopt/hiddenapi processing
2. usage as shared library

(1) is no longer necessary. this information is provided by the
top-level prebuilt apexes now

(2) is no longer possible since `exported_java_libs` has been removed in
https://r.android.com/3272110

This CL uses a hack for java_sdk_library_improt. Even though (1) is
provided by the top-level apex, there are still some places where
dexpreopt/hiddenapi processing visits the import modules. This CL uses
a bogus path to make analysis work. If this bogus path gets used, there
will be an error during ninja execution

Test: go test ./apex
Test: in internal lunch cf_x86_64_phone-next-userdebug (uses mainline
prebuilts)
Test: verified that file_list.txt is same
Bug: 368337090

Change-Id: I0ea2327f648f0fc60e337b232f7265e140772ffd
 2024-09-20 23:33:09 +00:00
Treehugger Robot
2625680b50 Merge "Fix m ndk." into main am: 29c267af2d am: a26b69332a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3273172

Change-Id: I6294466d531fffb8437ebc2f6e152b7b5c0f8300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-20 23:28:28 +00:00
Treehugger Robot
a26b69332a Merge "Fix m ndk." into main am: 29c267af2d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3273172

Change-Id: I4c8105aebcc6f1a33bcf6a8d018f132b19f8e723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-20 23:05:08 +00:00
Treehugger Robot
29c267af2d Merge "Fix m ndk." into main 2024-09-20 22:25:31 +00:00
Jihoon Kang
da923b0ae3 Revert^2 "Remove java_sdk_library "magic"" 
This change removes the java_sdk_library to submodule calculus logic,
i.e. the "magic". The "magic" is no longer being used, as all existing
usages have been fixed to specify the submodule that it actually depends
on.

Test: m nothing --no-skip-soong-tests
Bug: 368144555
Change-Id: Ica0cb5a51d7a8192c2402c0c50ac35cb0b4df0a2
 2024-09-20 21:57:19 +00:00
Jihoon Kang
c4db1092a8 Revert^2 "Restrict java_sdk_library in libs of java_import and droidstubs modules" 
These are all remaining usages of "magic", which are being removed with
this change. The follow up change will remove the "magic".

Test: m nothing --no-skip-soong-tests
Bug: 366069293
Change-Id: If432cdc6621ac00564e14acbaefca53db1723686
 2024-09-20 21:56:08 +00:00
Jihoon Kang
28c9657e24 Revert^2 "Restrict java_sdk_library in libs" 
Instead, the module should specify the submodule it actually depends on.
This is a prereq change to removing the java_sdk_library "magic"

Test: m nothing --no-skip-soong-tests
Bug: 366069293
Change-Id: Idb4b0b0a953f5391c24e50294c940522b73c34f2
 2024-09-20 21:55:23 +00:00
Krzysztof Kosiński
ca9aa38b45 Merge "Add ARMv9.2-A support for Rust." into main am: 877a59e2eb am: f18d9c2abe 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3272516

Change-Id: I24e91c407ad2cc2c856f35d24c304bb6dc01855b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-20 20:01:47 +00:00
Krzysztof Kosiński
f18d9c2abe Merge "Add ARMv9.2-A support for Rust." into main am: 877a59e2eb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3272516

Change-Id: Ic9a5b6bc86c67e43fd2f62b78943f663e316d1b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-20 19:48:25 +00:00
Krzysztof Kosiński
877a59e2eb Merge "Add ARMv9.2-A support for Rust." into main 2024-09-20 19:06:43 +00:00
Wei Li
e05167ee8f Merge "Revert "Revert "Add new module type notice_xml which is used to ..."" into main am: 6eff4e34f4 am: 1aeedb0d51 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3273292

Change-Id: I77a90822717c9c6ef03f3001468aed114f80bcc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-20 18:30:36 +00:00
Wei Li
1aeedb0d51 Merge "Revert "Revert "Add new module type notice_xml which is used to ..."" into main am: 6eff4e34f4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3273292

Change-Id: I86a6c9fc3c1747db7ae8739297908180c3fe1243
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-20 18:12:32 +00:00
Jihoon Kang
8ee926b246 Merge changes from topic "revert-3271699-IARRNEVQHI" into main am: 6c0a5d9d30 am: a8ecee9f76 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3273159

Change-Id: I1a3f3dbe9d4c5165d7e0e746054d03e203893838
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-20 18:10:51 +00:00
Liana Kazanova
90819c7145 Revert "Remove java_sdk_library "magic"" am: 4340863ed9 am: 32eaaaacf2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3273158

Change-Id: I87b6875323e2069b4d3ff6b8f73beb0aa631e6dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-20 18:10:47 +00:00
Jihoon Kang
6c400b85b0 Merge "Revert "Restrict java_sdk_library in libs"" into main am: 46e0613992 am: 96960c9be0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3273157

Change-Id: I1d2d92a11e7d503ff5ac8f0a2b924d3e43a2ed98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-20 18:10:39 +00:00
Wei Li
6eff4e34f4 Merge "Revert "Revert "Add new module type notice_xml which is used to ..."" into main 2024-09-20 18:03:06 +00:00
Jihoon Kang
a8ecee9f76 Merge changes from topic "revert-3271699-IARRNEVQHI" into main am: 6c0a5d9d30 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3273159

Change-Id: I9ccae7ddcdd3d03291808b870b3f9339f0a1ecec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-20 17:37:08 +00:00
Liana Kazanova
32eaaaacf2 Revert "Remove java_sdk_library "magic"" am: 4340863ed9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3273158

Change-Id: I547d5b1e511a846a8444bac8817e12109ea1b7d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-20 17:37:03 +00:00
Jihoon Kang
96960c9be0 Merge "Revert "Restrict java_sdk_library in libs"" into main am: 46e0613992 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3273157

Change-Id: I74574aea562352152a401d3efcbbb0e031dfdabf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-20 17:36:56 +00:00
Jihoon Kang
6c0a5d9d30 Merge changes from topic "revert-3271699-IARRNEVQHI" into main 
* changes:
  Revert "Restrict java_sdk_library in libs of java_import and dro..."
  Revert "Remove java_sdk_library "magic""
 2024-09-20 17:17:32 +00:00
Jihoon Kang
46e0613992 Merge "Revert "Restrict java_sdk_library in libs"" into main 2024-09-20 17:17:32 +00:00
Liana Kazanova
4340863ed9 Revert "Remove java_sdk_library "magic"" 
Revert submission 3271699

Reason for revert: DroidMonitor: Potential culprit for http://b/368606825 - verifying through ABTD before submission. 

Reverted changes: /q/submissionid:3271699

Change-Id: If40f7956e699246cf1d72ffc50ffffa4696504df
 2024-09-20 17:09:21 +00:00
Liana Kazanova
6a32dfdb86 Revert "Restrict java_sdk_library in libs of java_import and dro..." 
Revert submission 3271699

Reason for revert: DroidMonitor: Potential culprit for http://b/368606825 - verifying through ABTD before submission. 

Reverted changes: /q/submissionid:3271699

Change-Id: I65f0e10eb775fd08dd958b699ce1191da7ce0669
 2024-09-20 17:09:21 +00:00
Jihoon Kang
33cbd37c00 Revert "Restrict java_sdk_library in libs" 
This reverts commit 125efc6c30.

Reason for revert: b/368606825

Change-Id: Ia24f637db202f24be2ee13c7fe78e19a69576ffa
 2024-09-20 17:09:09 +00:00