Commit Graph

96063 Commits

Author SHA1 Message Date
Jooyung Han
d887a8641c Merge "Pass LOCAL_MIN_SDK_VERSION to clang triple" into main am: aaab9b5026 am: c1da098856
Original change: https://android-review.googlesource.com/c/platform/build/+/2896860

Change-Id: I0e208c44c1393bb13459ee9e404539dc7c2b23af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 07:45:43 +00:00
Jooyung Han
c1da098856 Merge "Pass LOCAL_MIN_SDK_VERSION to clang triple" into main am: aaab9b5026
Original change: https://android-review.googlesource.com/c/platform/build/+/2896860

Change-Id: I5fb2b870bec64feb5985501762f0e34eeee06345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 07:14:31 +00:00
Jooyung Han
aaab9b5026 Merge "Pass LOCAL_MIN_SDK_VERSION to clang triple" into main 2024-01-04 06:43:11 +00:00
Treehugger Robot
4e95995374 Merge changes I7953020c,I960cfdb8 into main am: 3f5f02b287 am: 6743a85379 am: 9a13f3a87f
Original change: https://android-review.googlesource.com/c/platform/build/+/2895581

Change-Id: Ie6dc2f84efaea2ac08f1a64ab3de6cceebbb6409
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 02:37:41 +00:00
Jooyung Han
358875fbe6 Pass LOCAL_MIN_SDK_VERSION to clang triple
Like soong modules, pass LOCAL_MIN_SDK_VERSION to clang when it's set.

Bug: 317676192
Test: manual check (set LOCAL_MIN_SDK_VERSION as 34 for wpa_supplicant
  and see if generated build commands has android34)
Change-Id: I48928e54417f47f2e0c2417f04e5893764c3edb9
2024-01-04 10:48:51 +09:00
Treehugger Robot
9a13f3a87f Merge changes I7953020c,I960cfdb8 into main am: 3f5f02b287 am: 6743a85379
Original change: https://android-review.googlesource.com/c/platform/build/+/2895581

Change-Id: I8d31a6dc5f48b3830287270a02e85abae4a4f144
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 01:29:38 +00:00
Treehugger Robot
6743a85379 Merge changes I7953020c,I960cfdb8 into main am: 3f5f02b287
Original change: https://android-review.googlesource.com/c/platform/build/+/2895581

Change-Id: If42947bdadbf3b8937c6d7a3dbee762284cce1e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 00:58:21 +00:00
Treehugger Robot
3f5f02b287 Merge changes I7953020c,I960cfdb8 into main
* changes:
  Skip metrics upload when doing benchmarks.
  Fix formatting string in benchmark pretty printer
2024-01-04 00:28:49 +00:00
Zhi Dou
1280251c0f Merge "aconfig: add ForceReadOnly mode to aconfig c/c++ codegen" into main am: f7c585604a am: d61bea8e74 am: 5c7165e3a3
Original change: https://android-review.googlesource.com/c/platform/build/+/2889146

Change-Id: Ia00a08b8b2ff48e03937b3e8bb5e387d98857b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 00:08:29 +00:00
Zhi Dou
1e3f798257 Merge "aconfig: add ForceReadOnly mode to aconfig rust codegen" into main am: 758cb81194 am: e2fba1e50c am: a23bea38d4
Original change: https://android-review.googlesource.com/c/platform/build/+/2888606

Change-Id: I1e8f84865c37f659335229328a2282aed547c608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 00:08:16 +00:00
Zhi Dou
35f4041179 Merge changes from topic "fro" into main am: f659f75231 am: 209c4fe857 am: 782c090312
Original change: https://android-review.googlesource.com/c/platform/build/+/2888806

Change-Id: I8913c9a03a6ee43db46dd67f923fcc08f29a79b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 00:07:59 +00:00
Zhi Dou
4885c40bf8 aconfig: add new codegen mode force_read_only am: 1a8281ccc2 am: fc11f98b91 am: 7cffcf4029
Original change: https://android-review.googlesource.com/c/platform/build/+/2887246

Change-Id: I9b2f3a19d3d0a1b8c962aeb68c48aa7417515e82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 00:07:53 +00:00
Zhi Dou
5c7165e3a3 Merge "aconfig: add ForceReadOnly mode to aconfig c/c++ codegen" into main am: f7c585604a am: d61bea8e74
Original change: https://android-review.googlesource.com/c/platform/build/+/2889146

Change-Id: Ibcd4004a9d4dd9492e5614bd13b3b63889398f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 23:51:43 +00:00
Zhi Dou
a23bea38d4 Merge "aconfig: add ForceReadOnly mode to aconfig rust codegen" into main am: 758cb81194 am: e2fba1e50c
Original change: https://android-review.googlesource.com/c/platform/build/+/2888606

Change-Id: I66ea57d20cae704af7954694b00c23047a08179e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 23:51:33 +00:00
Zhi Dou
d61bea8e74 Merge "aconfig: add ForceReadOnly mode to aconfig c/c++ codegen" into main am: f7c585604a
Original change: https://android-review.googlesource.com/c/platform/build/+/2889146

Change-Id: I96a5cc662e3857631d5823892f2700f60424c80a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 23:37:25 +00:00
Zhi Dou
e2fba1e50c Merge "aconfig: add ForceReadOnly mode to aconfig rust codegen" into main am: 758cb81194
Original change: https://android-review.googlesource.com/c/platform/build/+/2888606

Change-Id: I0a530392346774afb603f8986e51938b73ac46d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 23:36:53 +00:00
Zhi Dou
782c090312 Merge changes from topic "fro" into main am: f659f75231 am: 209c4fe857
Original change: https://android-review.googlesource.com/c/platform/build/+/2888806

Change-Id: Iceb8ba22c85ee26863ed9d69d40074acbb84056f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 23:35:41 +00:00
Zhi Dou
7cffcf4029 aconfig: add new codegen mode force_read_only am: 1a8281ccc2 am: fc11f98b91
Original change: https://android-review.googlesource.com/c/platform/build/+/2887246

Change-Id: Ifc171a5dfb129c8ba1144897988eeb439e17f24b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 23:35:36 +00:00
Zhi Dou
209c4fe857 Merge changes from topic "fro" into main am: f659f75231
Original change: https://android-review.googlesource.com/c/platform/build/+/2888806

Change-Id: Ia247db98092acdd22e282929740431f33fbdca20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 23:04:58 +00:00
Zhi Dou
fc11f98b91 aconfig: add new codegen mode force_read_only am: 1a8281ccc2
Original change: https://android-review.googlesource.com/c/platform/build/+/2887246

Change-Id: I1ac1abaae11b8dd06212155cf4c64519140cbbc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 23:04:53 +00:00
Zhi Dou
f7c585604a Merge "aconfig: add ForceReadOnly mode to aconfig c/c++ codegen" into main 2024-01-03 23:00:57 +00:00
Zhi Dou
758cb81194 Merge "aconfig: add ForceReadOnly mode to aconfig rust codegen" into main 2024-01-03 23:00:44 +00:00
Zhi Dou
f659f75231 Merge changes from topic "fro" into main
* changes:
  aconfig: add ForceReadOnly mode to aconfig java codegen
  aconfig: add new codegen mode force_read_only
2024-01-03 23:00:34 +00:00
Aditya Choudhary
bc02cdf552 [automerger skipped] Split filepaths on ' ' in metadata generator am: 0be2581e80 -s ours
am skip reason: Merged-In I5063c5a0b93501010b38aea91e8648cf5960ee6e with SHA-1 93cd9f6791 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/25503201

Change-Id: I983a4b9fba24a3a085889c0e06eaccfa49d329dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 21:48:21 +00:00
Aditya Choudhary
65b1d800ba [automerger skipped] Handle empty input file case in Metadata generation am: cf0053ef47 -s ours
am skip reason: Merged-In Ib48e88bdad4c870be3ca955abfd64ee8dd74f85d with SHA-1 70fb37ec11 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/25503200

Change-Id: I79660cd0e2cc528945d97f660110b1c3cc3fc06a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 21:48:14 +00:00
Aditya Choudhary
469d7bd41b [automerger skipped] Refactor metadata tool to support metadata generation for different rules. am: f101d2b7f0 -s ours
am skip reason: Merged-In I881fd76213ec78001f9e12ed2fbc860d1503a364 with SHA-1 a96ce3223a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/25503199

Change-Id: Icb5ec0291b55061ebfd589f57d8138366e223ca5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 21:48:11 +00:00
Aditya Choudhary
1e117f2bc0 [automerger skipped] Add metadata generator tool for test spec metadata generation. am: 16291ef6a6 -s ours
am skip reason: Merged-In I404b57224828149f26bcf4deadb662f513886231 with SHA-1 51f97c1963 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/25503198

Change-Id: I9756091bc7bd287d8622a4dc27165896036e5d90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 21:48:06 +00:00
Joe Onorato
7eba158c59 Skip metrics upload when doing benchmarks.
metrics-uploader runs asynchronously, and causes a race condition where
the out dir can't be deleted because metrics uploader is busy in it.

Has the side effect of not polluting the local developer metrics with
benchmark runs too.

Test: treehugger
Change-Id: I7953020cd9c69fb10745facd22648f931fc94477
2024-01-03 12:38:55 -08:00
Joe Onorato
519c9dab25 Fix formatting string in benchmark pretty printer
Test: th
Change-Id: I960cfdb897ed140b90caa765b1be6892d2ed208e
2024-01-03 12:37:25 -08:00
Colin Cross
b9859d0dd8 Merge "Support Soong-generated module-info.json entries" into main am: 7f91599457 am: 99edf49d08 am: 350450c7a6
Original change: https://android-review.googlesource.com/c/platform/build/+/2881408

Change-Id: Iaf98172011497671efcf457aaf0394dec091dcc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 18:31:03 +00:00
Roland Levillain
61466a0bd2 Merge "Update OWNERS files under build/make." into main am: c9104b3392 am: 0eb8899afd am: ffe3e64257
Original change: https://android-review.googlesource.com/c/platform/build/+/2893703

Change-Id: I18348dacbccc3eb0b08b02e397988f00f3423a4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 18:28:52 +00:00
Colin Cross
350450c7a6 Merge "Support Soong-generated module-info.json entries" into main am: 7f91599457 am: 99edf49d08
Original change: https://android-review.googlesource.com/c/platform/build/+/2881408

Change-Id: I6a53c7c429755797d51c885efbc65bda0fdfe3e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 18:28:45 +00:00
Colin Cross
74f85c731f Merge "Don't install vintf and init.rc from Soong" into main am: 01ede583ea am: 104fbae909 am: 32c2dc8aee
Original change: https://android-review.googlesource.com/c/platform/build/+/2881407

Change-Id: I6257af35f82b076cdd78b9f4731bddcfaac78356
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 18:28:32 +00:00
Colin Cross
99edf49d08 Merge "Support Soong-generated module-info.json entries" into main am: 7f91599457
Original change: https://android-review.googlesource.com/c/platform/build/+/2881408

Change-Id: I6d888246bf6d89a9b9ac0ef9a8835b9ddf3b422a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 18:17:12 +00:00
Roland Levillain
ffe3e64257 Merge "Update OWNERS files under build/make." into main am: c9104b3392 am: 0eb8899afd
Original change: https://android-review.googlesource.com/c/platform/build/+/2893703

Change-Id: I6ead1901d4e37366677d93aef34914b451f5b6fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 18:00:40 +00:00
Colin Cross
32c2dc8aee Merge "Don't install vintf and init.rc from Soong" into main am: 01ede583ea am: 104fbae909
Original change: https://android-review.googlesource.com/c/platform/build/+/2881407

Change-Id: I06d7e34bb17e08ba299202d9766d2d0d14e1f09d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 17:59:10 +00:00
Colin Cross
7f91599457 Merge "Support Soong-generated module-info.json entries" into main 2024-01-03 17:55:47 +00:00
Roland Levillain
0eb8899afd Merge "Update OWNERS files under build/make." into main am: c9104b3392
Original change: https://android-review.googlesource.com/c/platform/build/+/2893703

Change-Id: Icd8893ee6ce7f056c1bef4693c6277d3c8c5c53a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 17:29:16 +00:00
Colin Cross
104fbae909 Merge "Don't install vintf and init.rc from Soong" into main am: 01ede583ea
Original change: https://android-review.googlesource.com/c/platform/build/+/2881407

Change-Id: If5ebbb6c6e40a95fb62b85b604012b18fe8bb020
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 17:27:15 +00:00
Roland Levillain
c9104b3392 Merge "Update OWNERS files under build/make." into main 2024-01-03 16:56:32 +00:00
Colin Cross
01ede583ea Merge "Don't install vintf and init.rc from Soong" into main 2024-01-03 16:53:45 +00:00
Anna Bauza
a42e5e475f Merge "Adding avatar picker to install on all platform phones and tablets" into main 2024-01-03 16:17:26 +00:00
Zhi Dou
5e64029bcd aconfig: add ForceReadOnly mode to aconfig rust codegen
This commit adds ForceReadOnly mode to rust codegen.

Bug: 316357759
Test: atest aconfig.test aconfig.prod_mode.test.rust
aconfig.test_mode.test.rust aconfig.exported_mode.test.rust
aconfig.force_read_only_mode.test.rust

Change-Id: I4cf98a6e9fc908fc372d4e68098a516808718c57
2024-01-03 15:56:24 +00:00
Zhi Dou
e567abdf3e aconfig: add ForceReadOnly mode to aconfig java codegen
This commit adds ForceReadOnly mode to java codegen.

Bug: 316357759
Test: atest aconfig.test aconfig.test.java

Change-Id: I10cd60def9ea20f7d56d87d18f680afeac61dc9d
2024-01-03 15:56:18 +00:00
Zhi Dou
8410cf4476 aconfig: add ForceReadOnly mode to aconfig c/c++ codegen
This commit adds ForceReadOnly mode to c/c++ codegen.

Bug: 316357759
Test: atest aconfig.test aconfig.test.cpp aconfig.test.cpp.test_mode
aconfig.test.cpp.exported_mode aconfig.test.cpp.force_read_only_mode

Change-Id: I4842dd69993fe4fc1f504358f59513cf064919d9
2024-01-03 15:56:10 +00:00
Zhi Dou
1a8281ccc2 aconfig: add new codegen mode force_read_only
The "force_read_only" mode is designed for libraries shared among
multiple containers for the following two scenarios where:
1. The library must be built with read_only flags or
2. Different containers requires different values for the same flags.

In this mode, the library includes only non-exported flags, adhering to
the concept that exported flags should maintain consistent values across
containers. Additionally, regardless of their original permissions, all
flags within this mode will be set to read_only.

Bug: 316357759
Test: atest aconfig.test
Change-Id: I65df39416c96404d84044a46bbcfe1bc8ce9ba8f
2024-01-03 15:53:01 +00:00
Anna Bauza
551acb1903 Adding avatar picker to install on all platform phones and tablets
Bug: b/306336441
Test: manual
Change-Id: Idb550019b13d47e7f0dc389030d508db7d1057f3
Ignore-AOSP-First: Avatar picker app is not yet to be visible in AOSP
2024-01-03 13:59:51 +00:00
Aditya Choudhary
0be2581e80 Split filepaths on ' ' in metadata generator
Test: go test

Ignore-AOSP-First: CPing test_spec rule to udc-mainline-prod to support migration of test targets. Cherry pick of: aosp/2840735


Change-Id: I5063c5a0b93501010b38aea91e8648cf5960ee6e
Merged-In: I5063c5a0b93501010b38aea91e8648cf5960ee6e
2024-01-03 13:07:10 +00:00
Aditya Choudhary
cf0053ef47 Handle empty input file case in Metadata generation
Bug: 296873595
Test: Manual test (use go test inside tools/metadata/testdata)

Ignore-AOSP-First: CPing test_spec rule to udc-mainline-prod to support migration of test targets. Cherry pick of: aosp/2835510

Change-Id: Ib48e88bdad4c870be3ca955abfd64ee8dd74f85d
Merged-In: Ib48e88bdad4c870be3ca955abfd64ee8dd74f85d
2024-01-03 13:06:59 +00:00
Aditya Choudhary
f101d2b7f0 Refactor metadata tool to support metadata generation for different rules.
Bug: 296873595
Test: Manual test (use go test inside tools/metadata/testdata)

Ignore-AOSP-First: CPing test_spec rule to udc-mainline-prod to support migration of test targets. Cherry pick of: aosp/2833290

Change-Id: I881fd76213ec78001f9e12ed2fbc860d1503a364
Merged-In: I881fd76213ec78001f9e12ed2fbc860d1503a364
2024-01-03 13:03:29 +00:00