Commit Graph

34149 Commits

Author SHA1 Message Date
Android Build Coastguard Worker
390c2376d4 Version bump to TQ1A.230205.002 [core/build_id.mk]
Change-Id: If255da6baf0a179cf7fde3f69b34346c64d178d6
2023-01-10 00:11:25 +00:00
Cole Faust
5065c690dd Merge "Remove duplicates from VendorVars maps" 2023-01-09 22:50:04 +00:00
Android Build Coastguard Worker
4fb411f032 Make change and version bump to TQ2A.230109.001
Snap for 9467077 from 623ac18616 to tm-qpr2-release

Change-Id: Icb582cddf02cac7b529b0b552447a286516f1ca8
2023-01-08 23:04:38 +00:00
Robert Shih
588f2e62da Initial add wvts to build
[ Merge of pa/2264578 ]

Test: make wvts

Bug: 209663123
Change-Id: I089fcdfc385e9d01aa275f77a566ffecb5340495
2023-01-08 03:38:11 +00:00
Android Build Coastguard Worker
5b59878322 Make change and version bump to TQ2A.230108.001
Snap for 9465878 from 623ac18616 to tm-qpr2-release

Change-Id: Ie5f1e2fa8df7a47d62102562b8e846bf4948ada3
2023-01-07 23:08:44 +00:00
Android Build Coastguard Worker
02d66c0e4d Make change and version bump to TQ2A.230107.001
Snap for 9463735 from 623ac18616 to tm-qpr2-release

Change-Id: Iec1e0aeced1820b0b1241e5c19d5bed240aba262
2023-01-07 02:59:43 +00:00
Cole Faust
e16def0987 Remove duplicates from VendorVars maps
Some products access the SOONG_CONFIG variables
directly, instead of using soong_config_set. When
they do that, they could end up with duplicate values
in those variables, causing duplicate keys to be
generated in a json map.

Use $(sort) to dedup the map keys before writing them
out.

Bug: 249685973
Test: Presubmits
Change-Id: If0c16377bdfbd3f836ebec9262bec7cf562f339c
2023-01-06 16:20:59 -08:00
Cole Faust
e134e2418d Merge "Fix printing variables that have inherit references in them" am: 9a92b27cd8 am: 6b95d06ae3 am: 57eafaa674
Original change: https://android-review.googlesource.com/c/platform/build/+/2374667

Change-Id: Ic01dbd8c6eeca8e60e7100aad70b0f16063782bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 20:44:54 +00:00
Cole Faust
57eafaa674 Merge "Fix printing variables that have inherit references in them" am: 9a92b27cd8 am: 6b95d06ae3
Original change: https://android-review.googlesource.com/c/platform/build/+/2374667

Change-Id: I1dcd90afe6b2bf8d7e432e8a46e4b13a5d5e969d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 20:23:18 +00:00
Cole Faust
6b95d06ae3 Merge "Fix printing variables that have inherit references in them" am: 9a92b27cd8
Original change: https://android-review.googlesource.com/c/platform/build/+/2374667

Change-Id: I35288220180404968027ac104ded3fbee2ca914e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 19:49:25 +00:00
Bill Yi
5c35eed416 Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" 2023-01-06 19:33:51 +00:00
Bill Yi
1c1efa3d47 Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE
Merged-In: Ic7fbbb3a38ccd5c46cc9b9760b8f046a6501cadd
Merged-In: I4239e9cb999b688ac26ef68d77a05b2038e14fab
Change-Id: I5b623caa2cca2ee7e52f2f7954a2a1d524dac53f
2023-01-06 07:13:49 -08:00
Android Build Coastguard Worker
de7b4df735 Make change and version bump to TQ2A.230106.001
Snap for 9459725 from cecb3ca4f3 to tm-qpr2-release

Change-Id: Ibc4173a9977cc42b1264422b68fd831560d6378e
2023-01-06 01:00:28 +00:00
Cole Faust
f07dcc48e8 Fix printing variables that have inherit references in them
Inherit references (@inherit in make, 1-tuples in starlark)
usually appear in list product variables, where they're
evaluated before printing. But sometimes they can be copied
into a regular global variable, in which case they won't
be evaluated before printing. The 1-tuples were failing to
print, so adapt them to their make representation before
printing.

Fixes: 264554449
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: I5ac6eb996c25ee5e77aa26ed5c4b6b6cc31819d1
2023-01-05 12:06:26 -08:00
Android Build Coastguard Worker
82ae621b36 Make change and version bump to TQ2A.230105.001
Snap for 9454839 from cecb3ca4f3 to tm-qpr2-release

Change-Id: Iec7019d6c7c876bc9fb4375f2ccdb0c820043819
2023-01-05 00:59:25 +00:00
Bill Yi
db0f5cfdaa Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE
Merged-In: I06afc5ea846a6b104eee83d9933793c868544d17
Change-Id: I78e257cbe11db35a137e01258b1d06a2b4ed9dda
2023-01-04 12:52:28 -08:00
Android Build Coastguard Worker
8c0365332a Make change and version bump to TQ2A.230104.001
Change-Id: I072ffde296a66b84bbba18b9e7361887d2e3d1c0
2023-01-04 01:00:04 +00:00
Treehugger Robot
f73b9d7afa Merge "Revert "Define vendor-hwasan-snapshot target"" am: 0ffb3e522e am: c3dbecdc07 am: e8070b62e4
Original change: https://android-review.googlesource.com/c/platform/build/+/2373468

Change-Id: I34fbf5cc519991b497480437b119e407b5af3591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 19:06:42 +00:00
Treehugger Robot
e8070b62e4 Merge "Revert "Define vendor-hwasan-snapshot target"" am: 0ffb3e522e am: c3dbecdc07
Original change: https://android-review.googlesource.com/c/platform/build/+/2373468

Change-Id: I3ef1d1b05a0f9d6c6ce4d42ac84d250e964e1584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 18:10:25 +00:00
Android Build Coastguard Worker
1c1f42bb4e Make change and version bump to TQ2A.230103.001
Change-Id: Ic94536146a906c3260eabeb75737cfbb5b416a3f
2023-01-03 04:59:32 +00:00
Justin Yun
3ddd9f49e2 Revert "Define vendor-hwasan-snapshot target"
This reverts commit 97c140ccad.

As vsdk can capture hwasan snapshot with aosp/2358699, we don't need
this workaround any more.

Bug: 234772527
Test: TH
Change-Id: I94e751949d679a31060bb5fea0147947fc6682f4
2023-01-02 16:07:43 +09:00
Justin Yun
ec6e245f53 Merge "Add missing target from makefile" am: 857260905b am: 7c8ea9d79a am: a0bd05639e
Original change: https://android-review.googlesource.com/c/platform/build/+/2372088

Change-Id: I78d660d52a94a5204428fbccceedbb17c558f9ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-02 05:28:52 +00:00
Justin Yun
a0bd05639e Merge "Add missing target from makefile" am: 857260905b am: 7c8ea9d79a
Original change: https://android-review.googlesource.com/c/platform/build/+/2372088

Change-Id: I4db49fe1d15a48fc9a4c2b96a9ac1a8d013bb50f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-02 04:49:43 +00:00
Android Build Coastguard Worker
4853fb7453 Make change and version bump to TQ2A.230102.001
Change-Id: I67b27d7025d871f2bcd24ab3c7c98ccc3d4dbfee
2023-01-02 02:59:40 +00:00
Android Build Coastguard Worker
9dbc43d370 Make change and version bump to TQ2A.230101.001
Change-Id: I7d9f9a57f5bb0cbb812f9e3282bd5ed8ed1b7c83
2023-01-01 02:59:39 +00:00
Android Build Coastguard Worker
c0df5d4be6 Make change and version bump to TQ2A.221231.001
Change-Id: Idc61eab46b6ed9be8ce29ba8b1e27ac22f851466
2022-12-31 02:59:29 +00:00
Android Build Coastguard Worker
a76d7e4ffc Make change and version bump to TQ2A.221230.001
Change-Id: I49e88f995df2a5b2251dfce15665669f20165e5c
2022-12-30 01:00:24 +00:00
Spandan Das
0c851c6534 Add missing target from makefile
The target was missing in the mk file, causing "commands commence before
first target" error.

Test: TH
Change-Id: I0ec4f636daf1171e81bf9c7c764b15e07a25fc80
2022-12-29 21:00:04 +00:00
Android Build Coastguard Worker
2a8b85b932 Make change and version bump to TQ2A.221229.001
Change-Id: I22349cd4b621946c056a577167bde8ecf036b450
2022-12-29 00:59:21 +00:00
Android Build Coastguard Worker
259d52b137 Make change and version bump to TQ2A.221228.001
Change-Id: I902c98e03b0f206e60de6bc1615736db1ab6bce0
2022-12-28 00:59:39 +00:00
Android Build Coastguard Worker
fee7a2e413 Make change and version bump to TQ2A.221227.001
Change-Id: I09efac1cddcd7a09586abc9ac275497107a4a9a0
2022-12-27 01:00:10 +00:00
Android Build Coastguard Worker
eb141a8b3b Make change and version bump to TQ2A.221226.001
Change-Id: I13285b4505b29bd469dd7bb32b9705a992ad3255
2022-12-26 02:59:35 +00:00
Android Build Coastguard Worker
c941cc1611 Make change and version bump to TQ2A.221225.001
Change-Id: I68683cf0db9ed8b3c38542718d75105152184585
2022-12-25 03:00:23 +00:00
Android Build Coastguard Worker
ddc59dd087 Make change and version bump to TQ2A.221224.001
Change-Id: If4c6dcaff9bda916916cb478920a3c1de6a79cc7
2022-12-24 02:59:04 +00:00
Android Build Coastguard Worker
a13cacd59a Make change and version bump to TQ2A.221223.001
Change-Id: Ic2973d35abb319bd877b98c97319c700d6100cea
2022-12-23 00:59:41 +00:00
Zhi Dou
b9ef653b9b Merge "Add condition check of KEEP_APEX_INHERIT" am: 9bfdaf1d55 am: 4ab0444a7d
Original change: https://android-review.googlesource.com/c/platform/build/+/2365228

Change-Id: I69e21964f2530ef11404d5520c53c13e8d64cb2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22 16:20:02 +00:00
Zhi Dou
9bfdaf1d55 Merge "Add condition check of KEEP_APEX_INHERIT" 2022-12-22 14:59:33 +00:00
Android Build Coastguard Worker
f36fc64f7d Make change and version bump to TQ2A.221222.001
Change-Id: Ic617cf7e5920e18cc0dc02a67a6d599a610ae7d3
2022-12-22 00:59:25 +00:00
Android Build Coastguard Worker
4c9a49741b Make change and version bump to TQ2A.221221.001
Change-Id: I68af77a21be850fb3dc5b22e67c1fddea3d335c4
2022-12-21 00:59:08 +00:00
Nick Chameyev
fa6e984572 Merge "Support SYSTEM_SERVER_JARS_EXTRA in dexpreopt" am: 839620e38c am: ed8d602609 am: 699d6097bc
Original change: https://android-review.googlesource.com/c/platform/build/+/2364199

Change-Id: Iba0484630f3a8407254063b2726bae75b6b1bc9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 16:45:58 +00:00
Jooyung Han
4d128218fd Merge "checkvintf --check-one with APEXes" am: 0561be3c26 am: 6c88e7e739 am: 8af0b3d7c5
Original change: https://android-review.googlesource.com/c/platform/build/+/2361400

Change-Id: I204a974249e9f1bee0f820ba24fdb5c7a551cab7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 16:45:00 +00:00
Zhi Dou
46ea5dc99a Add condition check of KEEP_APEX_INHERIT
Add environment variable KEEP_APEX_INHERIT condition check to set the
proper value of Soong conditional variable library_linking_strategy. If
the KEEP_APEX_INHERIT exists, the "min_sdk_version" in condition will be
set to "apex_inherit". For more detail:
https://docs.google.com/document/d/1R2vZw0cQa-haAMgFyQ682uSq9aGBNQrzMHKIsU17-XY/edit?usp=sharing&resourcekey=0-gUbs463r9LCKs7vdP_Xkmg

Test: build module locally, and check the corresponding change.
Presbumit
Bug: 254634795

Change-Id: I0ddc999a19d9f164477d69be0e4aebc91e06a3ad
Merged-In: Ic5da1c83b3b9c090bc2a24d36b1a4ac936ce1a59
2022-12-20 16:06:20 +00:00
Nick Chameyev
699d6097bc Merge "Support SYSTEM_SERVER_JARS_EXTRA in dexpreopt" am: 839620e38c am: ed8d602609
Original change: https://android-review.googlesource.com/c/platform/build/+/2364199

Change-Id: Iea60eb9d47fdfc409bdbe291aa9d2f630773bebf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 16:00:12 +00:00
Jooyung Han
8af0b3d7c5 Merge "checkvintf --check-one with APEXes" am: 0561be3c26 am: 6c88e7e739
Original change: https://android-review.googlesource.com/c/platform/build/+/2361400

Change-Id: Id63770753638d1b48f78ca801d966e71571de743
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 15:59:46 +00:00
Zhi Dou
7647a31437 Merge "Add condition check of KEEP_APEX_INHERIT" 2022-12-20 15:50:12 +00:00
Nick Chameyev
839620e38c Merge "Support SYSTEM_SERVER_JARS_EXTRA in dexpreopt" 2022-12-20 15:02:27 +00:00
Jooyung Han
0561be3c26 Merge "checkvintf --check-one with APEXes" 2022-12-20 14:44:29 +00:00
Android Build Coastguard Worker
df60f7cff9 Version bump to TQ2A.221220.002 [core/build_id.mk]
Change-Id: I4d681d793a9911898a4d6a0973a086d9c9591f3e
2022-12-20 02:10:41 +00:00
Android Build Coastguard Worker
9102fffa8e Make change and version bump to TQ2A.221220.001
Change-Id: Iafe5ed9bb0a09816ed61904f0622c7a50661ccff
2022-12-20 01:11:42 +00:00
Android Build Coastguard Worker
2c2af08b78 Version bump to TQ2A.221219.002 [core/build_id.mk]
Change-Id: Ia6c4fec09ccec52983455efcc5d69579e8bd08e9
2022-12-20 00:00:47 +00:00