Commit Graph

9816 Commits

Author SHA1 Message Date
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
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
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
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
Treehugger Robot
287ec55da0 Merge "make aconfig_storage_file.test.java use library from framework" into main am: afede373c0
Original change: https://android-review.googlesource.com/c/platform/build/+/3194522

Change-Id: I68b7842830db8b8e33ec4297643e95af69d1ee51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-26 00:22:14 +00:00
Zhi Dou
d6b37c1be7 make aconfig_storage_file.test.java use library from framework
Test: atest aconfig_storage_file.test.java
Bug: 349874828
Change-Id: If6fbf086e889a2c0068a1ca22979db39f5d86448
2024-07-25 19:30:13 +00:00
Treehugger Robot
62e9495c69 Merge "add hide and unsupportedadppusage annotation to read library" into main am: 33e9bc04c2 am: addcc154ad
Original change: https://android-review.googlesource.com/c/platform/build/+/3194521

Change-Id: I5bcb521d8a1f482976b8c8cebb2e2196a305fda8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 19:14:42 +00:00
Treehugger Robot
addcc154ad Merge "add hide and unsupportedadppusage annotation to read library" into main am: 33e9bc04c2
Original change: https://android-review.googlesource.com/c/platform/build/+/3194521

Change-Id: Ie73f9ee1c657ab4f6dba44d2d3dfa4f6c6f47867
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 18:56:21 +00:00
Zhi Dou
fa988f0a34 add hide and unsupportedadppusage annotation to read library
Test: presubmit
Bug: 349874828
Change-Id: I5b808d87fe7df2ba8a85c8c75ee7baa66ff22d6b
2024-07-25 16:56:48 +00:00
Ted Bauer
8217e5c53a Show staged flags in new storage
Bug: 324436145
Test: m
Change-Id: Ic42567f9d5b15889106c479122e1aa94cc7578aa
Ignore-AOSP-First: will CP to AOSP afterwards
2024-07-25 14:44:21 +00:00
Wei Li
a3265ef0a1 Add new SBOM generation tool.
Bug: 324465531
Test: CIs
Test: m soong-sbom
Change-Id: Icfb7a9062158853b85c2de95f678ab164fc3fd90
2024-07-24 22:32:38 -07:00
Ted Bauer
1c1a2aee7f Read new storage socket in aflags
Bug: 324436145
Test: m
Change-Id: Ifc9d37bff8a248b3bb72c1815746d873f4a619e8
Flag: EXEMPT test only
Ignore-AOSP-First: will CP into AOSP after merge
2024-07-24 22:25:30 +00:00
Zhi Dou
7c3c40d964 Merge "make java reader library availiable for mainline" into main am: 8a9a52d140 am: 9cb3450ee4
Original change: https://android-review.googlesource.com/c/platform/build/+/3185681

Change-Id: If427d3d6941dc7e9be7dde239c5496ac98047747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-22 14:57:52 +00:00
Zhi Dou
9cb3450ee4 Merge "make java reader library availiable for mainline" into main am: 8a9a52d140
Original change: https://android-review.googlesource.com/c/platform/build/+/3185681

Change-Id: I924cb6bdb8649f512dae9be8d33104c89f748ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-22 14:20:59 +00:00
Zhi Dou
8a9a52d140 Merge "make java reader library availiable for mainline" into main 2024-07-22 13:59:28 +00:00
Treehugger Robot
0e469fa24c Merge "only use new storage for read write" into main am: 088443385f am: 687e1fcf6e
Original change: https://android-review.googlesource.com/c/platform/build/+/3184560

Change-Id: Ice68312558ee063b36cede81014abbaad11b08ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-19 22:15:19 +00:00
Treehugger Robot
687e1fcf6e Merge "only use new storage for read write" into main am: 088443385f
Original change: https://android-review.googlesource.com/c/platform/build/+/3184560

Change-Id: I25fc5c20a4e3fab97db3c68f7ca06d9903762434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-19 21:55:27 +00:00
Zhi Dou
b88c3e638b make java reader library availiable for mainline
Test: atest aconfig.test.java
Bug: 349874828
Change-Id: I2cabfa9665e5c474ba64f5969e96e9dae2fdcb9b
2024-07-19 21:01:27 +00:00
Zhi Dou
1edd4485c6 only use new storage for read write
Test: atest aconfig.test.java
Bug: 349874828
Change-Id: I5af9fa6243b8b8a157f03242e6e5a411ced7be44
2024-07-19 20:37:53 +00:00
Treehugger Robot
eae2cc5398 Merge "Return storage value in native codegen" into main 2024-07-19 16:16:32 +00:00
Treehugger Robot
0ec4ee445f Merge "Return legacy value if error in new storage" into main 2024-07-19 16:16:31 +00:00
Ted Bauer
26c29adc67 Return legacy value if error in new storage
Bug: 312235596
Test: m
Change-Id: I46f670e565a2133e0e5eb2c157eb21a12a5ae7aa
Ignore-AOSP-First: will test internally first then CP to AOSP
2024-07-19 15:19:33 +00:00
Ted Bauer
5c0b219720 Return storage value in native codegen
Bug: 301491148
Test: m
Change-Id: I469935cf60093a74a929fb56728fb8a71c05c3ba
Ignore-AOSP-First: will test internally first then CP to AOSP
2024-07-19 15:18:36 +00:00
Treehugger Robot
08d6c020b3 Merge "feat: show if flag is locally overridden" into main am: ca4c83efa3 am: 02e0fd0dd8
Original change: https://android-review.googlesource.com/c/platform/build/+/3184779

Change-Id: I7189706fc1f279437be2a77db93c1af34c6adfa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-19 14:50:01 +00:00
Treehugger Robot
02e0fd0dd8 Merge "feat: show if flag is locally overridden" into main am: ca4c83efa3
Original change: https://android-review.googlesource.com/c/platform/build/+/3184779

Change-Id: I7cf90b90cbad26b83dd1d40aa939f78c10a9287c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-19 14:33:03 +00:00
Ted Bauer
05fea28d9c feat: show if flag is locally overridden
Bug: 324436145
Test: adb shell aflags list
Change-Id: Id239a760e86e469f77d1e99f7a6f27d54cb87206
2024-07-19 13:11:42 +00:00
Ted Bauer
f24bacf3fd Merge "Read from new storage in aflags" into main am: 7e272b8bba am: 5b8786429a
Original change: https://android-review.googlesource.com/c/platform/build/+/3180106

Change-Id: Ifd9c96986d2c1bdbd5ae4736374944a1e314874d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-18 14:08:55 +00:00
Ted Bauer
5b8786429a Merge "Read from new storage in aflags" into main am: 7e272b8bba
Original change: https://android-review.googlesource.com/c/platform/build/+/3180106

Change-Id: Ic0446f5b58a8cd7278d7555c396d679f396a8bbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-18 13:48:38 +00:00
Ted Bauer
7e272b8bba Merge "Read from new storage in aflags" into main 2024-07-18 13:32:59 +00:00
Ted Bauer
bbbe092496 Read from new storage in aflags
Bug: 324436145
Test: adb shell aflags list --use-new-storage
Change-Id: Ib615e25bc0bc7f2b0362e286a45ce40ebf21f92d
2024-07-17 18:39:25 +00:00