Commit graph

99285 commits

Author SHA1 Message Date
Luca Farsi
040fabea76 Add optimized build features in build_test_suites
Add the optimized build feature in build_test_suites. WIP

Test: WIP
Bug: 342264003
Change-Id: I05a4ac4026c345f7ced771aa6deb1b6d1c38705c
2024-06-07 15:01:18 -07:00
Spandan Das
cc4e318dce Merge "Prevent implicit outputs created during dexpreopt_config.zip" into main am: d7c448f0f7
Original change: https://android-review.googlesource.com/c/platform/build/+/3117879

Change-Id: I5043fae20d7b533fe8fa4d1de1aa345c27c2a63f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 21:51:03 +00:00
Rashid Zaman
7a29da75fe Fix expansion of _include_stack in _import-node
During product configuration after a subgraph has been fully imported,
i.e. a makefile and all makefiles it inherits from have been imported,
the makefile representing the root node of this subgraph is meant to be
removed from _include_stack in the _import-node macro via the call to
the wordlist function. Instead, _include_stack is being cleared because
the last argument to the wordlist function is escaped so when it is
expanded before being passed to wordlist instead of expanding to the
value of _include_stack the reference to _include_stack is unescaped.
Fix this by removing the escaping of the variable reference.

This issue has no impact on product configuration but the correct value
of _include_stack helps when debugging product configuration because,
for example, the dumpconfig generated by 'product-config' contains the
value of _include_stack when nodes are imported.

Bug: 345709996
Test: lunch aosp_cf_x86_64_phone-trunk_staging-userdebug && \
  m nothing shows no change to build.ninja files
Test: Run product-config and dumpconfig.csv shows correct include
  stack, e.g. for telephony_product.mk

Change-Id: I5a9b22fffc147ceea3d49e298b1bbad45f71332c
Signed-off-by: Rashid Zaman <rashidz@meta.com>
2024-06-07 14:46:16 -07:00
Spandan Das
d7c448f0f7 Merge "Prevent implicit outputs created during dexpreopt_config.zip" into main 2024-06-07 21:28:44 +00:00
Spandan Das
d9d72c46ba Prevent implicit outputs created during dexpreopt_config.zip
$PRODUCT_OUT/dexpreopt_config.zip is created by zipping all the
dexpreopt configs of individual apps. These config files are created in
$PRODUCT_OUT/dexpreopt_config, and this dir is as used as -C for
soong_zip.

In the current implementation, this build action also implicitly copies
global configuration files dexpreopt.config and dexpreopt_soong.config
into $PRODUCT_OUT/dexpreopt_config with the intent of being included in
the resultant zip file. These implicit outputs are unknown to ninja.

This CL prevents creation of these implicit outputs.
out/soong/dexpreopt_soong.config and
out/soong/dexpreopt_<arch>/dexpreopt.config is now passed directly to
soong_zip via -f.

Bug: 333316620
Test: m out/target/product/vsoc_x86_64/dexpreopt_config.zip # no longer
bit identical since the relative order changes, dexpreopt(_soong).config
now appears at the bottom of the zip
Test: zipcmp dexpreopt_config.zip.before dexpreopt_config.zip.after # no
diffs

Change-Id: Ib30c9a5c436e263231f9688129ab94664277b841
2024-06-07 17:45:19 +00:00
Tongbo Liu
55b92a6726 Merge "fix wrong mts folder issue" into main 2024-06-07 17:02:49 +00:00
Android Build Coastguard Worker
a27a212c03 Version bump to AP3A.240607.003 [core/build_id.mk]
Change-Id: Ice34524daef594c1c073fcdca6e18704edddb9df
2024-06-07 16:17:23 +00:00
Treehugger Robot
b4cf9be5fb Merge "Build build_flags.json in soong" into main am: 04837c61f3 am: 4401accfe0
Original change: https://android-review.googlesource.com/c/platform/build/+/3011233

Change-Id: I6e32f3b30d749b092f71ab6fd6bcc736605cca2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 05:50:40 +00:00
Yihan Dong
b89bb9d547 fix wrong mts folder issue
Bug: 345042907
Test: m mts-mainline-infra
Ignore-AOSP-First: For internal use

Change-Id: I457403b0f9b50179d7b6ca9e13d1040b2a039b54
2024-06-07 05:31:20 +00:00
Treehugger Robot
4401accfe0 Merge "Build build_flags.json in soong" into main am: 04837c61f3
Original change: https://android-review.googlesource.com/c/platform/build/+/3011233

Change-Id: Ia33e4242d757bf6be4158039d5f88147ec7d99b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 05:31:15 +00:00
Treehugger Robot
04837c61f3 Merge "Build build_flags.json in soong" into main 2024-06-07 05:12:31 +00:00
Android Build Coastguard Worker
f2415d92a7 Version bump to AP3A.240607.002 [core/build_id.mk]
Change-Id: Ia502683e859fcaf7a5221701ded11fca18b168be
2024-06-07 00:52:58 +00:00
Zhuoyao Zhang
1698d49b55 Remove run_tool_with_logging function from envsetup.sh
As part of the build team's effort to cleanup envseup.sh.
Remove the run_tool_with_logging rundtion from envsetup.sh and add it
as a standalone script under build/soong/bin

Test: atest run_tool_with_logging
Test: manually do source envsetup.sh and run adb devices -l and check
the event log is sent to clearcut, tested with both bash and zsh

Bug: 342066042
Change-Id: I9c23a1b0a4b5790fb32f5e84fd7421ee6b36bdb0
2024-06-06 23:53:36 +00:00
Android Build Coastguard Worker
83ef037e4a Make change and version bump to AP3A.240607.001
Snap for 11938003 from 7e008bd5b9 to 24Q3-release

Change-Id: I2bbf3a30acf4200fc80549b561a8c152d251cc18
2024-06-06 23:49:26 +00:00
Treehugger Robot
adbe658f63 Merge "Drop product config include tags" into main am: 27d977e49b am: 4203b5baa7
Original change: https://android-review.googlesource.com/c/platform/build/+/3098637

Change-Id: Ieff76d73c26a1470bc99d8fc120a9f4dbb680d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 22:38:46 +00:00
Treehugger Robot
4203b5baa7 Merge "Drop product config include tags" into main am: 27d977e49b
Original change: https://android-review.googlesource.com/c/platform/build/+/3098637

Change-Id: I2eabcd961c55645bfe4e74cf5d4f4ccf6638290e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 22:16:18 +00:00
Treehugger Robot
27d977e49b Merge "Drop product config include tags" into main 2024-06-06 22:12:38 +00:00
Xin Li
638cc6a8e1 [automerger skipped] Merge "Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future" into aosp-main-future am: 7f80af61ff -s ours
am skip reason: Merged-In I02e87e92878770cf21fb5032efb75eb1b222c62f with SHA-1 df5bd53d55 is already in history

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

Change-Id: I9ca7d45c751d15b379758c3b6dbf78c10d4438cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 21:37:41 +00:00
Xin Li
546702ebab [automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: 67d97cd71e -s ours
am skip reason: Merged-In I02e87e92878770cf21fb5032efb75eb1b222c62f with SHA-1 df5bd53d55 is already in history

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

Change-Id: I04ef6fea70711f87cc0368b01b0839ed6f52bc4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 21:36:22 +00:00
Xin Li
7f80af61ff Merge "Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future" into aosp-main-future 2024-06-06 20:54:34 +00:00
Android Build Coastguard Worker
7947fd7655 Version bump to AP3A.240606.003 [core/build_id.mk]
Change-Id: Ifc2b23f20acfce88ad28e96b1109d57256fb1294
2024-06-06 15:15:06 +00:00
Vilas Bhat
7e008bd5b9 Merge "Propagate libpower no lock during binder transaction flag to soong" into main am: eae45e70ca am: c39e47f792
Original change: https://android-review.googlesource.com/c/platform/build/+/3107745

Change-Id: I5694cb1b306b465489002590fad5273af339a5fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 04:30:37 +00:00
Vilas Bhat
c39e47f792 Merge "Propagate libpower no lock during binder transaction flag to soong" into main am: eae45e70ca
Original change: https://android-review.googlesource.com/c/platform/build/+/3107745

Change-Id: Id7c5484f3b09a6747c3d5da5338109931d968f74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 04:13:37 +00:00
Vilas Bhat
eae45e70ca Merge "Propagate libpower no lock during binder transaction flag to soong" into main 2024-06-06 03:55:52 +00:00
Treehugger Robot
283f582176 Merge "Include sdk-preprocess-files.mk before process sdk.atree" into main am: 8e0ce35829 am: b8e6e297e3
Original change: https://android-review.googlesource.com/c/platform/build/+/3113080

Change-Id: I06ffb2cc58ae522e10a441ccfe14a44456d0936b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 02:01:52 +00:00
Treehugger Robot
b8e6e297e3 Merge "Include sdk-preprocess-files.mk before process sdk.atree" into main am: 8e0ce35829
Original change: https://android-review.googlesource.com/c/platform/build/+/3113080

Change-Id: Ibff56dd869895c5bf1cb77190d91aff6e026e81b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 01:47:19 +00:00
Treehugger Robot
8e0ce35829 Merge "Include sdk-preprocess-files.mk before process sdk.atree" into main 2024-06-06 01:28:13 +00:00
Android Build Coastguard Worker
6fd0db0420 Version bump to AP3A.240606.002 [core/build_id.mk]
Change-Id: Idfb5f02a16771a69c623a74232304b0ac06a697c
2024-06-06 00:58:10 +00:00
Android Build Coastguard Worker
1c9f82f841 Make change and version bump to AP3A.240606.001
Snap for 11931036 from c25b45164b to 24Q3-release

Change-Id: I407c5120bd6361ce1445fb09c1fa0e834ff3e8d6
2024-06-05 23:54:39 +00:00
Xin Li
67d97cd71e Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future
Bug: 343100748
Merged-In: I02e87e92878770cf21fb5032efb75eb1b222c62f
Change-Id: I2f8cb71a54227b97ab83eb7966b2f4c04724f2d2
2024-06-05 14:07:19 -07:00
Android Build Coastguard Worker
81da983bca Version bump to AP3A.240605.003 [core/build_id.mk]
Change-Id: If3e5ee8f4d504becb75676d4d5e64c69f2a594aa
2024-06-05 20:53:34 +00:00
Cole Faust
06f09f1e32 Merge "Remove all VNDK deprecation flags" into main am: b20aee1b1e am: 154682ce06
Original change: https://android-review.googlesource.com/c/platform/build/+/3109757

Change-Id: Ibcdb54782077930162b8d7d0481f57f8863dedee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 20:01:02 +00:00
Steven Moreland
022bb2399d Merge "Shipping_api_level" into main am: 62f6c088bf am: 33dc03bc09
Original change: https://android-review.googlesource.com/c/platform/build/+/3112941

Change-Id: I93b3c9c5f25a256ca7e313298761589992ebe7b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 20:00:38 +00:00
Cole Faust
154682ce06 Merge "Remove all VNDK deprecation flags" into main am: b20aee1b1e
Original change: https://android-review.googlesource.com/c/platform/build/+/3109757

Change-Id: I6eb9b5aeff8293dddc9dc2d1941ad98a0f123532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 19:36:28 +00:00
Steven Moreland
33dc03bc09 Merge "Shipping_api_level" into main am: 62f6c088bf
Original change: https://android-review.googlesource.com/c/platform/build/+/3112941

Change-Id: I0c711dc4642ec69d20755ce33ee03a555ae27d2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 19:36:09 +00:00
Cole Faust
b20aee1b1e Merge "Remove all VNDK deprecation flags" into main 2024-06-05 19:24:17 +00:00
Steven Moreland
62f6c088bf Merge "Shipping_api_level" into main 2024-06-05 19:23:21 +00:00
Android Build Coastguard Worker
a2cba7d5dc Version bump to AP3A.240605.002 [core/build_id.mk]
Change-Id: I8330de038b78120ed640587f52a90966de53274e
2024-06-05 04:51:51 +00:00
Android Build Coastguard Worker
22a2be7d70 Make change and version bump to AP3A.240605.001
Snap for 11926388 from 391609c3bf to 24Q3-release

Change-Id: I30b5ab87137dfe65edd740da5ffdd4da936091f1
2024-06-05 00:45:34 +00:00
LaMont Jones
c25b45164b Merge "Allow product-specific release configs." into main am: 6a39bb136e am: 358a84d714
Original change: https://android-review.googlesource.com/c/platform/build/+/3114502

Change-Id: I41bf51b17d2d9793b03cbd53e80f37c7be8db17c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 00:38:28 +00:00
LaMont Jones
358a84d714 Merge "Allow product-specific release configs." into main am: 6a39bb136e
Original change: https://android-review.googlesource.com/c/platform/build/+/3114502

Change-Id: I2bdfb6363ca1c7b60035fd2aa1dde7f5906918b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 00:22:52 +00:00
LaMont Jones
6a39bb136e Merge "Allow product-specific release configs." into main 2024-06-05 00:07:28 +00:00
Treehugger Robot
895768cced Merge "aconfig: update java read api for performance" into main am: 910ad04d2f am: edbd06d8a4
Original change: https://android-review.googlesource.com/c/platform/build/+/3112419

Change-Id: I0d26fec2dc3e854baed38c26ff49bdddbbcd4f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-04 23:34:36 +00:00
Joe Onorato
1e56e96609 Merge "Add new simplified lunch function (lunch2)" into main am: fc19715ebf am: 070808646e
Original change: https://android-review.googlesource.com/c/platform/build/+/3101473

Change-Id: I589461579736e186abf852f7e55f8d20bad46f90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-04 23:34:18 +00:00
Treehugger Robot
edbd06d8a4 Merge "aconfig: update java read api for performance" into main am: 910ad04d2f
Original change: https://android-review.googlesource.com/c/platform/build/+/3112419

Change-Id: I44714409822a6a37244b417e28c9993b37ad3a98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-04 23:33:50 +00:00
Treehugger Robot
910ad04d2f Merge "aconfig: update java read api for performance" into main 2024-06-04 23:29:18 +00:00
Joe Onorato
070808646e Merge "Add new simplified lunch function (lunch2)" into main am: fc19715ebf
Original change: https://android-review.googlesource.com/c/platform/build/+/3101473

Change-Id: I1f41c20816e37c542468fc32da3bde4d2f380d38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-04 23:26:13 +00:00
Joe Onorato
fc19715ebf Merge "Add new simplified lunch function (lunch2)" into main 2024-06-04 23:09:10 +00:00
Cole Faust
2ccea368f6 Merge "Remove unused variables in soong variables file" into main am: d816a727b8 am: b5b8902b29
Original change: https://android-review.googlesource.com/c/platform/build/+/3114139

Change-Id: I8b0306090b6fc98556c1519741f93533b04a9a4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-04 23:07:36 +00:00
Joe Onorato
590ae9f785 Add new simplified lunch function (lunch2)
Includes tests for envsetup.sh

After we've tried this for a bit and are happy, this will be swapped out
to become the new standard lunch and all of the menus and stuff will be
removed.

Test: build/make/tools/envsetup/run_envsetup_tests
Change-Id: Idebeeb1153406238b6c32f3f564c7bc1e7ced7e6
2024-06-04 16:04:49 -07:00