Commit graph

82881 commits

Author SHA1 Message Date
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
Chih-hung Hsieh
380635abec Merge "Fix uninitialized value warnings." 2023-01-10 18:46:09 +00:00
Robert Shih
0f8236bb24 Merge "Initial add wvts to build" 2023-01-10 18:27:26 +00:00
Chih-hung Hsieh
951f8c3130 Merge "Make DeprecatedOrUnsafeBufferHandling not high severity" 2023-01-10 02:15:35 +00:00
Chih-Hung Hsieh
fed64e390f Fix uninitialized value warnings.
Bug: 263274255
Test: presubmit; make tidy-build-make_subset
Change-Id: I33c8b0b006732e4351a15774b50036d10ffd26b5
2023-01-10 00:52:02 +00:00
Cole Faust
5065c690dd Merge "Remove duplicates from VendorVars maps" 2023-01-09 22:50:04 +00:00
Chih-Hung Hsieh
1a1f90e49a Make DeprecatedOrUnsafeBufferHandling not high severity
This tidy check has been disabled by default globally,
in build/soong/cc/config/tidy.go.
Local projects can enable it to find/fix such issues,
but if not fixed, it should not be treated as a
high severity one and not to alarm daily builds.

Bug: 227361697
Test: warn.py --url=http://cs/android --separator='?l=' build.log > warnings.html
Test: warn.py --gencsv build.log > warnings.csv
Change-Id: Ifa65a788ddc6a67ed3250d5bed737c6e3b153617
2023-01-09 14:19:11 -08: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
Bill Yi
5c35eed416 Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" 2023-01-06 19:33:51 +00:00
Cole Faust
9a92b27cd8 Merge "Fix printing variables that have inherit references in them" 2023-01-06 19:11:34 +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
Joe Onorato
89a9f55d93 Merge "Pull common methods into shell_utils.sh, which can be included by scripts." 2023-01-05 20:10:10 +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
Treehugger Robot
17fb8e72a1 Merge changes from topic "regress"
* changes:
  Fix concurrency bug in bottom-up resolution walk.
  An ActionSet doesn't need to walk the graph.
  Create regression test to catch concurrency error
  Create regression test to catch WalkAction error.
  Fix tests so they can fail.
2023-01-04 03:07:20 +00:00
Bob Badour
f9d23a9f51 Fix concurrency bug in bottom-up resolution walk.
Concurrency is hard, and now that we no longer track origin it doesn't
improve performance in any meaningful way.

Bug: 261787132

Test: m droid dist compliance_dumpgraph compliance_dumpresolutions \
        compliance_sbom compliance_listshare compliance_rtrace \
        compliance_checkshare xmlnotice textnotice htmlnotice \
        compliancenotice_shippedlibs compliancenotice_bom

Test: m compliance_checkshare cts && \
        out/host/linux-x86/bin/compliance_checkshare out/host/linux-x86/gen/META/lic_intermediates/out/host/linux-x86/cts/android-cts.zip.meta_lic

Test: similar command as above for gts on internal

Test: m compliance_checksare droid dist && \
        out/host/linux-x86/bin/compliance_checkshare out/target/product/sunfish/gen/META/lic_intermediates/out/target/product/sunfish/obj/PACKAGING/systemimage_intermediates/system.img.meta_lic

Change-Id: I57a75927bf879c3ce6603049d8d583211dc0ce29
2023-01-04 00:02:02 +00:00
Bob Badour
3fe369c271 An ActionSet doesn't need to walk the graph.
Resolutions map back to the root, but actions do not. An iteration
works just fine.

Simplify TargetNodeSet so that it is directly iterable.

Bug: 261787132

Test: m droid dist compliance_dumpgraph compliance_dumpresolutions \
        compliance_sbom compliance_listshare compliance_rtrace \
        compliance_checkshare xmlnotice textnotice htmlnotice \
        compliancenotice_shippedlibs compliancenotice_bom

Test: m compliance_checkshare cts && \
        out/host/linux-x86/bin/compliance_checkshare out/host/linux-x86/gen/META/lic_intermediates/out/host/linux-x86/cts/android-cts.zip.meta_lic

Change-Id: Ic5a2d809b5a9a47b5d85f61e3a4a790dbe8f5fd2
2023-01-04 00:01:49 +00:00
Bob Badour
42b02efd05 Create regression test to catch concurrency error
The bottom-up walk to resolve conditions treats "already started" as
"alreay finished".

Bug: 261787132

Test: m compliance_checkshare
Change-Id: Ibb548bd4f5464b47682633878d475dfe011df3e1
2023-01-04 00:01:36 +00:00
Bob Badour
36f4a72aa7 Create regression test to catch WalkAction error.
Bug: 261787132

Test: m compliance_checkshare

Change-Id: I9f6a39a7f1cf50f9a0134b16f68d33f171cf7f13
2023-01-04 00:01:26 +00:00
Bob Badour
a6ee6d5511 Fix tests so they can fail.
Expected values were overwriting actual values.

Origin no longer tracked.

Bug: 261787132

Test: m droid dist

Test: m compliance_checkshare

Change-Id: Ie1fbc3d596cb08c6f0935a79441d8b00a4d1eb97
2023-01-04 00:01:03 +00:00
Joe Onorato
344e404abb Pull common methods into shell_utils.sh, which can be included by scripts.
So we can stop copying gettop and others all over the place.

Test: manual
Bug: 260003429
Change-Id: Ic1b5d6bec8726d9253fb33ec588e503d6fc8167a
2023-01-03 14:12:43 -08:00
Treehugger Robot
0ffb3e522e Merge "Revert "Define vendor-hwasan-snapshot target"" 2023-01-03 16:59:10 +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
857260905b Merge "Add missing target from makefile" 2023-01-02 03:46:16 +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
9bfdaf1d55 Merge "Add condition check of KEEP_APEX_INHERIT" 2022-12-22 14:59:33 +00:00
Chih-hung Hsieh
cef5fbb2e9 Merge "Fix uninitialized value warnings." 2022-12-22 00:06:15 +00:00
Treehugger Robot
54c5f0d0df Merge "Allow build_image.py to build vbmeta partition" 2022-12-21 20:38:49 +00:00
Chih-Hung Hsieh
442e08ffa7 Fix uninitialized value warnings.
Bug: 263274255
Test: presubmit; make tidy-build-make_subset
Change-Id: Ib6ce849596312f56e8d640c5f78e0e70f7ca54e3
2022-12-20 16:51:53 -08:00
Kelvin Zhang
37bc304a3d Allow build_image.py to build vbmeta partition
Cuttlefish needs to rebuild vbmeta at runtime, instead of duplicating
logic in cuttlefish tooling, re-use these logic in release tools.

Test: build_image $OUT misc_info.txt /tmp/vbmeta.img /tmp/otatols
Bug: 149866755
Change-Id: I2050f9e2dd7eed9b81a49a8442ec199147041d20
2022-12-20 10:59:58 -08: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
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
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
Jiyong Park
ad4df54d6c Merge "Place unstripped pvmfw image to the symbols directory" 2022-12-19 02:33:23 +00:00
Treehugger Robot
ded89ff976 Merge "Remove dalvik.vm.usejitprofiles system property." 2022-12-16 18:51:08 +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
b1cf7a7e66 Merge "Remove linkerconfig from base_system" 2022-12-14 07:16:12 +00:00
Treehugger Robot
d6184bc4c2 Merge "Add arch variants for Intel Atom CPUs" 2022-12-14 03:32:13 +00:00
Treehugger Robot
8998fd723e Merge "Make clear_var_list set nonexistant variables to empty strings" 2022-12-14 00:20:36 +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
Greg Kaiser
14b12d9e31 Merge "Add rbc implementation of clear_var_list" 2022-12-13 20:50:00 +00: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
Jooyung Han
be6f3a146d Remove linkerconfig from base_system
Linkerconfig is served by com.android.runtime APEX which is already
listed in base_system (via runtime_libart.mk).

Bug: 260982509
Bug: 262330207
Test: MicrodroidAppTest
Test: vm run-microdroid
Change-Id: I2451526cb42be1ad60dcec3ae477fad2b9df9f83
2022-12-13 18:21:56 +09:00
Treehugger Robot
2dcc38701b Merge "Finalize resources before updating API." 2022-12-11 07:05:43 +00:00
Alex Buynytskyy
b0adb5ad41 Finalize resources before updating API.
Bug: 243966946
Test: run locally
Change-Id: Ie4b14b191b10f4a473da1b5ca3d9622d1f90a3f7
2022-12-11 03:21:29 +00:00
Xin Li
7701612421 Merge "Merge Android 13 QPR1" 2022-12-09 21:51:24 +00:00
Xin Li
3cdf392f61 Merge Android 13 QPR1
Bug: 261731544
Merged-In: Idccbf36672703b1e9a6b27bf117459284bc7ed26
Change-Id: I3c0651138a35d0ec3289be1b0e6873bba57593b4
2022-12-09 10:23:02 -08:00