Chris Li
6fc1aea77e
Merge "Remove WM Extensions from wearable" into main
2024-04-01 08:28:19 +00:00
Vilas Bhat
068928e112
Merge "16k: core: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets" into main am: 85bd1e671e
am: 04124bdcd2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3006608
Change-Id: I9909ea212e044928c95988bcfd253b38789d64e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-30 00:26:43 +00:00
Vilas Bhat
04124bdcd2
Merge "16k: core: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets" into main am: 85bd1e671e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3006608
Change-Id: I5ad05a0c6c819c95a6084c1a4a995764f4192f95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-30 00:10:59 +00:00
Vilas Bhat
85bd1e671e
Merge "16k: core: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets" into main
2024-03-29 23:57:23 +00:00
Vilas Bhat
9014163717
16k: core: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets
...
Enabling TARGET_NO_BIONIC_PAGE_SIZE_MACRO implies those targets no
longer rely on the `PAGE_SIZE` bionic macro. Page size would be queried
at runtime using getpagesize() / sysconf(_SC_PAGE_SIZE).
Test: lunch <target> && get_build_var TARGET_NO_BIONIC_PAGE_SIZE_MACRO
Bug: 310232825
Change-Id: I01291c8626d103a4f3bbc0a659d5843a78a9b24b
2024-03-29 17:50:40 +00:00
Anna Bauza
7847bfcba9
Refactor SettingsLib to remove redundant resources conditionally
...
Bug: 320878675
Test: manual
Change-Id: Ic5862c45dcb3383a736b43fcf98ab58f05149ec7
Ignore-AOSP-First: Feature not yet exposed to AOSP
2024-03-29 09:26:00 +00:00
Kiyoung Kim
5e781f324e
Merge "Remove PLATFORM_VNDK_VERSION related code" into main am: d3df8b5b06
am: 83b851c938
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3018445
Change-Id: I0189cdcab500eb9bb12ff8aedb6f3ca2ae3c9865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-29 03:32:41 +00:00
Kiyoung Kim
83b851c938
Merge "Remove PLATFORM_VNDK_VERSION related code" into main am: d3df8b5b06
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3018445
Change-Id: Id63713a1fa9a3de2b1b0649993cfcebc1ba28dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-29 03:16:17 +00:00
Kiyoung Kim
d3df8b5b06
Merge "Remove PLATFORM_VNDK_VERSION related code" into main
2024-03-29 02:55:26 +00:00
Ted Bauer
9e695b89ff
Merge "aconfig: make APIs apex available" into main am: 9b7185ca9c
am: af2a0bd5e8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3017920
Change-Id: I5b6430fce93d8217852c3e6fdb5863d4f807d702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-29 00:18:20 +00:00
Ted Bauer
af2a0bd5e8
Merge "aconfig: make APIs apex available" into main am: 9b7185ca9c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3017920
Change-Id: Ic4b2e952ffd6ba459e4507264372b33cfb3e3d66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-28 23:48:42 +00:00
LaMont Jones
0c413d9161
[automerger skipped] Merge "release_config: cleanup how default values are used" into main am: e4f62e3866
am: 138b12fddd
-s ours
...
am skip reason: Merged-In I8384cf8e0e0caedb5fb5a343f8be23f37bf4dc87 with SHA-1 d6be720337
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/3018325
Change-Id: Ia8fb908bd3537082cf867062001d37aeb82628c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-28 23:41:51 +00:00
Ted Bauer
9b7185ca9c
Merge "aconfig: make APIs apex available" into main
2024-03-28 23:33:32 +00:00
LaMont Jones
138b12fddd
Merge "release_config: cleanup how default values are used" into main am: e4f62e3866
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3018325
Change-Id: I245acfb4d0586c42f51684a3f314467456b550cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-28 23:26:08 +00:00
LaMont Jones
e4f62e3866
Merge "release_config: cleanup how default values are used" into main
2024-03-28 23:07:25 +00:00
LaMont Jones
979c1bdfc4
release_config: cleanup how default values are used
...
Set the flag value to the default value, rather than waiting until the
end to check if it was set anywhere.
This matters when the flag is declared `appends=True`.
Bug: none
Test: manual
Ignore-AOSP-First: Will CP, testing on internal first.
Change-Id: I8384cf8e0e0caedb5fb5a343f8be23f37bf4dc87
Merged-In: I8384cf8e0e0caedb5fb5a343f8be23f37bf4dc87
2024-03-28 22:42:36 +00:00
LaMont Jones
5f1da22348
Merge "release_config: cleanup how default values are used" into main
2024-03-28 22:41:19 +00:00
LaMont Jones
d6be720337
release_config: cleanup how default values are used
...
Set the flag value to the default value, rather than waiting until the
end to check if it was set anywhere.
This matters when the flag is declared `appends=True`.
Bug: none
Test: manual
Ignore-AOSP-First: Will CP, testing on internal first.
Change-Id: I8384cf8e0e0caedb5fb5a343f8be23f37bf4dc87
2024-03-28 10:08:47 -07:00
Ted Bauer
e30efac744
aconfig: make APIs apex available
...
We need the aconfig APIs to be available on every mainline module, so
set the min_sdk_version as low as possible.
Bug: 328444881
Test: m
Change-Id: I02e569d510a30f4809d4a82f7630326b0b30f263
2024-03-28 13:46:18 +00:00
Kiyoung Kim
fdeacfd30a
Remove PLATFORM_VNDK_VERSION related code
...
As of VNDK deprecation, PLATFORM_VNDK_VERSION should no longer be used.
This change removes most of references for PLATFORM_VNDK_VERSION
variable.
Bug: 330100430
Test: AOSP CF build succeeded
Change-Id: I9293deffc01d2431740c43ecae23719a9171f344
2024-03-28 13:05:05 +09:00
Treehugger Robot
3a87dea0e9
Merge "Add new team android_platform_performance_testing" into main am: 1c53ba7000
am: 6003bd5180
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3017191
Change-Id: Ieea86967d8d15bcfe64e9381c1d804107e263972
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-28 03:36:02 +00:00
Treehugger Robot
bf886f6708
Merge "Revert^2 "Migrate buildinfo.sh script into Soong"" into main am: efb09e77d3
am: eb9d8c057e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3015818
Change-Id: I4b882b043795571404b6eb4ad49dd00365acde15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-28 03:35:48 +00:00
Treehugger Robot
6003bd5180
Merge "Add new team android_platform_performance_testing" into main am: 1c53ba7000
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3017191
Change-Id: I03dbef4d9a707a4df814aee8fda0213ba5e16596
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-28 03:22:56 +00:00
Treehugger Robot
eb9d8c057e
Merge "Revert^2 "Migrate buildinfo.sh script into Soong"" into main am: efb09e77d3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3015818
Change-Id: I0e88ce0c7cf2675c6b943ccd0765d13e5cc1876d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-28 03:22:35 +00:00
Treehugger Robot
1c53ba7000
Merge "Add new team android_platform_performance_testing" into main
2024-03-28 03:01:56 +00:00
Treehugger Robot
efb09e77d3
Merge "Revert^2 "Migrate buildinfo.sh script into Soong"" into main
2024-03-28 02:59:51 +00:00
Luca Farsi
c86e13fcc5
Merge "switch to using DIST_DIR env var for dist" into main am: f8e7919759
am: cac2d40e26
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3009257
Change-Id: Ia17e56714762728a44e633973b043b647836124e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-27 22:50:17 +00:00
Luca Farsi
cac2d40e26
Merge "switch to using DIST_DIR env var for dist" into main am: f8e7919759
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3009257
Change-Id: I931ddda71ff0763e212a8b8b16e830495d5531b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-27 22:31:25 +00:00
Luca Farsi
f8e7919759
Merge "switch to using DIST_DIR env var for dist" into main
2024-03-27 22:14:40 +00:00
Gopinath Elanchezhian
6a072a70c7
Add new team android_platform_performance_testing
...
Bug: b/331241555
Test: Local
Change-Id: I8967331bb166075a4d03577e3b196ae8b631a413
2024-03-27 21:26:29 +00:00
Treehugger Robot
2594275195
Merge "16k: core: Remove page size limitation for setting TARGET_NO_BIONIC_PAGE_SIZE_MACRO" into main am: 6c539c0d83
am: 3cf3f883f9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3014513
Change-Id: I894475b83b62b8eae4ede71c39dbc4489713e4e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-27 20:36:28 +00:00
Treehugger Robot
3cf3f883f9
Merge "16k: core: Remove page size limitation for setting TARGET_NO_BIONIC_PAGE_SIZE_MACRO" into main am: 6c539c0d83
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3014513
Change-Id: I568f7950310e8ab0b16ccd1cb21f2f59e6667976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-27 20:30:45 +00:00
Charisee Chiw
a5ad7b714d
Merge "Update needed for Rust v1.77.0" into main am: 2a9674af58
am: 964668d4c7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3006419
Change-Id: I551005df18e274080364864d7bd7d7d6957f973a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-27 20:30:24 +00:00
Treehugger Robot
6c539c0d83
Merge "16k: core: Remove page size limitation for setting TARGET_NO_BIONIC_PAGE_SIZE_MACRO" into main
2024-03-27 20:14:54 +00:00
Charisee Chiw
964668d4c7
Merge "Update needed for Rust v1.77.0" into main am: 2a9674af58
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3006419
Change-Id: Id229e90dbbaebabc90c0bd76e7950b817325627d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-27 20:10:07 +00:00
Charisee Chiw
2a9674af58
Merge "Update needed for Rust v1.77.0" into main
2024-03-27 19:53:54 +00:00
Charisee
58708f5d7b
Update needed for Rust v1.77.0
...
error: this `let...else` may be rewritten with the `?` operator
--> build/make/tools/aconfig/aconfig/src/commands.rs:320:5
|
320 | / let Some(package) = parsed_flags.first().map(|pf| pf.package()) else {
321 | | return None;
322 | | };
| |______^ help: replace it with: `let package = parsed_flags.first().map(|pf| pf.package())?;`
|
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#ques
tion_mark
= note: `-D clippy::question-mark` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::question_mark)]`
error: this `let...else` may be rewritten with the `?` operator
--> build/make/tools/aconfig/aconfig/src/commands.rs:330:5
|
330 | / let Some(container) = parsed_flags.parsed_flag.first().map(|pf| pf.container()) else {
331 | | return None;
332 | | };
| |______^ help: replace it with: `let container = parsed_flags.parsed_flag.first().map(|pf| pf.cont
ainer())?;`
|
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#ques
tion_mark
error: aborting due to 2 previous errors
Bug: 330185853
Test: ./test_compiler.py --prebuilt-path dist/rust-dev.tar.xz --target aosp_cf_x86_64_phone --image
Change-Id: I00e22fc75137e8bd6fe28a8c20f8a1c3bbe711fd
2024-03-27 19:53:24 +00:00
Luca Farsi
c2ba38a7c1
switch to using DIST_DIR env var for dist
...
the dist dir should not be passed in as an argument, it should be picked
up from the environment.
Test: ./build/make/ci/build_test_suites --target_product aosp_x86_64 --target_release trunk_staging --with_dexpreopt_boot_img_and_system_server_only
Bug: 314171817
Change-Id: I32c007677cf1d81bb7b263b5c69e5510bf8dccfe
2024-03-27 11:31:12 -07:00
Chris Li
4b88326361
Remove WM Extensions from wearable
...
Wearable doesn't need WM Extensions.
Bug: 306666082
Ignore-AOSP-First: need internal-first change to guard with flag
Test: atest CtsWindowManagerJetpackTestCases:SdkAvailabilityTest
Change-Id: Idd0f7269ccfacbc2e3030f35a5fd2ebf965b8db2
2024-03-27 07:16:53 +00:00
Inseob Kim
06d22319d2
Revert^2 "Migrate buildinfo.sh script into Soong"
...
This reverts commit 54101665ee
.
Reason for revert: Fixed build breakage
Bug: 322090587
Change-Id: I065a187bf5863cbb381b4f3308aae7b7200ffa6d
Test: compare build.prop before and after
Test: build multiple times and see build.prop isn't rebuilt
2024-03-27 05:19:56 +00:00
Yi-Yo Chiang
e9b7350fc8
Merge "Copy build.prop[-<part>] to dist dir only if the corresponding partition image is being built" into main am: bb50888987
am: 10c30669ef
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3011135
Change-Id: Ia5021745f2a60aad4a796e6bfa769a66e138fbb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-27 02:28:24 +00:00
Yi-Yo Chiang
10c30669ef
Merge "Copy build.prop[-<part>] to dist dir only if the corresponding partition image is being built" into main am: bb50888987
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3011135
Change-Id: I4417df022b429c89fd2f5b3631f6e0a5c9746215
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-27 02:11:27 +00:00
Treehugger Robot
5d47690772
Merge "Dedupe input for target-native-copy-pairs" into main am: 65c865bd05
am: 2536dc3bea
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3013153
Change-Id: Ic0f14ae680c7a70672f407ef36b15b5d868abc39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-27 02:03:49 +00:00
Yi-Yo Chiang
bb50888987
Merge "Copy build.prop[-<part>] to dist dir only if the corresponding partition image is being built" into main
2024-03-27 01:55:51 +00:00
Treehugger Robot
2536dc3bea
Merge "Dedupe input for target-native-copy-pairs" into main am: 65c865bd05
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3013153
Change-Id: Id81f7f74e65c191bb2d35f31a5bed94a2e90545f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-27 01:42:41 +00:00
Treehugger Robot
65c865bd05
Merge "Dedupe input for target-native-copy-pairs" into main
2024-03-27 01:25:08 +00:00
Treehugger Robot
d878623e83
Merge "Allow installing fake [odm|product|system_ext] packages" into main am: 6f88286f46
am: 95375a3d67
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3006687
Change-Id: I30c9648e1eb2f0c0433e91bc9e88fea44a71f82e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-27 00:36:11 +00:00
Treehugger Robot
95375a3d67
Merge "Allow installing fake [odm|product|system_ext] packages" into main am: 6f88286f46
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3006687
Change-Id: Ib84339a3736d0864a2115f927900d869e93e5134
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-27 00:16:16 +00:00
Treehugger Robot
6f88286f46
Merge "Allow installing fake [odm|product|system_ext] packages" into main
2024-03-26 23:59:48 +00:00
Gina Ko
f62acedcf7
Merge "Revert "Migrate buildinfo.sh script into Soong"" into main am: 813b17dd5c
am: bc2fd5084c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3015494
Change-Id: I1909337cf7bd6d8e6ec0596a92b2b4172a328c1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-26 23:21:38 +00:00