StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,057 Commits 1 Branch 0 Tags
b51df30f567c0df19d0c4b4118c4a7390a19e110
Commit Graph

9880 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
Kiyoung Kim
02f95cfee5 Update allowlist based on internal system image 
Allowlist of system image diff is generated based on the AOSP main, but this is not sufficient for internal main as it contains more items in the aosp_cf_x86_64_phone system image. This change adds more items in diff so aosp_cf_x86_64_phone build won't break from system image diff.

Bug: 346873717
Change-Id: Ic867ce1eb3f415976d37d91a201ebac0b45f0f1e
Test: aosp_cf_x86_64_phone build succeeded
Ignore-AOSP-First: Internal only feature
(cherry picked from commit 7d04b4d978)
 2024-07-19 07:26:06 +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
Treehugger Robot
31df911b46 Merge "Use CallableItem in place of MethodItem" into main am: 09bd57d0f1 
Original change: https://android-review.googlesource.com/c/platform/build/+/3176259

Change-Id: Ibbfa5000bed6786e71ac4d47bfda146b20064434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-16 14:23:20 +00:00
Paul Duffin
9acbefe223 Use CallableItem in place of MethodItem 
The `MethodItem` type represents both a normal method as well as being
the super type of `ConstructorItem`. That organization causes a number
of issues in Metalava and has lead to quite a few issues where code
that only expected to be run on methods and not constructors was run on
both. So, a new type `CallableItem` has been added that will eventually
become the super type of both `MethodItem` and `ConstructorItem` and
`ConstructorItem` will no longer extend `MethodItem`.

This change prepares this code for that change by overriding
`visitCallable(CallableItem)` instead of `visitMethod(MethodItem)`
because the latter is only called for methods not constructors.

Bug: 352481366
Test: atest check-flagged-apis-test
Change-Id: I3039bc0154b00ca57cb48c7447c5901b991b57e5
 2024-07-16 13:37:30 +01:00
Inseob Kim
c9180bff8d Add files installed to root to diff allowlist am: 1f3f321967 
Original change: https://android-review.googlesource.com/c/platform/build/+/3163174

Change-Id: Ic64c5373fb15662f31b3e283d8749608fa8533f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-16 05:11:10 +00:00
Inseob Kim
94d502200c Merge changes from topic "cf_system_root_files" into main 
* changes:
  Add option to use Soong defined system image
  Add files installed to root to diff allowlist
 2024-07-16 04:52:08 +00:00
Inseob Kim
1f3f321967 Add files installed to root to diff allowlist 
system.img is built from both $OUT/system and $OUT/root. As the diff
tool doesn't check $OUT/root, this change temporarily adds two files
under root (adb_keys and init.environ.rc) to allowlist. They will be
removed once the diff tool is fixed.

Bug: 351258461
Test: build
Change-Id: I0f24dcae67c72be5619a86f6f025ec8bcb146084
 2024-07-16 03:01:26 +00:00
Treehugger Robot
de49b7e6c4 Merge "Change java codegen to read from new storage" into main am: bce58b3c94 
Original change: https://android-review.googlesource.com/c/platform/build/+/3174140

Change-Id: Ib7fe640a084f692bb10c00ddb49f781dc8947c08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-15 20:13:20 +00:00
Zhi Dou
9f8ed73934 Change java codegen to read from new storage 
This change adds code in java code to read from new storage. However the
generated code won't geneerate code contains code for new storage, since
the build system won't pass `allow-instrumentation` to java codegen.

Test: atest aconfig.test.java
Bug: 349874828
Change-Id: I70983fa97de6633f467d968109d134d46f895a89
 2024-07-15 19:08:33 +00:00
Zhi Dou
e944856ba0 Merge "add storage java reader" into main am: 6f9f7ccfe3 
Original change: https://android-review.googlesource.com/c/platform/build/+/3168961

Change-Id: If1ee86dca35afb6fcc12e8c83b1934582a28176b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-12 14:06:23 +00:00
Zhi Dou
621323cfda add storage java reader 
Test: atest aconfig_storage_read_api.test.java
Bug: 349874828
Change-Id: I4b1d5ccf4d48622a88712b6e8940ffe18e980927
 2024-07-12 13:34:12 +00:00
Priyanka Advani
c92444463b Merge "Revert "add storage java internal reader"" into main am: bb9f03efbe 
Original change: https://android-review.googlesource.com/c/platform/build/+/3168856

Change-Id: If3cf11fa94bcfeb70fa3c30442b0ba72406be48f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-11 20:36:14 +00:00
Priyanka Advani
16c8d3c47a Revert "add storage java internal reader" 
This reverts commit 70b9ac0ddd.

Reason for revert: Droidmonitor created revert due to build breakages in b/352582602.

Change-Id: I8a8e38ccf3e715e9b4746ac333aed0cc13d11969
 2024-07-11 19:59:24 +00:00
Zhi Dou
f9c1b73113 Merge "add storage java internal reader" into main am: 657d68aee4 
Original change: https://android-review.googlesource.com/c/platform/build/+/3168136

Change-Id: I742f761e6722b49c0278960a8b6705cc8becf75e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-11 19:24:45 +00:00
Zhi Dou
70b9ac0ddd add storage java internal reader 
Test: n/a
Bug: n/a
Change-Id: I852ab4080bee9240549dc4be0c09dbe1f72d06b0
 2024-07-11 18:50:46 +00:00
Treehugger Robot
68249a141d Merge "fix: make device paths function static" into main am: 0d18be30ae 
Original change: https://android-review.googlesource.com/c/platform/build/+/3164421

Change-Id: I7fd3e74a9cd1923ee449a41f584fc7be65df718e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-11 14:07:50 +00:00
Treehugger Robot
0d18be30ae Merge "fix: make device paths function static" into main 2024-07-11 13:48:51 +00:00
Treehugger Robot
0a1b4dfdaf Merge "Implement storage files in Java" into main am: 33118a7e83 
Original change: https://android-review.googlesource.com/c/platform/build/+/3165076

Change-Id: I07259027a8305e11d7bb00cfe1d88d5c9e435c55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-10 23:47:51 +00:00
Treehugger Robot
33118a7e83 Merge "Implement storage files in Java" into main 2024-07-10 23:28:37 +00:00