Commit Graph

99216 Commits

Author SHA1 Message Date
Inseob Kim
0750a70e86 Add files installed to root to diff allowlist am: 1f3f321967 am: c9180bff8d
Original change: https://android-review.googlesource.com/c/platform/build/+/3163174

Change-Id: I0a7403f12403a2a170d7c76a8e55bc77f3d116ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-16 05:30:25 +00: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
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
47bcda313b Merge "Change java codegen to read from new storage" into main am: bce58b3c94 am: de49b7e6c4
Original change: https://android-review.googlesource.com/c/platform/build/+/3174140

Change-Id: Ie284db27fefb30633969dba83a575f5fbc91e384
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 20:26:05 +00:00
Yeabkal Wubshit
3b5155764b Merge "Include Wear flag values in sdk builds" into main am: acbc35aae9 am: b10ce3913c
Original change: https://android-review.googlesource.com/c/platform/build/+/3174060

Change-Id: I6255a5c98678b2fecb15f033866bd389ea132dec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 20:25:51 +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
Yeabkal Wubshit
b10ce3913c Merge "Include Wear flag values in sdk builds" into main am: acbc35aae9
Original change: https://android-review.googlesource.com/c/platform/build/+/3174060

Change-Id: I41976750e42ac14dea4e7256b3f3d918d87db955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 20:12:29 +00:00
Treehugger Robot
bce58b3c94 Merge "Change java codegen to read from new storage" into main 2024-07-15 20:09:01 +00:00
Yeabkal Wubshit
acbc35aae9 Merge "Include Wear flag values in sdk builds" into main 2024-07-15 19:52:47 +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
Yeabkal Wubshit
4bf41fda53 Include Wear flag values in sdk builds
Wear APIs are currently not being included in sdk builds, since Wear
flags are not part of the default set of flags read by the build system.
To mitigate this, we are explicitly including Wear flags in the list of
flags processed for sdk builds.

Bug: 350775600
Test: sdk builds contain Wear flags
Change-Id: I9e78a7f4282fa80a2ea30cbbc358c8e45ced0a9e
2024-07-15 17:55:05 +00:00
Treehugger Robot
cf0eb0dc42 Merge "core/Makefile: Add desktop pack image hook." into main am: 32af178175 am: c554725121
Original change: https://android-review.googlesource.com/c/platform/build/+/3167236

Change-Id: Iaacda47a5e049325d0d10372f077db49ee09a77b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 17:36:45 +00:00
Treehugger Robot
c554725121 Merge "core/Makefile: Add desktop pack image hook." into main am: 32af178175
Original change: https://android-review.googlesource.com/c/platform/build/+/3167236

Change-Id: Ibd0800c5428df84abc3089515031edeedeba4da8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 16:45:11 +00:00
Treehugger Robot
32af178175 Merge "core/Makefile: Add desktop pack image hook." into main 2024-07-15 16:10:16 +00:00
Tongbo Liu
7d9dad8f11 [automerger skipped] Merge "RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046." into android14-tests-dev am: 560eb19582 am: 81bfd38d48 am: 8ef23a5241 am: 6c90ab4bbb -s ours
am skip reason: contains skip directive

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

Change-Id: I17180d413f7d5a66665a68bc1029b66f691c3e37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 05:06:13 +00:00
Tongbo Liu
5bdb21f87f [automerger skipped] RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046. am: b60ebe0d7f am: 455b339478 am: 7068c6b755 am: 7d0e6ca6ee -s ours
am skip reason: contains skip directive

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

Change-Id: I39328e9ee7ab11fb1b4bd3910a11b6131ee1ad53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 05:06:06 +00:00
Automerger Merge Worker
cd8ec01eb1 Merge changes from topic "am-4925d40ec4b04d5583bbff74de229f4c" into main
* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046." into android14-tests-dev am: 560eb19582 am: 81bfd38d48 am: 8b5fb9b719 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046. am: b60ebe0d7f am: 455b339478 am: 0af2c1648a -s ours
2024-07-15 04:42:31 +00:00
Tongbo Liu
6c90ab4bbb Merge "RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046." into android14-tests-dev am: 560eb19582 am: 81bfd38d48 am: 8ef23a5241
Original change: https://android-review.googlesource.com/c/platform/build/+/3164465

Change-Id: I2c6fdebf2feb4d2a3202ceeafb9138d804fcff5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 04:42:26 +00:00
Tongbo Liu
7d0e6ca6ee RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046. am: b60ebe0d7f am: 455b339478 am: 7068c6b755
Original change: https://android-review.googlesource.com/c/platform/build/+/3164465

Change-Id: I58a64c8d13ac38e2d4235d6368ae85a9b440fa34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 04:42:23 +00:00
Tongbo Liu
442867cc15 [automerger skipped] Merge "RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046." into android14-tests-dev am: 560eb19582 am: 81bfd38d48 am: 8b5fb9b719 -s ours
am skip reason: contains skip directive

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

Change-Id: I2964b41474dfcdad1363e074182a610bc6b4dedb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 04:42:19 +00:00
Tongbo Liu
8acbbc83df [automerger skipped] RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046. am: b60ebe0d7f am: 455b339478 am: 0af2c1648a -s ours
am skip reason: contains skip directive

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

Change-Id: I3698342c194ab6a2b7b5a0d3cea6969537472a9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 04:42:11 +00:00
Automerger Merge Worker
3acc796485 Merge changes from topic "am-f9ee56e6607943ff8ca5de5609d46463" into main am: c067bcb19f am: 84ef49b57f
Original change: https://android-review.googlesource.com/c/platform/build/+/3164465

Change-Id: I3ee41ba709484fc3d03710ca00e8ec228ca0f88f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 04:42:09 +00:00
Tongbo Liu
b66b5700c4 [automerger skipped] Merge "RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046." into android14-tests-dev am: 560eb19582 -s ours am: 944116ca58 -s ours am: bd7e621ddf -s ours
am skip reason: contains skip directive

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

Change-Id: Ic2af28c312f2fdf7249e32e28c50be1388fffee5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 04:42:03 +00:00
Tongbo Liu
8b5fb9b719 Merge "RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046." into android14-tests-dev am: 560eb19582 am: 81bfd38d48
Original change: https://android-review.googlesource.com/c/platform/build/+/3164465

Change-Id: If421e28fab5a882c473d3fd5f1f468b5e83f38c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 04:29:53 +00:00
Tongbo Liu
0af2c1648a RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046. am: b60ebe0d7f am: 455b339478
Original change: https://android-review.googlesource.com/c/platform/build/+/3164465

Change-Id: I11c3d8c4f71bd9f31f55d1ecf0870dbf1b10321f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 04:29:49 +00:00
Tongbo Liu
8ef23a5241 Merge "RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046." into android14-tests-dev am: 560eb19582 am: 81bfd38d48
Original change: https://android-review.googlesource.com/c/platform/build/+/3164465

Change-Id: I6e4929990241b6bf6ae0e3aad4bd95e3e92c8fa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 04:29:37 +00:00
Tongbo Liu
7068c6b755 RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046. am: b60ebe0d7f am: 455b339478
Original change: https://android-review.googlesource.com/c/platform/build/+/3164465

Change-Id: I1d55a2ccecc0427744ff8ca3702bb7db7b83389a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 04:29:32 +00:00
Automerger Merge Worker
84ef49b57f Merge changes from topic "am-f9ee56e6607943ff8ca5de5609d46463" into main am: c067bcb19f
Original change: https://android-review.googlesource.com/c/platform/build/+/3164465

Change-Id: I2f112f7bc2e225f78fff6cab8da0d45a7d7e9b06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 04:24:34 +00:00
Tongbo Liu
bd7e621ddf [automerger skipped] Merge "RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046." into android14-tests-dev am: 560eb19582 -s ours am: 944116ca58 -s ours
am skip reason: contains skip directive

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

Change-Id: Id33940114a3ec427fb30505b0d5fe8602c79392c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 04:24:26 +00:00
Tongbo Liu
81bfd38d48 Merge "RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046." into android14-tests-dev am: 560eb19582
Original change: https://android-review.googlesource.com/c/platform/build/+/3164465

Change-Id: Ie8c7063d1b9098debb7c938f7ce3e2d4c93538d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 03:57:37 +00:00
Tongbo Liu
455b339478 RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046. am: b60ebe0d7f
Original change: https://android-review.googlesource.com/c/platform/build/+/3164465

Change-Id: I6aba6262e8d344b45e05787e63810cc990b952e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 03:57:33 +00:00
Automerger Merge Worker
c067bcb19f Merge changes from topic "am-f9ee56e6607943ff8ca5de5609d46463" into main
* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046." into android14-tests-dev am: 560eb19582 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046. am: b60ebe0d7f -s ours
2024-07-15 03:52:39 +00:00
Tongbo Liu
944116ca58 [automerger skipped] Merge "RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046." into android14-tests-dev am: 560eb19582 -s ours
am skip reason: contains skip directive

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

Change-Id: Ic9c196441e5fbc5c61bb6cfa700ec74be6861c17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 03:52:32 +00:00
Tongbo Liu
692f7709d0 [automerger skipped] RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046. am: b60ebe0d7f -s ours
am skip reason: contains skip directive

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

Change-Id: Ibf3ca3fe769ea0b37e5a2f30d906fa722bf2a700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 03:52:28 +00:00
Tongbo Liu
560eb19582 Merge "RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046." into android14-tests-dev 2024-07-15 03:36:43 +00:00
Yike Zhang
3d0a804d6f Merge "Link shared libs to per test module folder in host-unit-tests.zip" into main am: fb308d3c5d am: f5893e405c
Original change: https://android-review.googlesource.com/c/platform/build/+/3163460

Change-Id: I26196637009c220ea476e8edfe1281dca2a089d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-12 22:37:48 +00:00
Yike Zhang
f5893e405c Merge "Link shared libs to per test module folder in host-unit-tests.zip" into main am: fb308d3c5d
Original change: https://android-review.googlesource.com/c/platform/build/+/3163460

Change-Id: Idf8e52891fe5e8afbdfb698d64dc430202fc0529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-12 22:13:10 +00:00
Yike Zhang
fb308d3c5d Merge "Link shared libs to per test module folder in host-unit-tests.zip" into main 2024-07-12 21:52:51 +00:00
yike
79422c8ed9 Link shared libs to per test module folder in host-unit-tests.zip
Downstream testing infra needs per test module folder to be
self-contained to prune dependencies and increase testing efficiency.

Bug: 351909435
Test: presubmit
Change-Id: Icda8982af8eb223ba4ae45be7975dc5aa42a183e
2024-07-12 20:58:37 +00:00
Treehugger Robot
0d8f1bcefd Merge "Fix -Wformat in generated code." into main 2024-07-12 16:57:14 +00:00
Zhi Dou
cd39762828 Merge "add storage java reader" into main am: 6f9f7ccfe3 am: e944856ba0
Original change: https://android-review.googlesource.com/c/platform/build/+/3168961

Change-Id: Ie0fc2b2c15824240fd631fed9e4d43961aca51fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-12 14:28:05 +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
6f9f7ccfe3 Merge "add storage java reader" into main 2024-07-12 13:44:27 +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
Krzysztof Kosiński
17c72281f2 Fix -Wformat in generated code.
Bug: 315250603
Change-Id: I61cddf58939d8ff6a9835426b0f04c19c820a26c
Test: presubmit
Flag: EXEMPT build system fix
Ignore-AOSP-First: code is already modified internally
2024-07-12 04:54:48 +00:00
Sheetal Pagadakula
4c2a516d0b Merge "Creating a Trendy team rule for PTE-SysUI Bug: 351846385 Test: Manual Ignore-AOSP-First: Internal only" into main 2024-07-11 23:47:43 +00:00
Treehugger Robot
e386d3f787 Merge "Add owners for build/make/target/product/virtual_ab_ota" into main am: cb8ea3a6f1 am: 352b784929
Original change: https://android-review.googlesource.com/c/platform/build/+/3165046

Change-Id: I68215adbe63758e184be043922be8a8f7cfbe4aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 21:31:59 +00:00
Sheetal Pagadakula
d4b0b5d405 Creating a Trendy team rule for PTE-SysUI
Bug: 351846385
Test: Manual
Ignore-AOSP-First: Internal only

Change-Id: Id988d4c9d74a20a2a6471bdbae596c8772ac8cf5
2024-07-11 21:08:53 +00:00
Treehugger Robot
352b784929 Merge "Add owners for build/make/target/product/virtual_ab_ota" into main am: cb8ea3a6f1
Original change: https://android-review.googlesource.com/c/platform/build/+/3165046

Change-Id: I2ecd121bed26f9b505459d8ad1d6ff123b06ce65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 21:08:15 +00:00
Priyanka Advani
4dcdf3e01c Merge "Revert "add storage java internal reader"" into main am: bb9f03efbe am: c92444463b
Original change: https://android-review.googlesource.com/c/platform/build/+/3168856

Change-Id: I86716f83340645a1f4f2ac22acca6e19f7cae770
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 20:55:41 +00:00