tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
83254 commits 1 branch 0 tags 119 MiB
Commit graph

32686 commits

Author SHA1 Message Date
Xin Li
3e266be1a6 Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136" into stage-aosp-master 2023-01-13 07:32:57 +00:00
Xin Li
d8cc7f97ad Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 
Bug: 264720040
Merged-In: Iea5b6fffed7c27855d87e35292f07a56686e4197
Change-Id: I912db6aac23dc5ee37b8b4455eec553da31d6dbc
 2023-01-11 22:54:26 -08:00
Jooyung Han
8ee63e4ee8 Merge "vendor/etc/linker.config.pb from multiple input files" 2023-01-12 06:46:39 +00:00
Dan Sinkiewicz
e61203da9c Merge "Revert "Initial add wvts to build"" 2023-01-10 18:56:57 +00:00
Robert Shih
57fe3f6041 Revert "Initial add wvts to build" 
This reverts commit 588f2e62da.

Reason for revert: b/265032293

Change-Id: I6a9dd24cfef2256288170f5bf59d24604f05d4d2
 2023-01-10 18:51:18 +00:00
Robert Shih
0f8236bb24 Merge "Initial add wvts to build" 2023-01-10 18:27:26 +00:00
Jooyung Han
da2d4a29bf vendor/etc/linker.config.pb from multiple input files 
When we have dedicated .mk files for each modules (e.g. usb, drm, etc)
and those modules have their own linker configuration requirements, it
would make more sense to have "fragments" for linker configuration.

This change introduces a new list variable to store the list of linker
configuration fragments. When it's set, vendor/etc/linker.config.pb is
generated from the list of input fragments.

Bug: 264330513
Test: set PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS
Test: m vendorimage (generates vendor/etc/linker.config.pb)
Change-Id: I9eed0f90add0191885b7195efdab94b5b1a4a62d
 2023-01-10 11:57:23 +09:00
Cole Faust
5065c690dd Merge "Remove duplicates from VendorVars maps" 2023-01-09 22:50:04 +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
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot
703c7b2789 Merge "Add SystemUI build flag for Compose code" into tm-qpr-dev-plus-aosp 2022-12-19 19:33:00 +00:00
Nick Chameyev
3bb4b5d759 Support SYSTEM_SERVER_JARS_EXTRA in dexpreopt 
Updates hardcoded /system path to use
the qualifier before colon to support
/system_ext paths in dex_preopt.mk.

Bug: 155630745
Test: m dist droid with a system server
  library on a system_ext partition

Change-Id: I4dccc1f55bd2cafa13d57b46f122c44f66da335b
 2022-12-19 16:27:04 +00:00
Jordan Demeulenaere
4853157ef9 Add SystemUI build flag for Compose code 
Bug: 242304109
Test: N/A
Change-Id: Ib6e248b7af7031435a6f5398e6c8afef42459a57
 2022-12-19 16:51:15 +01:00
Jiyong Park
54b5700954 Merge "Place unstripped pvmfw image to the symbols directory" am: ad4df54d6c am: e1632f7cbf 
Original change: https://android-review.googlesource.com/c/platform/build/+/2361399

Change-Id: Id9f99b9989b8b1db5f9966c3d7208fe04c00a8a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-19 03:45:08 +00:00
Jiyong Park
ad4df54d6c Merge "Place unstripped pvmfw image to the symbols directory" 2022-12-19 02:33:23 +00:00
Jooyung Han
c9cc48b412 checkvintf --check-one with APEXes 
checkvintf --check-one is to check the consistency of VINTF data in a
single partition. To read VINTF from /vendor partition, it should read
/apex as well to gather VINTF from vendor apexes.

Bug: 262189711
Test: m check-vintf-all
Change-Id: I70b194f4dae47ca6080dcdfb3baa69ac7da9b653
 2022-12-16 16:12:29 +09:00
Jiyong Park
e219f0068a Place unstripped pvmfw image to the symbols directory 
Bug: 245896220
Test: examine the symbols.zip file on aosp_cheetah
Change-Id: I8730baa64e6ff16fcdf765dc8878771d2ec16be8
 2022-12-16 14:30:03 +09:00
Treehugger Robot
50b6700350 Merge "Add arch variants for Intel Atom CPUs" am: d6184bc4c2 am: 8165ae0745 
Original change: https://android-review.googlesource.com/c/platform/build/+/2301583

Change-Id: I44d9c54c8a534486e9b34fd172d57ed1f4b9541f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-14 04:21:41 +00:00
Treehugger Robot
d6184bc4c2 Merge "Add arch variants for Intel Atom CPUs" 2022-12-14 03:32:13 +00:00
Treehugger Robot
33b7fcd3ce Merge "Make clear_var_list set nonexistant variables to empty strings" am: 8998fd723e am: e2e127b270 
Original change: https://android-review.googlesource.com/c/platform/build/+/2351362

Change-Id: I56835cccc5dee6ddcea19122a5b69ee112ee5510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-14 01:18:01 +00:00
Greg Kaiser
63964a0a93 Merge "Add rbc implementation of clear_var_list" am: 14b12d9e31 am: 44a151e2f7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2347174

Change-Id: I65067ead3251acaf3fb55a647dc5265b5817d39e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 22:07:55 +00:00
Cole Faust
44de6d8f7a Make clear_var_list set nonexistant variables to empty strings 
Make's clear-var-list causes the variables to exist as empty strings.
Mimic that functionality in starlark for the variable diff and ?=.

Bug: 262303006
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: I5f9c8cf342d875b1022c5c74906e59fa68fcd6c9
 2022-12-13 13:02:10 -08:00
Cole Faust
8397c8efee Add rbc implementation of clear_var_list 
Bug: 262303006
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: Ib5d7d37a7d7fa40ec990d9506fe0bef7da5b5bcd
 2022-12-13 10:17:16 -08:00
Steve Berbary
1c8baeee29 Update Security String to 2023-02-05 am: 79e595f4e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665950

Change-Id: I0ccfc13d0e98ea3b06c57011a580418ee89ea433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 19:31:06 +00:00
Treehugger Robot
5d2b697887 Merge "Default to not generating modules.dep for system side" am: 8a9dffb96e am: 9c3e22139d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2332648

Change-Id: I8062314a4830be585e762ea6b7d771a822e93cbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 01:47:57 +00:00
Treehugger Robot
9c3e22139d Merge "Default to not generating modules.dep for system side" am: 8a9dffb96e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2332648

Change-Id: I13f75e085be2526441c53f8df2e200a29991c36d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 01:25:51 +00:00
Treehugger Robot
8a9dffb96e Merge "Default to not generating modules.dep for system side" 2022-12-08 01:03:07 +00:00
Steve Berbary
79e595f4e3 Update Security String to 2023-02-05 
Bug: 261738635
Change-Id: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f
 2022-12-07 19:17:24 +00:00
Kelvin Zhang
395d3df406 Default to not generating modules.dep for system side 
Test: th
Bug: 149866755
Change-Id: I36c26bed46f43ca8ff7d4afdaf3ee1d7e1c70c3f
 2022-12-07 10:36:10 -08:00
Treehugger Robot
16085dd465 Merge "Fix typo in cross partition dependency generation" am: 3de79b1806 am: 4e983209c7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2329889

Change-Id: Ifbfe1fb17c1e7da40266a050af023197ff47bf68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-07 05:07:00 +00:00
Treehugger Robot
4e983209c7 Merge "Fix typo in cross partition dependency generation" am: 3de79b1806 
Original change: https://android-review.googlesource.com/c/platform/build/+/2329889

Change-Id: I81655d0dc7410e2e0ecc44bdb7ad7f353f475b14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-07 04:26:47 +00:00
Treehugger Robot
3de79b1806 Merge "Fix typo in cross partition dependency generation" 2022-12-07 03:33:42 +00:00
Kelvin Zhang
21b6cade74 Fix typo in cross partition dependency generation 
intention was to symlink modules in vendor_dlkm to system_dlkm. Typo
caused the same modules to link itself.

Test: build, make sure vendor_dlkm's modules.dep contains system
dependency

Change-Id: I19664cd9a8578566d3a038885b8ce27556801a79
 2022-12-06 16:31:02 -08:00