Commit graph

32676 commits

Author SHA1 Message Date
Treehugger Robot
a154b87205 Merge "Merge TQ1A.230205.002" 2023-02-08 10:40:37 +00:00
Treehugger Robot
5683ef1934 Merge "Use the init_boot partition name with avb for prebuilt" 2023-02-08 01:38:11 +00:00
Treehugger Robot
6086c5ce5f Merge "Make words() work on a list of non-strings" 2023-02-08 00:52:24 +00:00
Cole Faust
2b5b3f3be8 Make words() work on a list of non-strings
words() attempts to join all the elements of a list
and then resplit them to more closely match make.
But sometimes, like when calling words() on a product
variable, not all of the elements are strings. In
that case, just return the list unchanged.

Bug: 267407943
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: I738d0c86c8935f446807cc79623f796e8cae3c01
2023-02-07 12:28:47 -08:00
Jiakai Zhang
d5d8904e52 Don't disable dexpreopt for an unbundled build.
Dexpreopt generates profiles that need to be installed in the APEX.
Soong will skip the dex2oat step after it generates the build rule for
profiles.

Bug: 241823638
Test: -
  1. Patch ag/20581649 PS2.
  2. banchan com.android.btservices x86_64 && m
  3. Check that "javalib/service-bluetooth.jar.prof" exists in the APEX.
Change-Id: I5cad1b0e1027935fd78e80ad7b07e039f7b8d432
2023-02-08 03:47:24 +08:00
Xin Li
fc740c9920 Merge TQ1A.230205.002
Bug: 263898609
Merged-In: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f
Change-Id: I6c6ce54d95ea5b44d4907a710e36f2fcd80991a6
2023-02-06 21:07:34 -08:00
Devin Moore
77ae07dc5b Use the init_boot partition name with avb for prebuilt
When building a target with a prebuilt init_boot image, we still need to
use the correct name for the image.

Test: m
Bug: 268050089
Change-Id: I8fd11d8c17c2c140b7cff1dd8255c8b8728ea196
2023-02-06 17:25:06 +00:00
Jared Duke
7e559f9c24 Merge "Further refine VisibleForTesting rules" 2023-02-02 16:34:49 +00:00
Jared Duke
da0d73e580 Further refine VisibleForTesting rules
Additional analysis revealed more edge cases where external library
code was getting kept unnecessarily. Further refine the keep rules to
avoid these cases. Now, we only apply keep globally for the
`com.android.internal.annotations.VisibleForTesting` annotation.

VisibleForTesting annotations defined externally (e.g., by androidx or
guava) will *only* be respected in platform-defined packages. This
helps trim unused code from deps like gRPC and Dagger, saving up to
~hundreds of KB per package that uses these libraries.

Bug: 248580093
Test: m + verify exclusion of external test code (e.g., from dagger)
Change-Id: Iab7559c08d3ae1ac74f18e3cf3a1b4828a3736cf
2023-02-02 16:33:34 +00:00
Sam Delmerico
7f6fc715ba Merge "Revert "remove unneeded dontwarn settings"" 2023-02-01 16:01:32 +00:00
Sam Delmerico
4731ab7282 Revert "remove unneeded dontwarn settings"
This reverts commit 59570d1e64.

Reason for revert: we still need these flags

Change-Id: I8caa6350f0b62e6aa2a190e128d5ce7d8f849ea8
2023-01-31 20:14:18 +00:00
Eran Messeri
1f5aa11437 Merge "AOSP: Added new properties for attestation" 2023-01-31 13:43:55 +00:00
Treehugger Robot
43cbca31e6 Merge "Add support for packaging modules.load.recovery into vendor_kernel_boot" 2023-01-27 22:55:58 +00:00
Dennis Shen
ef83ce6a79 Merge "Set soong config variable TrimmedApex" 2023-01-27 13:11:50 +00:00
Shikha Panwar
44eccdd471 Merge "Include initrd_bootconfig in the list of OTA tools" 2023-01-27 12:11:10 +00:00
Vincent Donnefort
6133aea40f Merge "Add null and console dev nodes to the Android initramfs" 2023-01-26 09:04:33 +00:00
Zhenhuang Wang
fae06b15ce Enable -sha256 feature to some Soong built zip files
Enable the new soong_zip feature to general-tests.zip,
host-unit-tests.zip, android-cts.zip, android-mts.zip etc. This is a
following change of https://r.android.com/2395452. With `-sha256` flag,
file header of generated zip files contains SHA256 checksum for each
file, which can then be used by downstream systems.

Bug: 259513199
Test: run `m dist host-unit-tests general-tests cts mts` and check zip
    files under `out/dist/`
Change-Id: I726b5261d177beadcd8f707e2cd2cb5cdef20273
2023-01-26 13:49:57 +08:00
Isaac J. Manjarres
3a7fe9184b Add support for packaging modules.load.recovery into vendor_kernel_boot
Add support for creating a modules.load.recovery file in the
vendor_kernel_boot image when
BOARD_VENDOR_KERNEL_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD is specified.

Bug: 266752750
Change-Id: I430b785c13dca84949da5032e05025385168df07
Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com>
2023-01-25 17:33:18 -08:00
Treehugger Robot
e9c253fe31 Merge "Fix remote execution of r8 and d8 in make" 2023-01-25 23:13:07 +00:00
Treehugger Robot
13556c40c3 Merge "Add GLOBAL_CLANG_CFLAGS_64_NO_OVERRIDE support to Make" 2023-01-25 19:07:48 +00:00
zijunzhao
deaf24812d Add GLOBAL_CLANG_CFLAGS_64_NO_OVERRIDE support to Make
Bug: b/261642850
Test: Build and check warnings. Add two xfail tests in art and see the
results locally.

Change-Id: I122ee2cbfa37bdb71026781efe6cb7131b873ae0
2023-01-25 04:06:34 +00:00
Dennis Shen
c320615931 Set soong config variable TrimmedApex
BUG: b/259381334
TEST: adbd banchan build with setting on and off
Change-Id: I67220735f3a6cb35a8a8676b58e433d97223e428
2023-01-24 20:04:03 +00:00
Sam Delmerico
59570d1e64 remove unneeded dontwarn settings
Some of these -dontwarn settings were added because r8 did not have access to transitive dependencies. Now these dependencies are passed as -libraryjars we can remove some of the -dontwarns.

Test: TARGET_BUILD_VARIANT=userdebug MODULE_BUILD_FROM_SOURCE=true \
  UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true \
  packages/modules/common/build/mainline_modules_arm64.sh -j120
Bug: 242088131
Change-Id: I408a8f3ac9d11c1bd6608f2a18fd2291db8c9275
2023-01-24 11:52:42 -05:00
Prashant Patil
7d9cda1883 AOSP: Added new properties for attestation
Added new properties, which could be set for AOSP/GSI builds.
These properties are going to be used for attestation feature through
Build.java class. Earlier in AOSP builds attestation ids were different
from provisioned ids in Keymint. These properties will be identical to
provisioned ids.

Bug: 110779648
Bug: 259376922
Test: atest VtsAidlKeyMintTargetTest:PerInstance/NewKeyGenerationTest#EcdsaAttestationIdTags/0_android_hardware_security_keymint_IKeyMintDevice_default
Test: atest VtsAidlKeyMintTargetTest:PerInstance/NewKeyGenerationTest#EcdsaAttestationIdTags/1_android_hardware_security_keymint_IKeyMintDevice_strongbox
Test: atest CtsKeystoreTestCases:android.keystore.cts.KeyAttestationTest CtsKeystoreTestCases:DeviceOwnerKeyManagementTest

Change-Id: I9eea5e0f2fabc667b3efedeeefdf12e7b4fc9502
2023-01-24 16:47:54 +00:00
Kelvin Zhang
0841b9076b Fix dependency issues for vbmeta.img target
Extra space in variable names causes dependencies for
INSTALLED_VBMETAIMAGE_TARGET to be missing. Remove extraneous sspaces.

Bug: 263568805
Test: lunch cuttlefish,  m distclean, m, and check
$OUT/vbmeta_vendor_dlkm.img

Change-Id: If818a8af42c407a7213f58a7142dffb9dee1fd16
2023-01-23 11:12:26 -08:00
Baligh Uddin
9170e897d0 Package blkid_static in otatools
BUG: 264426585
Test: TH
Change-Id: Ie34719e98619d18dc35add80595eddd867eaf38f
2023-01-19 18:20:55 +00:00
Benjamin Peterson
099349bea8 Fix remote execution of r8 and d8 in make
1. The location of the r8.jar and d8.jar files was no longer correct.
2. $(JAVA) was not defined before rbe.mk was included.
3. $(JAVA) includes options, which much be stripped to be a rewrapper toolchain input.

Test: ran against an RBE cluster with RBE_D8_EXEC_STRATEGY=remote and RBE_R8_EXEC_STRATEGY=remote

Change-Id: Icf434f5c0fda687c70c75b01b0bfd63bcd8cc474
2023-01-19 18:17:08 +00:00
Treehugger Robot
2797146c86 Merge "Fix generic ramdisk build failures on dedicated recovery partitions" 2023-01-18 19:25:57 +00:00
Treehugger Robot
854afb6673 Merge "Remove usages of SOONG_MODULES_CFLAG_ARTIFACTS" 2023-01-18 18:07:07 +00:00
Treehugger Robot
e473190d52 Merge "Resubmit: Initial add wvts to build" 2023-01-18 00:17:45 +00:00
Cole Faust
bd5eab8477 Remove usages of SOONG_MODULES_CFLAG_ARTIFACTS
No longer used.

Bug: 262629589
Test: m nothing
Change-Id: I3d9acf9fc3e205588161c9fb50fbe757f764d6bb
2023-01-17 15:38:33 -08:00
Kelvin Zhang
1143aaf772 Fix generic ramdisk build failures on dedicated recovery partitions
For targets with BoardUsesRecoveryAsBoot set to true, binaries in
generic_ramdisk are installed to $OUT/recovery/root/first_stage_ramdisk
This path is not on generic_ramdisk.mk 's allowlist, hence build fails.
To fix the failure, add $OUT/recovery/root/first_stage_ramdisk/system to
allow list.

Test: th, lunch eos-userdebug(a dedicated recovery partition target) and build.

Bug: 265477065
Change-Id: I89cf229adc028a7e5de632b9a3188ecb411de735
2023-01-17 17:11:55 +00:00
Treehugger Robot
b80d9d6c33 Merge "Allow vendors to add custom vbmeta partitions" 2023-01-14 00:23:02 +00:00
Shikha Panwar
d3bef475b2 Include initrd_bootconfig in the list of OTA tools
initrd_bootconfig is required for signing the virt apex & hence needs to
run outside the source tree as well.

Test: NA
Bug: 245277660
Change-Id: Id1776661e76a75cfb3cf530e7777dc4292522dd0
2023-01-13 08:28:44 +00:00
Kelvin Zhang
b81b4e3621 Allow vendors to add custom vbmeta partitions
Currently we only have vbmeta_system and vbmeta_vendor. Add
BOARD_AVB_VBMETA_CUSTOM_PARTITIONS , which allows OEMs to define
their own vbmeta_*.img partitions. example: aosp/2381823

Bug: 263568805
Change-Id: Id671e2c3aee9ada90256381cce432927df03169b
2023-01-12 17:34:42 -08:00
Vincent Donnefort
4a5fd836a1 Add null and console dev nodes to the Android initramfs
/dev/null is a security requirement for bionic, /dev/console is needed
so the kernel can set-up stdout stderr and stdin before running /init.

Bug: 254835242
Change-Id: I865856885e9957ea17e28b62273e701af9bfc56f
2023-01-12 11:25:14 +00:00
Jooyung Han
8ee63e4ee8 Merge "vendor/etc/linker.config.pb from multiple input files" 2023-01-12 06:46:39 +00:00
Robert Shih
1b73bfbd97 Resubmit: Initial add wvts to build
[ Merge of pa/2264578 ]

Test: make wvts

Bug: 209663123
Change-Id: If1382ed06a93bc34d327ee88bf46ff290e84f786
2023-01-11 00:55:50 +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
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
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
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
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
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
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
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
d6184bc4c2 Merge "Add arch variants for Intel Atom CPUs" 2022-12-14 03:32:13 +00:00
Android Build Coastguard Worker
13bcf56131 Make change and version bump to TQ1A.230205.001
Change-Id: I98d628dea8e10d7603e0478db7de2e78ce14775b
2022-12-14 02:29:47 +00:00
Steve Berbary
398ff1a8b6 Update Security String to 2023-02-05
Bug: 261738635
Change-Id: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f
(cherry picked from commit 79e595f4e3)
Merged-In: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f
2022-12-14 02:23:24 +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
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
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
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
Treehugger Robot
7279c72b74 Merge "Generate cross partition kernel module dependencies" am: b4b8760144
Original change: https://android-review.googlesource.com/c/platform/build/+/2325560

Change-Id: I631211f39ada0d0ff483183a5788f817676c14a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 07:58:01 +00:00
Treehugger Robot
b4b8760144 Merge "Generate cross partition kernel module dependencies" 2022-12-06 07:30:56 +00:00
Kiyoung Kim
987e4d6fa6 Merge "Append LLNDK libraries in the APEX to the system linker config" am: eb3af10b0b
Original change: https://android-review.googlesource.com/c/platform/build/+/2322555

Change-Id: Ifd524a5f1a2b9501d6a2fc00d2e1a70ffa4fc5ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 00:56:27 +00:00
Kiyoung Kim
eb3af10b0b Merge "Append LLNDK libraries in the APEX to the system linker config" 2022-12-06 00:48:15 +00:00
Treehugger Robot
cd3204570b Merge changes I745168c4,I5d854b5d am: 2f7570efc9
Original change: https://android-review.googlesource.com/c/platform/build/+/2328796

Change-Id: I4acc19e7696bb7153c40e43332ca0531bf69725e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 00:20:37 +00:00
Ivan Kozlov 🤷🏻‍♂️
28a3ea8628 Merge "Add catbox owners to the OWNERS file" am: 8ca7184bed
Original change: https://android-review.googlesource.com/c/platform/build/+/2325564

Change-Id: I051cb5e69d62c015453be6e3a2d772c19cc821f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 00:19:49 +00:00
Spandan Das
c98a1d9367 Merge "New product config flag to gate blueprint modules" am: ed055c7f7d
Original change: https://android-review.googlesource.com/c/platform/build/+/2296764

Change-Id: If6ba0e6a4a9c9251095a2dbb1f0cf44009bfad50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 00:18:11 +00:00
Treehugger Robot
2f7570efc9 Merge changes I745168c4,I5d854b5d
* changes:
  Split envsetup.sh PATH setting into lunch-dependent and lunch-independent values
  Lock down envsetup.sh to a small number of people
2022-12-06 00:15:30 +00:00
Ivan Kozlov 🤷🏻‍♂️
8ca7184bed Merge "Add catbox owners to the OWNERS file" 2022-12-06 00:10:11 +00:00
Spandan Das
ed055c7f7d Merge "New product config flag to gate blueprint modules" 2022-12-05 23:50:23 +00:00
Kelvin Zhang
902eefd65b Merge "Allow empty modules.load file to be generated" am: ac296d5cc6
Original change: https://android-review.googlesource.com/c/platform/build/+/2325265

Change-Id: Ib1f3ea10dae94a331cb568bd557b91786e9a655b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 23:03:50 +00:00
Kelvin Zhang
d5f06113b7 Generate cross partition kernel module dependencies
Kernel modules in vendor_dlkm might have dependency on system_dlkm. To
correctly generate modules.dep files, copy system_dlkm modules to depmod
staging dir before calling depmod.

Test: m, check $OUT/vendor_dlkm/lib/modules/module.dep, make sure it
contains dependency on /system/lib/modules
Bug: 149866755

Change-Id: Ibdf6d63df1413543471a3d18108eba6fdcde9ba4
2022-12-05 15:01:18 -08:00
Kelvin Zhang
ac296d5cc6 Merge "Allow empty modules.load file to be generated" 2022-12-05 22:36:08 +00:00
Treehugger Robot
d2fe273089 Merge "target_files: Package pvmfw.bin under PVMFW/" am: 056f6b2d46
Original change: https://android-review.googlesource.com/c/platform/build/+/2238519

Change-Id: Ia8f3972e24e08a1074ed5e4451fd0d442232bebb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 22:27:57 +00:00
Treehugger Robot
056f6b2d46 Merge "target_files: Package pvmfw.bin under PVMFW/" 2022-12-05 22:00:43 +00:00
Joe Onorato
7c3a77f4c9 Split envsetup.sh PATH setting into lunch-dependent and lunch-independent values
This gets b (and other scripts that are coming soon) into the path without running lunch.

Also gets rid of the make dumpvar ANDROID_BUILD_PATHS variable, used to set a few more paths,
so that the setting is all in one place, now that the get_abs_build_var is cached.

Test: Lots of manual checks of before and after combinations
Change-Id: I745168c43ccf2fef4cdd22657fd087f1ad07e510
2022-12-05 13:13:37 -08:00
Kelvin Zhang
b66b11ec9a Allow empty modules.load file to be generated
Currently, if BOARD_*_KERNEL_MODULES_LOAD is set to empty string, we
default to load all modules listed in BOARD_*_KERNEL_MODULES. For
system_dlkm, we do not want to load any modules unless they are
dependency of vendor kernel modules. Therefore we need to create an
empty modules.load file for system_dlkm. Add 'false' as an out of band
value to indicate that an empty modules.load file should be generated.

Bug: 149866755
Test: th
Change-Id: Ieaaeb2f9a824e97671acff465bbd4da83dfd9aa0
2022-12-05 13:04:42 -08:00
Treehugger Robot
44b902c9b4 Merge "Handle non-module fsv_meta files." am: 33544af4d1
Original change: https://android-review.googlesource.com/c/platform/build/+/2320963

Change-Id: I2c8e105e1e8531015b5c74ff49b7776f90ade866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:01:07 +00:00
Spandan Das
00114d4418 New product config flag to gate blueprint modules
Example usage:
PRODUCT_INCLUDE_TAGS += use_myspecial_sdk

This also populates the allowlist with go/nogo mainline tags. Usage of
`PRODUCT_INCLUDE_TAGS` outside this allowlist will raise an error
in product config

Test: TH

Change-Id: Ica82a8f65cbfda600d72fc54fb873c1eaa1666a7
2022-12-05 19:47:12 +00:00
Treehugger Robot
33544af4d1 Merge "Handle non-module fsv_meta files." 2022-12-05 19:21:22 +00:00
Pierre-Clément Tosi
03975ed738 target_files: Package pvmfw.bin under PVMFW/
Add the pvmfw.bin binary to the target_files archive to bring back
ATC-based change detection for pvmfw (which compares the content of
PVMFW/ between builds) and therefore bring back our TreeHugger
pre-submit tests for it. Those were introduced in c7b837872d ("Create
$(zip_root)/PVMFW & archive prebuilt used") but inadvertently removed
in d000004876 ("core: Get pmvfw.img partition from Soong").

Bug: 261393794
Test: m target-files-package
Change-Id: I0141d59154b54641cb348af3b98fe12624d5939e
2022-12-05 13:08:34 +00:00
TreeHugger Robot
9b59800aa0 Merge "Merge TQ1A.221205.012" into stage-aosp-master 2022-12-03 00:47:49 +00:00
Ivan Kozlov
67b97d2998 Add catbox owners to the OWNERS file
Test: N/A
Bug: 226980239
Change-Id: Ie7deb9f91b54eea8a473fb704148d080cef8b525
2022-12-02 16:30:57 -08:00
Bob Badour
2cd353631d Handle non-module fsv_meta files.
These are binary data files--not copyrightable.

Test: m droid dist reportmissinglicenses

Change-Id: Ifb0e23aec2a1a834c66b3eb7f93acc677f552650
2022-12-02 21:06:00 +00:00
Treehugger Robot
aefec234aa Merge "Fix copy+paste error" am: 187a6be0f7
Original change: https://android-review.googlesource.com/c/platform/build/+/2324116

Change-Id: I7c463efe1a7315147c54fbe92f36bf64c14d9007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-02 05:20:48 +00:00
Treehugger Robot
187a6be0f7 Merge "Fix copy+paste error" 2022-12-02 05:04:41 +00:00
Bob Badour
e5b7a4205e Fix copy+paste error
Fix declare-copy-target-license-metadata

Test: m droid reportmissinglicenses

Change-Id: I5c8ee1109f9b83232bf66218d44ed05f97377a98
2022-12-01 17:56:33 -08:00
Treehugger Robot
577bd161cf Merge "Define vendor-hwasan-snapshot target" am: f16593490f
Original change: https://android-review.googlesource.com/c/platform/build/+/2301708

Change-Id: I1fd3adee29cd92febb0b0c0637b5d3f87cab2745
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-02 00:25:06 +00:00
Treehugger Robot
f16593490f Merge "Define vendor-hwasan-snapshot target" 2022-12-02 00:20:03 +00:00
Ramji Jiyani
8910f3eb61 Merge "system_dlkm: Remove manual module copy" am: 40a1333138
Original change: https://android-review.googlesource.com/c/platform/build/+/2323114

Change-Id: Id18356e6dd0656fd2b505ba3def929f3b3d24f9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01 20:23:44 +00:00