Colin Cross
35ce86d65e
Merge "Don't install test data from Soong" into main
2023-12-01 18:56:01 +00:00
Treehugger Robot
559a2d88aa
Merge "Disable stack-depth" into main am: 60bb7b0d75
am: c737e099b7
am: 81deda193e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2854225
Change-Id: Ic2273fc12542b7a0f959278ef1a01571e61ef7d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-01 14:26:37 +00:00
Treehugger Robot
81deda193e
Merge "Disable stack-depth" into main am: 60bb7b0d75
am: c737e099b7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2854225
Change-Id: Ib0075c18265ec2d9efcd9b035e6804081562353e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-01 13:54:36 +00:00
Treehugger Robot
d8f1c7563b
Merge "Disable stack-depth" into main am: 60bb7b0d75
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2854225
Change-Id: I729d3d26b16c3cbbfb30e72d484b4ad39cae619e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-01 13:20:50 +00:00
Treehugger Robot
c737e099b7
Merge "Disable stack-depth" into main am: 60bb7b0d75
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2854225
Change-Id: I19abe80da66839fca1bf4ef187741ff8bb034f2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-01 13:15:45 +00:00
Treehugger Robot
60bb7b0d75
Merge "Disable stack-depth" into main
2023-12-01 12:17:33 +00:00
Jooyung Han
a7bb8532f6
Use SOONG_STUB_VENDOR_LIBRARIES for vendor linker.config.pb
...
STUB_LIBRARIES lists all stub libraries including "system" libraries.
There can be a library that provides "stub" only for "system" variant
while its vendor variant doesn't. (e.g. libz). In such cases, using
STUB_LIBRARIES will result a wrong "provide" list in
vendor/etc/linker.config.pb.
So, instead, use SOONG_STUB_VENDOR_LIBRARIES which only lists stub
libraries that are installed in /vendor.
Bug: 313806237
Test: m & cvd start
Test: $OUT/vendor/etc/linker.config.pb doesn't list libz.so
Change-Id: If0f2089594bda5f799fd495f80a27493553cb4e1
2023-12-01 16:39:48 +09:00
Treehugger Robot
8e2fec72ce
Merge "Increase scudo MTE buffer for fullmte devices" into main am: 1a9dd1c7de
am: 38bfccfdc9
am: 92c4d85ee3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2819967
Change-Id: Ibab1ced474f6b93711cdadb1ceab087da1b056e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-01 04:06:09 +00:00
Treehugger Robot
8e0c07166d
Merge "Increase scudo MTE buffer for fullmte devices" into main am: 1a9dd1c7de
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2819967
Change-Id: Idec248d0fb251cf6aca35ba6a5af1f6eeb8ef9d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-01 03:25:27 +00:00
Treehugger Robot
38bfccfdc9
Merge "Increase scudo MTE buffer for fullmte devices" into main am: 1a9dd1c7de
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2819967
Change-Id: I441b9e793c724a593512740a6e57a1695febbb78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-01 03:04:05 +00:00
Treehugger Robot
1a9dd1c7de
Merge "Increase scudo MTE buffer for fullmte devices" into main
2023-12-01 02:52:38 +00:00
Gurpreet Singh
9bb555ba6b
Bump SDK Extension version to 11
...
This bump includes Adservices, ExtServices and Tethering.
Ignore-AOSP-first: Finalization is not performed in AOSP
Bug: 314132157
Test: The build passes
Change-Id: I42ed5a92c11f53211c21be06df31918c0dd7d5b7
Merged-In: I67c18cfa7a2717cce738b17a53199fa595254068
2023-11-30 19:21:16 +00:00
Justin Yun
2c583744cb
Define __ANDROID_VENDOR_API__
...
cc modules can use __ANDROID_VENDOR_API__ to read BOARD_API_LEVEL
that is the API level of the vendor surface.
Bug: 313822931
Test: check ninja commands to have -D__ANDROID_VENDOR_API__=<version>
Change-Id: I868b88ae72b4f60bc3d5ad567fbacd2222dd62d7
2023-11-30 05:30:48 +00:00
Colin Cross
2e7ce611af
Merge "Use files written by Soong" into main am: da0bc02bbf
am: 25f3963f22
am: 6cd7d4dafc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2842096
Change-Id: Idb2fadc13d68776d8334fa483e798674bee85260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-30 02:10:44 +00:00
Joey Jiao
0e6d1c90b9
Disable stack-depth
...
Port the same setting from build/soong,
fuzzer build failed without disable stack-depth
Change-Id: I62dbf6a8e3ef92abee79ad14fc3624959847ec33
2023-11-30 07:34:18 +05:30
Daniel Rosenberg
71dc8825e0
Merge "Add support for different F2FS block sizes" into main am: 5514a5aaf6
am: 53661d57b2
am: 2c67335b45
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2835796
Change-Id: Icf06290f0f9d86b6c9343437806bfa5aa0e8f74a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-30 02:02:07 +00:00
Colin Cross
2a3db344d9
Merge "Use files written by Soong" into main am: da0bc02bbf
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2842096
Change-Id: Ie9224f0258dc1fa9785d1f37d8d465f298bade99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-30 01:40:03 +00:00
Colin Cross
6cd7d4dafc
Merge "Use files written by Soong" into main am: da0bc02bbf
am: 25f3963f22
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2842096
Change-Id: Ia7444f2020b022eeeb84fc6f27f8a70e6df759b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-30 01:30:43 +00:00
Daniel Rosenberg
2c67335b45
Merge "Add support for different F2FS block sizes" into main am: 5514a5aaf6
am: 53661d57b2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2835796
Change-Id: Idfed33a075291795acdb66c23fc46b423680059f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-30 01:29:34 +00:00
Colin Cross
25f3963f22
Merge "Use files written by Soong" into main am: da0bc02bbf
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2842096
Change-Id: I2b6159e4ffe285ccf659982bade4fb7690846dae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-30 01:26:48 +00:00
Daniel Rosenberg
9cd8f252f8
Merge "Add support for different F2FS block sizes" into main am: 5514a5aaf6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2835796
Change-Id: Ia8333dfa52dff17020060762c7983580c7f68fa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-30 01:16:26 +00:00
Daniel Rosenberg
53661d57b2
Merge "Add support for different F2FS block sizes" into main am: 5514a5aaf6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2835796
Change-Id: I452c9665ca1f92842dd53a4fbe83805e2fd92f0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-30 01:00:38 +00:00
Colin Cross
da0bc02bbf
Merge "Use files written by Soong" into main
2023-11-30 00:41:43 +00:00
Daniel Rosenberg
5514a5aaf6
Merge "Add support for different F2FS block sizes" into main
2023-11-30 00:24:46 +00:00
Colin Cross
7bf03bf68e
Fix test data to use my_test_data_file_pairs
...
The format of LOCAL_TEST_DATA when provided by Soong can included a
third colon-separated field with an extra relative path that is not
being handled when assigning to ALL_MODULES.$(my_register_name).TEST_DATA.
Use my_test_data_file_pairs instead, which has already been transformed
to a src:dest pair.
Bug: 311428265
Test: examine module-info.json
Change-Id: I3a089cc24ea1492f1f7cf891c73ee7b43f273bb3
2023-11-29 10:18:52 -08:00
Colin Cross
4ea5e85143
Simplify module-info.json by leaving out optional fields
...
Every field in module-info.json has at least "[]". Add functions to
only write the values when they are non-empty to reduce the size
and ease comparison when module-info.json is written by Soong.
Bug: 309006256
Test: atest --host toybox-gtests --test-timeout=120000
Change-Id: I200e8c8fd9727b4cffa9b82318f4433fd630e933
2023-11-29 10:18:52 -08:00
Colin Cross
2062646c87
Don't install test data from Soong
...
Soong has already created the test data installation rules. Make still
handles packaging the test data into test suites.
Bug: 311428265
Test: atest --host toybox-gtests --test-timeout=120000
Change-Id: Ida0469e600b1dec4ce4e450a6c517ae13c133ded
2023-11-29 10:18:52 -08:00
Colin Cross
3a2ff8e27e
Use files written by Soong
...
Soong now writes transitive resource packages and combined proguard
flags files to files instead of passing them as a list to Make, so
Make no longer needs to write them to files.
Bug: 309006256
Test: m checkbuild
Change-Id: I3ff78047f417f8578063f9c7a97ef4c65ba33af3
2023-11-29 10:18:52 -08:00
Jiakai Zhang
9c37651cdc
Merge changes from topics "disable-art-service-dexopt", "remove-preopt-extracted-apk" into main am: 1f61e734d6
am: 9b03e697a0
am: 7a0c1d99cd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2847398
Change-Id: I8f27633297cfec61fc3c7f92d198782e36f9416e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-29 11:54:16 +00:00
Jiakai Zhang
e1dd0563b3
Merge changes from topics "disable-art-service-dexopt", "remove-preopt-extracted-apk" into main am: 1f61e734d6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2847398
Change-Id: Ib519b83b3700a4014d5b5d9d868dc73c9cb5219c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-29 10:50:42 +00:00
Jiakai Zhang
9b03e697a0
Merge changes from topics "disable-art-service-dexopt", "remove-preopt-extracted-apk" into main am: 1f61e734d6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2847398
Change-Id: Id0a3b213967ec32c954b8efc3e73e998ff75ce14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-29 10:50:34 +00:00
Jiakai Zhang
1f61e734d6
Merge changes from topics "disable-art-service-dexopt", "remove-preopt-extracted-apk" into main
...
* changes:
Remove PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK.
Set `dalvik.vm.disable-art-service-dexopt=true` on eng build.
2023-11-29 10:17:29 +00:00
Yi-Yo Chiang
24c9ebadb9
Merge "Deprecate BOARD_GKI_SIGNING_* vars and build rules" into main am: 3afaac28b9
am: 3637989aa1
am: cde8985c82
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2846155
Change-Id: I93d2a5147110d5a6364fc9f2f3f4b276b3b474b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-29 04:10:27 +00:00
Yi-Yo Chiang
cde8985c82
Merge "Deprecate BOARD_GKI_SIGNING_* vars and build rules" into main am: 3afaac28b9
am: 3637989aa1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2846155
Change-Id: I86a113925570d8f055d36662d78a0ad586eec46d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-29 03:53:34 +00:00
Yi-Yo Chiang
51c9176ba0
Merge "Deprecate BOARD_GKI_SIGNING_* vars and build rules" into main am: 3afaac28b9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2846155
Change-Id: I34535874461b003124cf4fd4319ae76224d6c9bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-29 03:43:35 +00:00
Yi-Yo Chiang
3637989aa1
Merge "Deprecate BOARD_GKI_SIGNING_* vars and build rules" into main am: 3afaac28b9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2846155
Change-Id: I67902ab748b64c7bc23eb9c3c1032d3c606f34b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-29 03:41:59 +00:00
Yi-Yo Chiang
3afaac28b9
Merge "Deprecate BOARD_GKI_SIGNING_* vars and build rules" into main
2023-11-29 03:04:59 +00:00
Colin Cross
0c29edd3a3
Merge "Don't store notice files for Soong modules" into main am: 00a0933af0
am: af7c3ce438
am: 14743116b6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2842095
Change-Id: I9f9d104ce37af26cb522a1b8cd72a4d10088901d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-29 00:01:14 +00:00
Colin Cross
14743116b6
Merge "Don't store notice files for Soong modules" into main am: 00a0933af0
am: af7c3ce438
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2842095
Change-Id: I98a768365ae720f4e7fb66e08a4ed79180cdbc87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-28 23:28:14 +00:00
Colin Cross
084b344177
Merge "Don't store notice files for Soong modules" into main am: 00a0933af0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2842095
Change-Id: I09462773d014cb65348610190643258eb2db6664
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-28 23:09:11 +00:00
Colin Cross
af7c3ce438
Merge "Don't store notice files for Soong modules" into main am: 00a0933af0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2842095
Change-Id: I6ddcd84e01ced0ad193157706f98be06d0640d1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-28 23:07:28 +00:00
Colin Cross
00a0933af0
Merge "Don't store notice files for Soong modules" into main
2023-11-28 22:51:32 +00:00
Jiakai Zhang
364e9c39de
Remove PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK.
...
This was added by r.android.com/513843 to force dexpreopt some GMS core
modules even if dexpreopt is disabled, to avoid some memory usage
regression. We no longer need it because dexpreopt is never disabled on
production builds.
Bug: 313505540
Test: m
Change-Id: Iff7f1d340a3ecd64cdc3d2f83f9c37c109a81fda
2023-11-28 13:46:13 +00:00
Timothy Yiu
b900a267eb
Merge "Add config for FULL_SYSTEM_OPTIMIZE_JAVA" into main am: 970bf093cd
am: 01d0904f8d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2806341
Change-Id: I8f5d266cf8a26b45bd12b27fd79eae83b1f2aeb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-28 07:08:15 +00:00
Timothy Yiu
8d196a0c9e
Merge "Add config for FULL_SYSTEM_OPTIMIZE_JAVA" into main am: 970bf093cd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2806341
Change-Id: I97ed4bf706707ebf455000f3e719ff60f845ae95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-28 06:21:22 +00:00
Timothy Yiu
01d0904f8d
Merge "Add config for FULL_SYSTEM_OPTIMIZE_JAVA" into main am: 970bf093cd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2806341
Change-Id: I4d65df474d4d3b567e2d30e0acb50ab91941c9e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-28 06:21:04 +00:00
Timothy Yiu
970bf093cd
Merge "Add config for FULL_SYSTEM_OPTIMIZE_JAVA" into main
2023-11-28 05:41:32 +00:00
Yi-Yo Chiang
3eb926b196
Merge "Deprecate BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" into main am: 5366754f62
am: 0687b5d4ef
am: 5fc61e1d9b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2846153
Change-Id: I80e5022586c47a328ac8f6a266784e5ba6c6eef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-28 02:14:25 +00:00
Daniel Rosenberg
d9a520c5bd
Add support for different F2FS block sizes
...
F2FS has been expanded to allow for different block sizes. Currently the
block size must be the same as page size, but this may change in the
future. This gives support for 16K while not restricting the ability to
choose a block size that isn't based on the page size later on.
Bug: 279820706
Test: Boot 16k F2FS device
Change-Id: I4e025d83a5e5ad03d89bc80b02fea390c2cbad69
2023-11-27 18:09:18 -08:00
Yi-Yo Chiang
5fc61e1d9b
Merge "Deprecate BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" into main am: 5366754f62
am: 0687b5d4ef
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2846153
Change-Id: I58376c298f047b1768b2469b6097819bbfd782e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-28 01:39:02 +00:00