Commit Graph

9842 Commits

Author SHA1 Message Date
Ted Bauer
9f6335e99e Merge "Return new storage value when flag enabled" into main 2024-08-06 14:12:09 +00:00
Ted Bauer
1a8d84dd1e Return new storage value when flag enabled
Bug: 312235596
Test: m
Change-Id: I42a8bc5389f973a2d9878deec6ee7ec186f82edf
Ignore-AOSP-First: CP afterwards
2024-08-05 21:19:45 +00:00
Ted Bauer
90ad448752 Make aflags put instead of override
Change-Id: I0a09a661f8d75c5d1540313341a1cf3f704e5020
Test: m
Bug: 324436145
Flag: EXEMPT test only
Ignore-AOSP-First: CP to AOSP afterwards
2024-08-05 19:22:56 +00:00
Zhi Dou
e501cac6c8 Merge "change fileinputstream to filechannel" into main am: b7bb53d392 am: 23b0cba8d6
Original change: https://android-review.googlesource.com/c/platform/build/+/3205700

Change-Id: I5f736f7952dd791bc2a330ef6a0b56917a7d8987
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-05 14:47:56 +00:00
Zhi Dou
23b0cba8d6 Merge "change fileinputstream to filechannel" into main am: b7bb53d392
Original change: https://android-review.googlesource.com/c/platform/build/+/3205700

Change-Id: I6dc7fada9780a822d2b9ad891bbe0f0f6abd1736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-05 14:10:49 +00:00
Zhi Dou
8af83ccd50 change fileinputstream to filechannel
The restrict mode doesn't allow to have disk read from main thread. Some
apps enabled this check. The code in the dependencies of the
fileinputstream. This chagne switch to filechannel.

Test: presubmit
Bug: 356614910
Change-Id: Icf2175fe75ed1bfad4a048ead680b08e57d6c2ca
2024-08-03 00:08:40 +00:00
Yurii Zubrytskyi
57d04ed9b7 Merge "Revert^2 "Fix signing failure for split APKs"" into main am: 7575d3f967 am: 5dbc1b979b
Original change: https://android-review.googlesource.com/c/platform/build/+/3204750

Change-Id: I73b986872e3a1b41b270c7fa6ecc683ead97bd6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-01 16:38:51 +00:00
Yurii Zubrytskyi
5dbc1b979b Merge "Revert^2 "Fix signing failure for split APKs"" into main am: 7575d3f967
Original change: https://android-review.googlesource.com/c/platform/build/+/3204750

Change-Id: Ib6dc29beb720575c55a4bd4eb39f24129d03f027
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-01 16:19:04 +00:00
Yurii Zubrytskyi
7575d3f967 Merge "Revert^2 "Fix signing failure for split APKs"" into main 2024-08-01 15:59:31 +00:00
ELIYAZ MOMIN
10e47e3723 Revert^2 "Fix signing failure for split APKs"
This reverts commit d06e5a83ba.

Reason for revert: <It's not a culprit any more.>

Change-Id: I405c418e6da88774b174fcb3508eb54039fbdf8e
2024-08-01 15:43:31 +00:00
Treehugger Robot
2f6d49807b Merge "Added a basic prober script to test code completion." into main am: 80a07d6870 am: 6a134d85dc
Original change: https://android-review.googlesource.com/c/platform/build/+/3184559

Change-Id: I9ace7afe65396811a4e9035fe3cb54f3400cdb3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-01 12:38:40 +00:00
Treehugger Robot
6a134d85dc Merge "Added a basic prober script to test code completion." into main am: 80a07d6870
Original change: https://android-review.googlesource.com/c/platform/build/+/3184559

Change-Id: Ia8ef73d1f8e3757de3d4cf057ef9631d5189b7d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-01 12:20:36 +00:00
Treehugger Robot
80a07d6870 Merge "Added a basic prober script to test code completion." into main 2024-08-01 12:00:01 +00:00
ELIYAZ MOMIN
b4db6c6023 Merge "Revert "Fix signing failure for split APKs"" into main am: 8a3f6256fc am: c3b0167348
Original change: https://android-review.googlesource.com/c/platform/build/+/3203851

Change-Id: Ic1e103af9dc75d13211438cdf94b979f00e02a06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-01 11:13:28 +00:00
ELIYAZ MOMIN
c3b0167348 Merge "Revert "Fix signing failure for split APKs"" into main am: 8a3f6256fc
Original change: https://android-review.googlesource.com/c/platform/build/+/3203851

Change-Id: I34d192280b3d3761dcb587675533e8bd141f32b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-01 10:48:36 +00:00
ELIYAZ MOMIN
8a3f6256fc Merge "Revert "Fix signing failure for split APKs"" into main 2024-08-01 10:19:11 +00:00
Ilshat Aliyev
8e13493d4d Added a basic prober script to test code completion.
Run tests locally

Change-Id: Id8b8b6b4d9b1fae9d7cd5f04a20c239628351b16
2024-08-01 08:11:45 +00:00
Pechetty Sravani (xWF)
d06e5a83ba Revert "Fix signing failure for split APKs"
This reverts commit 6871779d9b.

Reason for revert: Potential culprit for b/356752725- verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: I4c29b27f0318901130036dbe8ab9edef37f08875
2024-08-01 05:54:13 +00:00
Treehugger Robot
b05918dd22 Merge "Fix signing failure for split APKs" into main am: 787d933f87 am: 53d9852f35
Original change: https://android-review.googlesource.com/c/platform/build/+/3202232

Change-Id: Ic905f80fdc8d4af2b5ccacb8a1a274002102882e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-31 21:27:10 +00:00
Treehugger Robot
53d9852f35 Merge "Fix signing failure for split APKs" into main am: 787d933f87
Original change: https://android-review.googlesource.com/c/platform/build/+/3202232

Change-Id: Ia9832e2218b9b8518435d9c289512f337d6e93bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-31 21:10:02 +00:00
Treehugger Robot
787d933f87 Merge "Fix signing failure for split APKs" into main 2024-07-31 21:06:37 +00:00
Kelvin Zhang
6871779d9b Fix signing failure for split APKs
Test: th
Bug: 353837347
Change-Id: Ifed9746c1e1d053a97860de3bab4380d6e207412
2024-07-31 10:36:47 -07:00
Zhi Dou
e366206c02 Merge "aconfig: make java cached indicator volatile" into main am: 3d960c5638 am: 5a464e039d
Original change: https://android-review.googlesource.com/c/platform/build/+/3199672

Change-Id: I7e37b2a9458b1088c3b883769efcc1aee5df245b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-31 00:06:24 +00:00
Zhi Dou
b7f3c9e51e Merge "close file stream" into main am: 39020e05c6 am: f409df4939
Original change: https://android-review.googlesource.com/c/platform/build/+/3199474

Change-Id: Ie128a1ba09440ea08e1031caaa625d76999f68ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-31 00:06:11 +00:00
Zhi Dou
5a464e039d Merge "aconfig: make java cached indicator volatile" into main am: 3d960c5638
Original change: https://android-review.googlesource.com/c/platform/build/+/3199672

Change-Id: I476b8e6ee613342e6a03b85771bc3aaebb98ef9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-30 23:51:45 +00:00
Zhi Dou
f409df4939 Merge "close file stream" into main am: 39020e05c6
Original change: https://android-review.googlesource.com/c/platform/build/+/3199474

Change-Id: I8c40d1a77546c28e1ece9f5ae45e29ce6eb1a034
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-30 23:51:32 +00:00
Zhi Dou
3d960c5638 Merge "aconfig: make java cached indicator volatile" into main 2024-07-30 23:35:45 +00:00
Zhi Dou
97d02148b9 close file stream
Close file stream, since the in the restrict mode the runtime will check
whether all the resource is closed when it is out of scope.

Test: ABTD ImsStackJavaTests
Bug: 349874828
Change-Id: Ib297622bae730bf99e4d5d1b3adeff3fee805a93
2024-07-30 19:05:14 +00:00
Zhi Dou
36589bc318 aconfig: make java cached indicator volatile
Test: atest aconfig.test.java
Bug: 356201402
Change-Id: I1127a4092536fe199f4a7256dea0c2b289e837da
2024-07-30 18:21:43 +00:00
Zhi Dou
d7b41af5f6 Merge "read new stoarge based on flag value" into main am: 5228a6f4a2 am: 272a5a37b8
Original change: https://android-review.googlesource.com/c/platform/build/+/3194636

Change-Id: I27141d3c51c84b1cdd647c0764f043b3920460aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-29 14:18:11 +00:00
Treehugger Robot
7b7d4c4ade Merge "use smart pointer for fd" into main am: 78decbf865 am: e4ba11c98d
Original change: https://android-review.googlesource.com/c/platform/build/+/3195552

Change-Id: Ib2d9fe2b2ca18c31440727a500feea6b2cf0d923
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-29 14:17:52 +00:00
Zhi Dou
272a5a37b8 Merge "read new stoarge based on flag value" into main am: 5228a6f4a2
Original change: https://android-review.googlesource.com/c/platform/build/+/3194636

Change-Id: I4e18affd02bda662c7b35c04696cd462c7fb7e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-29 13:55:00 +00:00
Treehugger Robot
e4ba11c98d Merge "use smart pointer for fd" into main am: 78decbf865
Original change: https://android-review.googlesource.com/c/platform/build/+/3195552

Change-Id: I2456f7cae1669c634804b73bc78a152d3df6d880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-29 13:54:43 +00:00
Zhi Dou
5228a6f4a2 Merge "read new stoarge based on flag value" into main 2024-07-29 13:26:35 +00:00
Treehugger Robot
cbe0d0419f Merge "Update vintf finalization script" into main 2024-07-27 03:22:34 +00:00
Zhi Dou
66ff40c08a read new stoarge based on flag value
This change changes the logic to read the flag value from new storage.
Before it check the existence of a file. Not it will directly check the
flag value from DeviceConfig.

Test: m and presubmit
Bug: 349874828
Change-Id: I4a360564a3b48564057eede9bd893899136b3221
2024-07-26 22:46:47 +00:00
Zhi Dou
8add8e0c9b use smart pointer for fd
Test: presubmit
Bug: 348693143
Change-Id: Ibdb1e132a4840d0c3d82aa5f7546a0fc5f5f528b
2024-07-26 22:25:43 +00:00
Treehugger Robot
bef8523ff3 Merge "Don't read flag value file when storage disabled" into main 2024-07-26 20:59:36 +00:00
Ted Bauer
1aec18dd3e Don't read flag value file when storage disabled
Test: m
Bug: 350980453
Change-Id: Ibdf75a8bb310e89f247a176fc5b0b9236af3705c
Ignore-AOSP-First: will CP to AOSP afterwards
2024-07-26 19:23:19 +00:00
Treehugger Robot
e1f142d93a Merge "Show container in list command" into main 2024-07-26 16:48:13 +00:00
Zhi Dou
42a9df9e34 Merge "add sdk none version for core lib usage" into main am: 8c6ec5a33d am: e33e91c85c
Original change: https://android-review.googlesource.com/c/platform/build/+/3197450

Change-Id: I75f3d63aa4c555e76e81420465a952cc252cb47d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-26 16:09:26 +00:00
Zhi Dou
e33e91c85c Merge "add sdk none version for core lib usage" into main am: 8c6ec5a33d
Original change: https://android-review.googlesource.com/c/platform/build/+/3197450

Change-Id: I8e793418263fa35a94a30f14f922a3c0b5e6ee4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-26 15:51:35 +00:00
Ted Bauer
11c5a8a877 Show container in list command
Bug: 324436145
Test: m
Change-Id: If50fb678330bac11d9bf99478986cfbbe5015852
Ignore-AOSP-First: will CP after merge
Flag: EXEMPT test only
2024-07-26 15:10:50 +00:00
Ted Bauer
ceea7bd4d7 Merge "Show staged flags in new storage" into main 2024-07-26 14:48:49 +00:00
Zhi Dou
0e5e128034 add sdk none version for core lib usage
Test: m
Bug: 349874828
Change-Id: I412bcf06ca38c862b026715a6a394350eda49b64
2024-07-26 14:03:50 +00:00
Justin Yun
7fc38029ec Update vintf finalization script
Run vintf finalization if the target configuration does not set
RELEASE_BOARD_API_LEVEL_FROZEN to 'true'; and FINAL_BOARD_API_LEVEL
which is the version to finalize is the same with the
RELEASE_BOARD_API_LEVEL which is the version that the current tree is
building.

Also define build-step-0-and-m.sh that runs a test build after the
vintf finalization process.

Ignore-AOSP-First: finalization script is an exception
Bug: 331696132
Test: tools/finalization/build-step-0-and-m.sh
Change-Id: I22b9096d57c935e64c4d28f16b95afaa84b79465
2024-07-26 11:09:09 +09:00
Wei Li
35a9f0e4ce Merge "Add new SBOM generation tool." into main am: 31964df630 am: 61f3fbd2c2
Original change: https://android-review.googlesource.com/c/platform/build/+/2956675

Change-Id: I2e865552bc781943f50eefb979e5be3207572fcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-26 01:22:51 +00:00
Wei Li
61f3fbd2c2 Merge "Add new SBOM generation tool." into main am: 31964df630
Original change: https://android-review.googlesource.com/c/platform/build/+/2956675

Change-Id: I822b077f08a3dbf7bae20f9e1e438fceba51b88e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-26 00:59:56 +00:00
Wei Li
31964df630 Merge "Add new SBOM generation tool." into main 2024-07-26 00:45:43 +00:00
Treehugger Robot
bce8bc2985 Merge "make aconfig_storage_file.test.java use library from framework" into main am: afede373c0 am: 287ec55da0
Original change: https://android-review.googlesource.com/c/platform/build/+/3194522

Change-Id: I53d2ac8df777032f1562413b3e01a42f76cd0e31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-26 00:41:21 +00:00