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
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
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
Treehugger Robot
1524fe1e61
Merge changes I653bd734,I4762682c into main am: 96f04689a9
am: 534c5c4dfd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3271699
Change-Id: I087d472c5b9078b495248a2a05272b9caf45a40e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-20 16:39:32 +00:00
Treehugger Robot
d2451a705e
Merge "Restrict java_sdk_library in libs" into main am: 37b288262e
am: e62209b025
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3261983
Change-Id: I7d61ad2c765bea828f094feda856736ab6e8d9bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-20 16:39:11 +00:00
Treehugger Robot
534c5c4dfd
Merge changes I653bd734,I4762682c into main am: 96f04689a9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3271699
Change-Id: I5d2c3339c9381407ced90d0fdcd7661ca026e647
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-20 15:44:41 +00:00
Treehugger Robot
e62209b025
Merge "Restrict java_sdk_library in libs" into main am: 37b288262e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3261983
Change-Id: I9f5dd3a94e75ec742bab4684e2ea30bc666f1c4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-20 15:44:24 +00:00
Treehugger Robot
96f04689a9
Merge changes I653bd734,I4762682c into main
...
* changes:
Remove java_sdk_library "magic"
Restrict java_sdk_library in libs of java_import and droidstubs modules
2024-09-20 15:23:12 +00:00
Treehugger Robot
37b288262e
Merge "Restrict java_sdk_library in libs" into main
2024-09-20 15:23:12 +00:00
Inseob Kim
4dfcda17d4
Merge "Make init_rc property configurable" into main am: b33154033a
am: a75c89fb81
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3266331
Change-Id: I137376f29caa4acf60064f99e48ab5d79dc5868f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-20 08:54:18 +00:00
Inseob Kim
a75c89fb81
Merge "Make init_rc property configurable" into main am: b33154033a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3266331
Change-Id: I232c85e9d7a414b2047e8aa2ad9374f5f03d8d45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-20 08:35:41 +00:00
Inseob Kim
b33154033a
Merge "Make init_rc property configurable" into main
2024-09-20 08:01:57 +00:00
Treehugger Robot
b3f386837b
Merge "Fixes host_required_modules for test_module_config" into main am: f771470d8c
am: 548cecc0de
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3274732
Change-Id: I36f4e794a535ed35f26a968407df701017236ed6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-20 03:11:15 +00:00
Treehugger Robot
548cecc0de
Merge "Fixes host_required_modules for test_module_config" into main am: f771470d8c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3274732
Change-Id: Ic7397d392f3a0698020940de30155aef25c456d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-20 02:44:52 +00:00
Treehugger Robot
f771470d8c
Merge "Fixes host_required_modules for test_module_config" into main
2024-09-20 02:29:51 +00:00
Ronald Braunstein
5c647d8d97
Fixes host_required_modules for test_module_config
...
We weren't emitting the needed .mk variable for host_required modules.
Test: atest -c CtsLibcoreTestCases_dalvik_system
Test: CtsBackupTestCases_cts_permissiontest
Bug: b/368357047
Change-Id: I6ed7bd6d64dba0ed93f3eead74752911f63276b2
2024-09-19 23:20:23 +00:00
Yu Liu
df603135e1
Add some log to the build action caching test. am: d37ccb7765
am: 24be7e0d98
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3273574
Change-Id: I941c9f7fcde73718998c79541afec360dbc7362a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-19 23:05:59 +00:00
Yu Liu
24be7e0d98
Add some log to the build action caching test. am: d37ccb7765
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3273574
Change-Id: I030b7b6afacca34e4d39f15f540f0520bf60db95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-19 22:42:07 +00:00
Yu Liu
d37ccb7765
Add some log to the build action caching test.
...
Bug: 358428180
Test: Run the test locally.
Change-Id: I74c941381956b149a9595c69cbfe2ba7ec402cca
2024-09-19 22:16:27 +00:00
Jihoon Kang
25dc02902a
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: I653bd734959c3366a40f003274c921b012be24ca
2024-09-19 21:45:01 +00:00