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

33561 commits

Author SHA1 Message Date
Treehugger Robot
580e468a2b Merge "Fix whitespace in soong_config_set calls" am: a43178f9f0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2576350

Change-Id: I2716214f0c2e92076883001e0b47ff154b867046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 23:09:06 +00:00
Treehugger Robot
a43178f9f0 Merge "Fix whitespace in soong_config_set calls" 2023-05-02 22:26:06 +00:00
Cole Faust
3736374dfe Fix whitespace in soong_config_set calls 
In make, soong_config_set uses an $(eval) to set it's value, expanding
the value of the soong config variable _before_ evaluating the value.
Because of this, make will strip trailing whitespace like it does on
regular assignments.

Make rbcrun match this behavior.

Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: I907e85cdf50f6fac54331c0d1044f0d53bec22ed
 2023-05-02 10:11:02 -07:00
Treehugger Robot
03ceb1b56e Merge "Remove config for 64-bit binder ABI" am: 8844e4f145 
Original change: https://android-review.googlesource.com/c/platform/build/+/2553826

Change-Id: If2ef5b329f9e246b50c1a2188a45f87677646e57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 22:16:16 +00:00
Treehugger Robot
8844e4f145 Merge "Remove config for 64-bit binder ABI" 2023-05-01 21:32:30 +00:00
Kalesh Singh
97b11a5794 Merge "16k: Add ro.product.cpu.pagesize.max property" am: a5530711fb 
Original change: https://android-review.googlesource.com/c/platform/build/+/2545851

Change-Id: Ib3bc4aed0cd88d80b3d1406e026b59ce8bf2c723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 18:44:57 +00:00
Kalesh Singh
a5530711fb Merge "16k: Add ro.product.cpu.pagesize.max property" 2023-05-01 18:08:11 +00:00
Daniel Zheng
e05a15bfed Updating fastboot-info version 
Updating version to single number

Test: m fastboot_info
Change-Id: If4754f1cedd9cc1f57ffdfbb73e7e4cc7ced4799
 2023-05-01 11:07:33 -07:00
Treehugger Robot
ec7016d160 Merge "Enable HWASan for multiple modules in one place(Make)" am: 6d406f854e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2495518

Change-Id: I229d3bba8e595af529679fb8c9efbaa51e053353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 00:48:48 +00:00
Treehugger Robot
6d406f854e Merge "Enable HWASan for multiple modules in one place(Make)" 2023-04-29 00:10:16 +00:00
Daniel Zheng
178e375270 Merge "Added build target for fastboot-info.txt" am: cda8aac196 
Original change: https://android-review.googlesource.com/c/platform/build/+/2480147

Change-Id: I0a20c4bf9ba160e8c356b1c949af0e285afcba35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 19:52:50 +00:00
Daniel Zheng
cda8aac196 Merge "Added build target for fastboot-info.txt" 2023-04-28 19:05:29 +00:00
Kalesh Singh
93d347a057 Merge "16k: Define PRODUCT_MAX_PAGE_SIZE_SUPPORTED flag" am: 48033761bf 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529029

Change-Id: I10813b93f1906931c87b6e30e8b73610cb3464e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 18:29:51 +00:00
Kalesh Singh
48033761bf Merge "16k: Define PRODUCT_MAX_PAGE_SIZE_SUPPORTED flag" 2023-04-28 18:19:13 +00:00
Treehugger Robot
23682da30f Merge "Enforce product interface by default" am: cf97263876 
Original change: https://android-review.googlesource.com/c/platform/build/+/2499395

Change-Id: I950bd24c4932d3abfc4951e2c843df23c7c07656
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 06:55:41 +00:00
Treehugger Robot
cf97263876 Merge "Enforce product interface by default" 2023-04-28 05:56:40 +00:00
Juan Yescas
e5c0c174d5 16k: Define PRODUCT_MAX_PAGE_SIZE_SUPPORTED flag 
The PRODUCT_MAX_PAGE_SIZE_SUPPORTED will be used to define the
ELF segment alignment of the binaries (executables and shared
libraries). The alignment is set based on these conditions:

- If PRODUCT_MAX_PAGE_SIZE_SUPPORTED is defined, that value will be
used to align the binaries. If not defined, see condition below:
- If it is a low memory device, 4096 will be the alignment. If it is
not low memory device, see conditon below:
- If VSR vendor API level < 34, 4096 will be the alignment, otherwise
it will be 65536.

Test: Built for in Pixel 4a, 6 and verified the alignment with readelf.
Bug: 276963698
Bug: 276801883
Change-Id: I53a8902ab62e6d378aec84c28bc627f0e8a98500
 2023-04-28 02:42:00 +00:00
Peiyong Lin
8c97799f15 Merge "Properly define angle.mk" am: c4c3462f2b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2563813

Change-Id: Ie14484a2aaa545670e9e895aaf7d8c2b4d1daa6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 20:26:15 +00:00
David Anderson
816da938da Added build target for fastboot-info.txt 
Bug: 194686221
Test: mm fastboot_info, fastboot flashall
Change-Id: I9db35f48f795f5ff73db7c7e7d3d1264aa660e80
 2023-04-27 11:04:33 -07:00
Jeongik Cha
45c0c2c9ac Introduce dist-for-goals-with-filenametag 
this function append FILE_NAME_TAG_PLACEHOLDER at the end of file name,
and call dist-for-goals

Bug: 278060169
Test: m dist
Change-Id: I35a48ad722cc266cadb4ed0910820589927fcef1
 2023-04-27 16:10:05 +09:00
Peiyong Lin
148276b55a Properly define angle.mk 
Previously we used USE_ANGLE to determine whether the build should include
ANGLE drivers, this patch consolidates that into a separate Makefile.

Bug: b/270994705
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I4d7ffb869ced219009446d907230178e4b940157
 2023-04-26 22:05:20 +00:00
Yuxin Hu
a039a3c302 Merge "Use ro.gfx.angle.supported to indicate if ANGLE is built in vendor" am: e872adfc97 
Original change: https://android-review.googlesource.com/c/platform/build/+/2560175

Change-Id: I1e7925c2d5aa4e4891df0f7991dedb0ff11f89aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 20:45:35 +00:00
Steven Moreland
52fbc7df01 Remove config for 64-bit binder ABI 
Also make it an error to specify the configuration
being removed.

Bug: 232423610
Test: build, boot
Change-Id: I1e4d993c7f4b9628eee6b270e47919aede4408b6
 2023-04-26 20:45:15 +00:00
Yuxin Hu
e872adfc97 Merge "Use ro.gfx.angle.supported to indicate if ANGLE is built in vendor" 2023-04-26 20:03:58 +00:00
Steven Moreland
8eca4f898e Merge "remove 32-bit binder req" am: b6040d38fe 
Original change: https://android-review.googlesource.com/c/platform/build/+/2565810

Change-Id: I1e2f58d013b3b18de045dbaf122b09a2f3b46c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 17:48:07 +00:00
Steven Moreland
b6040d38fe Merge "remove 32-bit binder req" 2023-04-26 17:00:01 +00:00
Steven Moreland
03a11ff1c3 remove 32-bit binder req 
Now that this value is no longer being read by
libbinder, I'm doing the following to remove
it from the build:
1. this CL (remove requirement)
2. removing the config from all devices
3. removing config from the build + kati obsolete

Bug: 232423610
Test: build, boot
Change-Id: I77fcd14c273b43bd10430a55e91e1d5accc9efd0
 2023-04-26 16:48:52 +00:00
Julien Desprez
f268c6ddd1 Merge "Remove jars from suites that aren't used" am: 283e59bf2d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2563330

Change-Id: Ibb2cdbef8dfb72a22aec8f3efeabe0564c905cdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 16:04:34 +00:00
Julien Desprez
283e59bf2d Merge "Remove jars from suites that aren't used" 2023-04-26 15:19:35 +00:00
Justin Yun
762614fd4a Generate enforce_uses_libraries.status to out/target/product 
enforce_uses_libraries.status files require dexpreopt.config files
which are generated in out/target/product/<product>/obj because they
are specific to target products.
As common files cannot depend on product specific files, generate the
enforce_uses_libraries.status files to the product specific
intermediate directories instead of the common intermediates.

Bug: 279360253
Test: build
Change-Id: Idc468fdaf046cd37dd8f39a9212aad78283b4c61
 2023-04-26 19:39:39 +09:00
Treehugger Robot
c5200cc442 Merge "Create new target-files-dir target" am: 428f5d5961 
Original change: https://android-review.googlesource.com/c/platform/build/+/2552714

Change-Id: Ie1bd32f66456ecbd276627d326fc970c4c97740c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 04:10:15 +00:00
Treehugger Robot
428f5d5961 Merge "Create new target-files-dir target" 2023-04-26 03:35:01 +00:00
Julien Desprez
ebe62658ed Remove jars from suites that aren't used 
Test: presubmit
Bug: 279638202
Change-Id: I01ea97bee5c9502eebda7e09eb617854e1aaf1a8
 2023-04-26 01:29:13 +00:00
Julien Desprez
aea93408dc Merge "Remove tradefed-no-fwk from suites" 2023-04-26 01:28:22 +00:00
Colin Cross
e9f67b7fcc Merge "Update PLATFORM_VERSION to VP1A" am: 0697b9bb6e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2556030

Change-Id: Ia80957a81eeaea579a35ebf54c8b8ed5f374e9c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 00:45:59 +00:00
Colin Cross
0697b9bb6e Merge "Update PLATFORM_VERSION to VP1A" 2023-04-26 00:23:54 +00:00
Julien Desprez
5fc7314a51 Remove tradefed-no-fwk from suites 
Test: presubmit
Bug: 262597958
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:917acd67c736894551537c52f8eebc4ab8f96b95)
Merged-In: I672533c475362f4438b5aefc108749be4cfc97df
Change-Id: I672533c475362f4438b5aefc108749be4cfc97df
 2023-04-25 20:55:31 +00:00
Yuxin Hu
dbd7c0472d Use ro.gfx.angle.supported to indicate if ANGLE is built in vendor 
Bug: b/270994705
Test: m -j45; flash and check Pixel 7 boots fine
atest CtsAngleIntegrationHostTestCases

Change-Id: I0fb881962ab77abd18f05d33393c4ee11694109c
 2023-04-25 18:05:45 +00:00
Justin Yun
308d02fd62 Enforce product interface by default 
We have both with/without product interface enforced targets.
Because of this, unbundled apps in the product partition must consider
bundled cases and has to add `jni_uses_platform_apis: true` to use jni
libraries.
As targets with PRODUCT_SHIPPING_API_LEVEL > 29 must enforce the
product interfaces, if PRODUCT_SHIPPING_API_LEVEL is not defined,
enforce the product stable interface by default.

Bug: 273386586
Test: TH
Change-Id: I5874bf0ae8477fab7b1097ad24c9cc0d95543eb1
 2023-04-25 08:14:58 +00:00
Isaac J. Manjarres
64fa9a35bd Add support for packaging modules.load.charger into vendor_[kernel_]boot 
Add support for createing a modules.load.charger file in the vendor_boot
and vendor_kernel_boot images when
BOARD_VENDOR[_KERNEL_]_RAMDISK_CHARGER_MODULES_LOAD is specified.

Bug: 266752750
Change-Id: Ic8fc06566aafa5c01dff50daa6293c6cb6d0c263
Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com>
 2023-04-24 16:01:59 -07:00
Joe Onorato
5f647df78d Merge "Save approx 18GB of RAM by not having a bazillion copies of the same modules names" am: 735320a9d7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2556850

Change-Id: Ie384802be1ad23f293901c1fc4e766eb448785ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 21:31:52 +00:00
Colin Cross
d69b64d33f Update PLATFORM_VERSION to VP1A 
Update PLATFORM_VERSION to VP1A.  The codename is now VanillaIceCream.

Bug: 279492191
Test: m checkbuild
Change-Id: Ibc24c10cf040407d79662c1819beaf97da791efb
Merged-In: Ibc24c10cf040407d79662c1819beaf97da791efb
 2023-04-24 14:28:13 -07:00
Joe Onorato
735320a9d7 Merge "Save approx 18GB of RAM by not having a bazillion copies of the same modules names" 2023-04-24 21:06:57 +00:00
Treehugger Robot
28ecb7a712 Merge "rearrange app-related artifact path in make" am: 73d29f11b8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2554553

Change-Id: I5f68611bc2ee8d0f3dfeb4a4faec03596c6695b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 18:50:30 +00:00
Treehugger Robot
73d29f11b8 Merge "rearrange app-related artifact path in make" 2023-04-24 18:24:36 +00:00
Jeongik Cha
ba1b925e47 rearrange app-related artifact path in make 
* move package-res.apk related files to "common" intermediate dir as
  aapt2.srcjar does because it is an app which is supposed to be arch
  neutral
* add device name in auto-gen RRO to avoid conflicits

Bug: 279358050
Bug: 279360102
Test: m
Change-Id: Ibcc5e5546bd43767ab0d4807933eeb57d58f99d6
 2023-04-24 13:16:32 +00:00
Joe Onorato
9ba2f4d022 Save approx 18GB of RAM by not having a bazillion copies of the same modules names 
Bug: 278864904
Test: treehugger, m, manual inspection
Change-Id: Ib564b3edf4a0523fc8231b8e57a5ba9c42a73294
 2023-04-24 01:11:40 -07:00
Cole Faust
b3e7b06662 Merge "Create art_debug_opt_flag soong config variable" am: 7740915dbf 
Original change: https://android-review.googlesource.com/c/platform/build/+/2549370

Change-Id: Ieedff309d9384c0a69a73833aa8ed042213bb54b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-22 02:03:24 +00:00
Cole Faust
7740915dbf Merge "Create art_debug_opt_flag soong config variable" 2023-04-22 01:18:06 +00:00
Kalesh Singh
72222fbec9 16k: Add ro.product.cpu.pagesize.max property 
The device's max supported page size is determined by the
build variable TARGET_MAX_PAGE_SIZE_SUPPORTED.

Export this variable as system property for use in tests.

Bug: 277360995
Test: atest -c vendor_elf_alignment_test -s <serial>
Change-Id: I4f33a42de359c8119e55056f9fd9c7147c7058ec
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
 2023-04-21 21:04:10 +00:00
Xin Li
d6b6d0102a Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 
Bug: 275386652
Merged-In: I4b2ea3956c34aa56cc6f54bab7148f116c34759e
Change-Id: I900022a8e8f104b6dc52745211c428601be53ba6
 2023-04-21 09:49:08 -07:00
Vinh Tran
e222b9d6e4 Merge changes from topic "AFDO_PROFILES" 
* changes:
  Split PRODUCT_AFDO_PROFILES into two variables
  Optionally include afdo_profiles.mk if available
 2023-04-21 15:06:28 +00:00
Treehugger Robot
e16241ce4f Merge "Remove lunch target from appcompat log" 2023-04-21 05:46:47 +00:00
Kelvin Zhang
2c561d8cb1 Create new target-files-dir target 
Create a new phony target target-files-dir, which points to
$(BUILT_TARGET_FILES_DIR) . All dependencies of
BUILT_TARGET_FILES_PACKAGE are now a dependency of
BUILT_TARGET_FILES_DIR. The purpose of BUILT_TARGET_FILES_DIR is to
represent an unzipped version of the target_files.zip . Some tools, such
as ota_from_target_files, can work directly with unzipped target_files.
This change allows such tools to avoid having to zip the target_files
by depending on BUILT_TARGET_FILES_DIR instead of
BUILT_TARGET_FILES_PACKAGE.

This CL does not have any functional changes, targets such as otapackage
and updatepackage still depend on the zipped target_files.

Bug: 227848550
Bug: 277028723

Test: m installclean && m updatepackage
Change-Id: I83e69370ae5efa9046710f5909276077796f6b30
 2023-04-20 21:08:06 -07:00
Vinh Tran
424539f6c1 Split PRODUCT_AFDO_PROFILES into two variables 
Currently, PRODUCT_AFDO_PROFILES is generally applied to all products and is not semantically treated as a product config varilable.

Splitting this allows us:
1. Explicitly tell that PRODUCT_AFDO_PROFILES takes precedence over product-agnostic profiles in AFDO_PROFILES
2. Add PRODUCT_AFDO_PROFILES to _product_vars_list

Test: Define PRODUCT_AFDO_PROFILES in a product config and make sure it appears first in the soong var AfdoProfiles
Bug: 277215393
Change-Id: I284f6308d456994bb72129cb0d7be7cd091993ae
Merged-In: I284f6308d456994bb72129cb0d7be7cd091993ae
 2023-04-20 17:37:53 -04:00
Vinh Tran
9281bc8c8f Optionally include afdo_profiles.mk if available 
Previously, the product var is defined in pixel product config only. This breaks SDK finalization for udc (google3/configs/wireless/android/busytown/platform/git_udc/git_udc-release.gcl). In SDK finalization, we need to ensure performance/usage of libraries are consistent across all builds that don't set SKIP_ABI_CHECKS.

This CL optionally includes the afdo_profiles if available so that afdo is on all products by default.

Ignore-AOSP-First: The topic has internal-only CLs
Test: CI
Bug: 276672785
Change-Id: I2cc51412de141c4e6ad69f49cef378121e0b3b87
Merged-In: I2cc51412de141c4e6ad69f49cef378121e0b3b87
 2023-04-20 17:33:00 -04:00
Kelvin Zhang
ca812338a2 Add create_brick_ota to otatools.zip 
This allows create_brick_ota binary to be used by downloading
otatools.zip from ab, instead of having to build it locally.

Bug: 278925744
Change-Id: I704355b74bc2de7e8d5b881deb01efbee0fdda2a
 2023-04-19 19:15:07 -07:00
Hang Lu
e235ded733 Enable HWASan for multiple modules in one place(Make) 
Environment variables HWASAN_INCLUDE_PATHS and
PRODUCT_HWASAN_INCLUDE_PATHS can be used to enable HWASan for multiple
modules, by just adding the module directory to the env variable.

Bug: b/271948407
Test: Set specific module directory to above env variable and check the
assembly codes of output elf files after building, finding hwasan
related symbols inside.

Change-Id: I4493cb627fb564ee317eb95bd24ec020d42ae28c
 2023-04-19 22:59:46 +00:00
Cole Faust
05bc3db3cd Create art_debug_opt_flag soong config variable 
For use in art_debug_defaults.

Bug: 247785938
Test: See other cl in topic
Change-Id: I3d272b893ba05d65f21fdf65bf4f06dc172adfd8
 2023-04-19 13:44:55 -07:00
Wei Li
0ab788ee83 Merge "Copy SBOM files of unbundled APKs to dist directory." 2023-04-19 16:36:36 +00:00
Wei Li
49af939a23 Copy SBOM files of unbundled APKs to dist directory. 
Bug: 266726655
Test: CIs
Test: tapas Browser2 Calendar arm userdebug && m dist
Change-Id: I82328dc4916451a99ad0bf6d7bb945c9b98d0bea
 2023-04-18 15:57:34 -07:00
Colin Cross
bc18b00770 Move old installed file cleanup logic below build/make/core/Makefile 
build/make/core/Makefile modifies ALL_DEFAULT_INSTALLED_MODULES,
move the cleanup logic below where it is included so that any
additions are covered by the cleanup logic.

Bug: 267014648
Test: manual
Change-Id: If3ab59aa19273fb20f171a3bb74ea1a2c3841585
 2023-04-18 11:32:24 -07:00
Inseob Kim
168ab6af74 Remove lunch target from appcompat log 
This is to reduce build rule divergence among targets. We only need the
path under PRODUCT_OUT.

Bug: 277662244
Test: build and boot
Change-Id: Ica8776d1779c47305c3c74015be2b3597cbdf95c
 2023-04-18 14:02:52 +09:00
Florian Mayer
ed97847d9a Merge "Include hwasan lib and runtime on arm64 system images" 2023-04-14 23:27:56 +00:00
Florian Mayer
201eb3b6cc Include hwasan lib and runtime on arm64 system images 
This is needed so we can run hwasan-enabled apps for debugging on normal
system images.

Bug: 276930343
Change-Id: Ie572d77307e5e6268b851ea5c96aae05d588dae3
 2023-04-13 17:39:25 -07:00
Treehugger Robot
859d43a1bd Merge "Make sort as part of the inner command" 2023-04-13 17:55:03 +00:00
Wei Li
c4d0a61ee3 Copy SBOM files to directory dist/sbom instead of dist/. 
There will be more SBOM files for unbundled APEXs/APks, so collect all in sbom/ for scilo ingestion later.

Bug: 266726655
Test: CIs
Test: lunch aosp_cf_x86_64_phone-userdebug && m dist
Change-Id: Iff4f1177df425095cef3c95c7bf4b85c62fa2e8d
 2023-04-13 02:12:32 +00:00
Treehugger Robot
09ead5b787 Merge "Merge TQ2A.230405.003" 2023-04-12 17:22:26 +00:00
Wei Li
82bf15a96d Merge "Revert "Revert "Copy SBOM to dist directory when running "m dist".""" am: 2e8993e882 am: e7937f2c3b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2525828

Change-Id: I4628607b633cc2d485bdb6ac29c8396ed2dbf603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 07:00:47 +00:00
Wei Li
ff8e18cf3e Revert "Revert "Copy SBOM to dist directory when running "m dist"."" 
This reverts commit fd358ae340.

Reason for revert: fixed the issues in aosp/2529028 and aosp/2524438.

Change-Id: Ieb4e6189a9357dafe81f15c72d5603166d9caa4d
 2023-04-11 23:43:54 +00:00
Xin Li
c350dd238e Merge TQ2A.230405.003 
Bug: 271343657
Merged-In: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
Change-Id: I2d6e182e3ac754c66bd6814abe96789a4bdcb701
 2023-04-11 00:00:10 -07:00
Steve Berbary
83110082f8 [automerge] Update Security String to 2023-06-05 2p: 908e3504d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22561221

Bug: 277078610
Change-Id: I5046a63eda6de8307fbc94d86746c2906d444688
 2023-04-11 01:55:59 +00:00
Steve Berbary
908e3504d8 Update Security String to 2023-06-05 
Bug: 277078610
Change-Id: I4b2ea3956c34aa56cc6f54bab7148f116c34759e
 2023-04-11 01:54:58 +00:00
Jooyung Han
ac1368846a Merge "Add TARGET_USES_AOSP_FOR_WLAN soong variable" am: c3610a1ae7 am: ac31a9eee0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2508495

Change-Id: I45f62954cf5cc3a858d2915815dc1f0a91dadbc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 09:02:48 +00:00
Jooyung Han
c3610a1ae7 Merge "Add TARGET_USES_AOSP_FOR_WLAN soong variable" 2023-04-10 08:00:51 +00:00
Jooyung Han
06075e6543 Add TARGET_USES_AOSP_FOR_WLAN soong variable 
It's set and used in many .mk files. Adding this to "wifi" soong config
namespace helps migration of those .mk files into .bp files.

Bug: 273376293
Test: m libwifi-hal libwifi-hal-qcom
Merged-In: Ie0fad26305d50f70076b7e538fd1a7fa03e397cb
Change-Id: Ie0fad26305d50f70076b7e538fd1a7fa03e397cb
 2023-04-10 04:02:06 +00:00
Treehugger Robot
b01b05bf69 Merge "Remove device.mk" am: 3665d8dfa8 am: 85d032fb46 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529027

Change-Id: Ica5ebc5e3f8112d5eeb7d33690f6a10d93bdff96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-08 04:37:42 +00:00
Cole Faust
5752005ee4 Remove device.mk 
It just consisted of unused functions/variables, and had no edits
since the initial publish of android to git. It appears like it was
panned to have a device config similar to product config but was never
completed.

Test: Presubmits
Change-Id: I0ffcef1ae8bfd0611f1bede387f0c3e01fe53581
 2023-04-07 16:03:58 -07:00
Treehugger Robot
fbf81f8b10 Merge "Add partition compatibility symlinks to installed file list." am: 4ae1b2e2b1 am: d7de9d7a9d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2514021

Change-Id: Ifd196ee3ed21cf117a94ece9c9c80c1cf04793f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 03:57:15 +00:00
Treehugger Robot
4ae1b2e2b1 Merge "Add partition compatibility symlinks to installed file list." 2023-04-07 02:45:45 +00:00
Inseob Kim
e7d0b7a394 Merge "Remove 28.0 compat support" am: 3875d6c82f am: c32b330031 
Original change: https://android-review.googlesource.com/c/platform/build/+/2519775

Change-Id: I52d6ede32f3716bae22e2798ad29ce25a7702f27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 02:00:23 +00:00
Inseob Kim
3875d6c82f Merge "Remove 28.0 compat support" 2023-04-07 00:52:30 +00:00
Treehugger Robot
a0a725c18e Merge "Adapt to rearranged NDK sysroot." am: 40472c2371 am: 166753a939 
Original change: https://android-review.googlesource.com/c/platform/build/+/2518135

Change-Id: I21ef090d4b06ad872bf67b88605ee33023269a3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 21:40:59 +00:00
Treehugger Robot
40472c2371 Merge "Adapt to rearranged NDK sysroot." 2023-04-06 20:46:41 +00:00
TreeHugger Robot
6f523ecca3 Merge "Optionally include afdo_profiles.mk if available" into tm-qpr-dev-plus-aosp 2023-04-06 17:12:33 +00:00
Vinh Tran
dc158cff8b Optionally include afdo_profiles.mk if available 
Previously, the product var is defined in pixel product config only. This breaks SDK finalization for udc (google3/configs/wireless/android/busytown/platform/git_udc/git_udc-release.gcl). In SDK finalization, we need to ensure performance/usage of libraries are consistent across all builds that don't set SKIP_ABI_CHECKS.

This CL optionally includes the afdo_profiles if available so that afdo is on all products by default.

Ignore-AOSP-First: The topic has internal-only CLs
Test: CI
Bug: 276672785
Change-Id: I2cc51412de141c4e6ad69f49cef378121e0b3b87
 2023-04-06 00:44:03 -04:00
Treehugger Robot
407d194de4 Merge "Quote the value of product mfr in case it contains space." am: 557a4d56c9 am: 7171df5985 
Original change: https://android-review.googlesource.com/c/platform/build/+/2524438

Change-Id: Ic7d66f960673a8985c2535016f2da5ca07cb6b1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 22:21:20 +00:00
Android Build Coastguard Worker
0f559666ab Version bump to TQ2A.230505.002 [core/build_id.mk] 
Change-Id: Iaa614601992916e12fdfd73eea9a472702389849
 2023-04-05 21:49:42 +00:00
Wei Li
e64367cf29 Add partition compatibility symlinks to installed file list. 
Bug: 272358980
Test: CIs
Test: build/soong/tests/sbom_test.sh
Change-Id: If7c6b218a13dccc2cb74358b01dd9d5db52998fc
 2023-04-05 11:06:40 -07:00
Wei Li
5bb735bd95 Quote the value of product mfr in case it contains space. 
Bug: 277015970
Test: m sbom
Change-Id: Id18d5b60549a12d71f0eda626bb2a539025aafea
 2023-04-05 10:24:12 -07:00
Juho Kim
0c351860cd Merge "Revert "Copy SBOM to dist directory when running "m dist"."" am: 79e77ec4b5 am: 3d396b837e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2524655

Change-Id: I075cfe61e2412cc0965a5b2b87b8f5f0eeaf77d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 09:01:45 +00:00
Wei Li
225a986e87 Merge "Copy SBOM to dist directory when running "m dist"." am: 84cd6a78ea am: 374d334dfc 
Original change: https://android-review.googlesource.com/c/platform/build/+/2494875

Change-Id: I73ec02bf070378ed9994e88cb6f016e9de32bb31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 07:13:27 +00:00
Juho Kim
fd358ae340 Revert "Copy SBOM to dist directory when running "m dist"." 
This reverts commit bc7868b18e.

Reason for revert: DroidMonitor: Potential culprit for Bug 277015970 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: If7d2d070714d5b58e77488d4e26d4003bfc34f79
 2023-04-05 07:10:21 +00:00
Dan Albert
1d7f51da6f Adapt to rearranged NDK sysroot. 
Soong didn't have any explicit references to these paths because it
depends directly on the modules, but the make side of the build still
needs to construct these paths explicitly.

I removed a bunch of dead code that made the fix less obvious while I
was here.

Bug: None
Test: treehugger
Change-Id: I1a283a3bc98a94fc5481c869b3b0a4eacf69d859
 2023-04-04 21:28:51 +00:00
Wei Li
a086cd0154 Merge "Filter out installed files of partitions not built for a target product in SBOM generation." am: 32789cd805 am: f1dd146c2b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2512055

Change-Id: Iddbe801a50cce12969bb4d753c1e613493f1ca26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 01:55:25 +00:00
Wei Li
bc7868b18e Copy SBOM to dist directory when running "m dist". 
Bug: 266726655
Test: Run "m dist" and sbom.spdx.json should be in dist directory.
Test: CIs
Change-Id: Iabd3b980863fcb62dd75b6f778c49447073b9cdf
 2023-04-04 00:56:52 +00:00
Wei Li
32789cd805 Merge "Filter out installed files of partitions not built for a target product in SBOM generation." 2023-04-04 00:55:38 +00:00
Treehugger Robot
c06f8bbf19 Merge "Set PRODUCT_AFDO_PROFILES to AfdoProfiles product var" 2023-04-03 22:35:25 +00:00
Wei Li
ec0881e0c3 Filter out installed files of partitions not built for a target product in SBOM generation. 
Also collect some information of all prebuilt partition images for later use in SBOM generation.

Bug: 272360068
Test: CIs
Test: build/soong/tests/sbom_test.sh
Change-Id: I82cd93a50e4230123d47feab9a558211c4276425
 2023-04-03 20:01:34 +00:00
Ulya Trofimovich
33267272ab Merge "Revert "Disable dexpreopt for aosp_riscv64"" am: 1d3c4ae036 am: 86b1dd2b00 
Original change: https://android-review.googlesource.com/c/platform/build/+/2511036

Change-Id: I76ac0b1cd690b2a019ab0b23bf3b2f01eb6a7fac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 12:37:37 +00:00
Ulya Trofimovich
1d3c4ae036 Merge "Revert "Disable dexpreopt for aosp_riscv64"" 2023-04-03 11:31:42 +00:00
Inseob Kim
df74fa7504 Remove 28.0 compat support 
Treble doesn't support U system + P vendor, so removing P (28.0)
prebuilts and compat files.

Bug: 267692547
Test: build
Change-Id: I943a1f70b3600918a375ff62a20d45cfae2f673e
 2023-04-03 15:18:28 +09:00
Peter Collingbourne
101d0c4a79 Merge "Make kernel prebuilts writable after copying them." am: b327befaae am: 34fa001f55 
Original change: https://android-review.googlesource.com/c/platform/build/+/2506189

Change-Id: Iae457c184385f6e384520a6bfaf2aa4361974ab7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 01:54:05 +00:00
Peter Collingbourne
b327befaae Merge "Make kernel prebuilts writable after copying them." 2023-04-01 00:33:43 +00:00
Vinh Tran
2b2f6685ab Set PRODUCT_AFDO_PROFILES to AfdoProfiles product var 
Ignore-AOSP-First: Ignore-AOSP-First: Other CLs in the same topic are internal-only
Test: m nothing
Bug: 267229065
Change-Id: I2d71daa6af97eeb0050e1084b27b03900d2d75ef
Merged-In: I2d71daa6af97eeb0050e1084b27b03900d2d75ef
 2023-03-31 17:54:49 -04:00
Vinh Tran
f45a8d6e43 Set PRODUCT_AFDO_PROFILES to AfdoProfiles product var 
Ignore-AOSP-First: Ignore-AOSP-First: Other CLs in the same topic are internal-only
Test: m nothing
Bug: 267229065
Change-Id: I2d71daa6af97eeb0050e1084b27b03900d2d75ef
 2023-03-31 14:29:48 +00:00
Kousik Kumar
3357cf912e Make sort as part of the inner command 
It turns out, in Cog workspaces, the order of files returned by "find"
command is inherently non-deterministic (they use an absl::HashMap which
intentionally tries to NOT guarantee sort order). This results in
varying order for the inner variable, which actually causes invalidation
and regeneration of the build graph (I'm guessing when "y" changes in
$(sort $(y)), it causes an invalidation in Make). Hence made the sort a
part of the inner command itself.

Tested: Ran the build with Cog and ensured graph wasn't regenerated
across reruns.
Bug: b/276397558

Change-Id: Ie772572048785793067f74c08ac3994ef6cbaa43
 2023-03-31 09:57:01 +00:00
Treehugger Robot
7cc1967008 Merge "Create otatools build target with dist" am: a4721a5e6b am: 88b9b11bf8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2515235

Change-Id: I79167fb274075801ea2717a87fb5f718d67c2a02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 03:23:24 +00:00
Treehugger Robot
a4721a5e6b Merge "Create otatools build target with dist" 2023-03-31 01:12:45 +00:00
Dennis Shen
5acfb9c4c6 Create otatools build target with dist 
BUG: b/275545565
TEST: m otatools-dist dist
Change-Id: I8484a7927955bf694221937ba778db7065b83eb2
 2023-03-30 20:10:17 +00:00
Paul Duffin
f54ad07923 Merge "Prevent enabling prebuilts by default for builds that don't support them" am: 31860f66c7 am: ac6008302e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2513775

Change-Id: I4266087353d2c23f5a6fb7d95c52252b1ec76ecf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 17:44:07 +00:00
Jared Duke
fccb79eba9 Merge "Keep methods annotated with @JavascriptInterface" am: f43f66335a am: 8cc53f284e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2510958

Change-Id: Ib3d6e18170ace3bfc66fa1e114800a1b853bb13e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 17:39:30 +00:00
Dan Albert
39bca0748a Merge changes from topic "fix-api_levels.json" am: 249bc4c034 am: bf5d61971e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2509758

Change-Id: Iaf7c7589c30d576f4e48b74243291eadeb96bcbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 17:37:03 +00:00
Dan Albert
31c62f4c44 Acknowledge V in AOSP. am: 2549214184 am: a2308ffc88 
Original change: https://android-review.googlesource.com/c/platform/build/+/2509757

Change-Id: I0e0d48d699ef4d43ba78c576010436debc787162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 17:37:01 +00:00
Treehugger Robot
1045e6e398 Merge "add PRODUCT_SOURCE_ROOT_DIRS product variable" am: d67a345f9a am: 2e5dfd6a0b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2448662

Change-Id: Ic468ff195cbfaa55e00ce2aa6cbdf74ffca077a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 17:34:11 +00:00
Dan Albert
a2308ffc88 Acknowledge V in AOSP. am: 2549214184 
Original change: https://android-review.googlesource.com/c/platform/build/+/2509757

Change-Id: Ic239277f7551ed8a8912a64c0fa8693db4cb2e7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 17:13:19 +00:00
Paul Duffin
31860f66c7 Merge "Prevent enabling prebuilts by default for builds that don't support them" 2023-03-30 15:29:35 +00:00
Jared Duke
f43f66335a Merge "Keep methods annotated with @JavascriptInterface" 2023-03-29 22:24:00 +00:00
Dan Albert
249bc4c034 Merge changes from topic "fix-api_levels.json" 
* changes:
  Separate active codenames and preview codenames.
  Acknowledge V in AOSP.
 2023-03-29 17:57:22 +00:00
Treehugger Robot
d67a345f9a Merge "add PRODUCT_SOURCE_ROOT_DIRS product variable" 2023-03-29 17:04:37 +00:00
Wei Li
3e8a856df0 Merge "Remove unused make variable BUILDING_PVMFW_IMAGE" am: cf016b9621 am: 5dbbfc4981 
Original change: https://android-review.googlesource.com/c/platform/build/+/2510315

Change-Id: I0da8ef640c143a06b87f52aafb9faf560523f230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 16:55:32 +00:00
Dario Freni
92345a1cdb Prevent enabling prebuilts by default for builds that don't support them 
Except for santizer and framework Java coverage tests as they require
specialized prebuilts built from a matching configuration and we do not
provide them.

And products that use dex2oat(d)s as they are not available as a
prebuilt.

And products that cross compile to arm64 and linux_bionic on the host
as prebuilts for that are not available.

And atv/tv products as they break when building against prebuilts.

(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c7b5e2c0cea30dd084536bdc68dffdfb1c50073d)

This uses a completely separate Change-Id as the previous change was
applied to lots of downstream branches (so they contain the Change-Id
as far as the automerger is concernd) but the change got discarded due
to some merge issues. Using the previous Change-Id would cause
confusion. The title of this change was also updated as the previous
title only made sense within the larger topic to which it belonged.

Bug: 230478310
Bug: 223592962
Test: presubmit
Change-Id: Ie35ff34f4626070d1a3fe0bb3a6a999a596d0078
 2023-03-29 17:11:50 +01:00
Wei Li
936ae9add6 Remove unused make variable BUILDING_PVMFW_IMAGE 
Test: CIs
Change-Id: I56d72c08c1fe5794f8c550651a2805109b70391f
 2023-03-29 07:29:54 +00:00
Treehugger Robot
0a796f6fae Merge "remove reference to old VTS config" am: f0889e28b6 am: 8d1eb1aa3e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2503676

Change-Id: I21b936bcabfc8551fdcd85d126a1c84b4f47d77a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 03:24:59 +00:00
Treehugger Robot
f0889e28b6 Merge "remove reference to old VTS config" 2023-03-29 02:23:10 +00:00
Dan Albert
2549214184 Acknowledge V in AOSP. 
Development of V APIs has started, so we need to add the codename to
the build system so API developers can use it.

Bug: None
Test: treehugger
Change-Id: Ic7e77cbc9992d7a0d2959abc42ce2862232317ca
 2023-03-28 23:25:45 +00:00
Dan Albert
4d24cbd044 Separate active codenames and preview codenames. 
Using PLATFORM_VERSION_ALL_CODENAMES (which is a bad name for
historical reasons) for discovering preview API levels doesn't work in
the narrow window where the branch's development is not for the latest
release. Create a second variable for preview codenames and expose it
to soong.

Bug: None
Test: None
Change-Id: I8c271c1d646ea8285553614c6bca944227a0e643
 2023-03-28 23:25:45 +00:00
Jared Duke
cc28b02f77 Keep methods annotated with @JavascriptInterface 
This rule is a common default rule elsewhere, and should be applied
globally for platform targets rather than relying on per-target rules.

Follow-up work will remove duplicated rules from individual targets.

Bug: 248580093
Test: m
Change-Id: If3cb9fb22d2acf90d87f150f93ad491549bf9090
 2023-03-28 14:14:56 -07:00
Android Build Coastguard Worker
5efdbe14e5 Make change and version bump to TQ2A.230505.001 
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21959028'] into tm-qpr2-release.

Change-Id: I98599069e3b5c4c52aa84c58b65fc444a00181be
 2023-03-28 18:53:24 +00:00
Steve Berbary
7f02771151 Update Security String to 2023-05-05 
Bug: 272844037
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:be772485c3cd1693cedb404114d2d0de4d21e492)
Merged-In: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
Change-Id: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
 2023-03-28 18:41:22 +00:00
Ulya Trofimovich
cc5c6a74ee Revert "Disable dexpreopt for aosp_riscv64" 
This reverts commit ae7f543b7c.

Reason for revert: Enabling dexpreopt for RISC-V (there is still no
  compiler support, but dex2oat runs in verification mode and does
  not attempt any compilation with https://r.android.com/2510739).

Change-Id: I0a6d0416bec51131f0a54c7ff5b0e194728452b1
 2023-03-28 13:15:35 +00:00
Zhi Dou
1658acefc6 Merge "New product config flag to gate blueprint modules" into tm-qpr-dev 2023-03-28 13:12:35 +00:00
Sam Delmerico
4c3b83fe70 add PRODUCT_SOURCE_ROOT_DIRS product variable 
Change-Id: I31590eb133511a5dbdb8d6fe436cf511d1a160a2
 2023-03-27 14:40:50 -04:00
Treehugger Robot
e5d89d51e6 Merge "Increase dump-words-to-file capacity" am: f8a3ca9f51 am: 95f3ebf3cf 
Original change: https://android-review.googlesource.com/c/platform/build/+/2506191

Change-Id: I04128e235dd8700783f3797f0eaa58f75f2ebb6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-25 01:45:53 +00:00
Peter Collingbourne
fd95f097fe Make kernel prebuilts writable after copying them. 
Images created by Bazel are read-only, which leads to build failures when
later commands attempt to modify them, as the cp command will also copy
the file permissions. Fix it by using chmod to make the images writable
after copying them.

Change-Id: I8aaa7c4395d38b674f76a7f0ebfa95e1f2da0af0
 2023-03-24 16:39:17 -07:00
Bob Badour
0bd9a626bd Increase dump-words-to-file capacity 
Test: m droid dsit
Change-Id: I092e032a8d8f943dbb2eddd4bb7c57df40bbcfba
 2023-03-24 13:12:45 -07:00
Colin Cross
99a26d0bfd Merge "Don't read test mapping list in Make" am: 2feb102e4d am: 4979af18b9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2506833

Change-Id: I6bb66b00b8344dafcea5825de2e5a65463d186e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 16:55:11 +00:00
Colin Cross
9ee11cef7c Merge changes Id8b48c8c,I3b66304c am: ffda9a5093 am: d0aa18ed07 
Original change: https://android-review.googlesource.com/c/platform/build/+/2448666

Change-Id: I64b731d3f4dc1041c016ec8d460856227bd41e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 16:54:27 +00:00
Colin Cross
2feb102e4d Merge "Don't read test mapping list in Make" 2023-03-24 15:53:47 +00:00
Colin Cross
ffda9a5093 Merge changes Id8b48c8c,I3b66304c 
* changes:
  Build the whole platform for aosp_riscv64
  Disable dexpreopt for aosp_riscv64
 2023-03-24 15:48:32 +00:00
Colin Cross
01475b41fb Don't read test mapping list in Make 
Reading the test mapping list in Make causes Kati to regenerate
any time a TEST_MAPPING file is added or removed.  Pass the file
to the rule and read it during ninja instead.

Bug: 274987114
Test: m test_mapping
Change-Id: I68a76646d70c85b2cb992e4da52a7854acd370b9
 2023-03-24 04:33:07 +00:00
Sijie Chen
74aebc8e55 Merge "Clean additional Robolectric variable" am: 539fbc287e am: 5a678d06ee 
Original change: https://android-review.googlesource.com/c/platform/build/+/2494869

Change-Id: I9e3fdfb1071c065c39f118ceedf17d80457a1909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 23:54:21 +00:00
Colin Cross
ae7f543b7c Disable dexpreopt for aosp_riscv64 
dex2oat isn't supported for riscv64 yet, disable dexpreopt.  For
aosp_riscv64-user and -userdebug builds it is also necessary to
relax the requirement that dexpreopt is enabled.

Test: lunch aosp_riscv64-userdebug && m
Change-Id: I3b66304cedf55f734f8aa1d3ad3ed594a7b9a122
 2023-03-23 16:29:28 -07:00
Sijie Chen
539fbc287e Merge "Clean additional Robolectric variable" 2023-03-23 22:51:42 +00:00
Spandan Das
11fbf45243 Merge "Update hardcoded references to android_*stubs_current" am: 0326e64c3c am: b9a6afe05a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2498195

Change-Id: I7f050b963936c74b6a6a3469bad084b04de7479d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 22:20:28 +00:00
Spandan Das
0326e64c3c Merge "Update hardcoded references to android_*stubs_current" 2023-03-23 21:32:03 +00:00
Sunil Ravi
40167b0380 Merge "Add config to skip state toggle off/on for Wi-Fi NAN" am: 691c92f567 am: b25981143f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2503002

Change-Id: I4007ed1a4c988f28f58dc7bd2899b9aa32b65b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 20:55:45 +00:00
Steven Moreland
aa81ee2a6e remove reference to old VTS config 
No longer exists, no longer used.

Bug: 274790216
Test: N/A
Change-Id: Id11921707cd5141235850d88a6d2397e85726532
 2023-03-22 21:11:42 +00:00
Ye Jiao
0786af077c Add config to skip state toggle off/on for Wi-Fi NAN 
If STA and NAN share the same iface wlan0, Wi-Fi vendor HAL service
sends eventDisabled to NAN framework when STA setMacAddress to wlan0.
This disables NAN when STA is turned on.

Since NAN always uses its own random MAC instead of using MAC of STA,
this action is not necessary and gets NAN kicked off for no benefits.

We add a build time configuration to optionally disable this behavior.

Bug: 273426515
Test: manually test

Change-Id: If0d84b3898387b75392c8012640bc728126f2cff
 2023-03-22 20:05:41 +00:00
Julien Desprez
1c6aa54306 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b am: 63c3099dc8 am: 660e9fa2e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I3981b8677b91900aa1785c09faf35dc09cfdc638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 03:48:26 +00:00
Julien Desprez
660e9fa2e3 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b am: 63c3099dc8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I4b9328b17a82fdbad4b3bd97de40f256c3e9f6f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 03:11:39 +00:00
Julien Desprez
63c3099dc8 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: Ia8228324a2ef9ad69aaefc6352e22113dd24ce58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 02:13:57 +00:00
Julien Desprez
50d29f770b Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I660d33b843ad09e5bf51ee326e6dd2250f782148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 01:33:44 +00:00
Julien Desprez
cd608825a3 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I7082e28688912f848f0be54fbd445319029d80fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 00:58:49 +00:00
Julien Desprez
48c10589c6 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev 
* changes:
  [automerge] Remove tradefed-no-fwk from suites 2p: ca46df5783
  Remove tradefed-no-fwk from suites
 2023-03-22 00:32:22 +00:00
Treehugger Robot
c02e0f7ad8 Merge "Disable system_server.zip generation for ART prebuilts" am: d7600be9a6 am: 8925166fff 
Original change: https://android-review.googlesource.com/c/platform/build/+/2496535

Change-Id: I38ee795422205a79eec93a6f55fbb6570e38811f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 16:49:21 +00:00
Nicolas Geoffray
5325cd5cdf Merge "Use the boot image mainline extension when dexpreopting in Make." am: 3a6ebaac36 am: 22d145424a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2497995

Change-Id: Icac6f47314a704c0836e17a20109da1e72b248a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 16:48:18 +00:00
Treehugger Robot
d7600be9a6 Merge "Disable system_server.zip generation for ART prebuilts" 2023-03-21 15:19:58 +00:00
Nicolas Geoffray
3a6ebaac36 Merge "Use the boot image mainline extension when dexpreopting in Make." 2023-03-21 14:51:20 +00:00
Pranav Gupta
1da7219ed1 Disable system_server.zip generation for ART prebuilts 
system_server.zip does not need to be generated when using the prebuilt mainline modules or if ART_MODULE_BUILD_FROM_SOURCE is false or if MODULE_BUILD_FROM_SOURCE is false

Bug: 274051753
Change-Id: Ifc638eb4e14ed9ea078125d1780a02b9de6b9ccc
 2023-03-21 07:30:37 +00:00
Treehugger Robot
75c71733ef Merge "Remove vtsc host tool" am: 896e7c715e am: d0362d7b16 
Original change: https://android-review.googlesource.com/c/platform/build/+/2495778

Change-Id: Ic52c0427a575f1c37f8f5b89c0209ac16b736012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 03:57:38 +00:00
Treehugger Robot
896e7c715e Merge "Remove vtsc host tool" 2023-03-21 02:14:34 +00:00
Spandan Das
0c01c90544 Update hardcoded references to android_*stubs_current 
The hardcoded references should be updated to variables exported by
Soong. This enables the stub selection logic to exist in a single place.

Test: TH
Test: No change in out/build-<lunch_product>.ninja

Change-Id: I153f1c6ffc6c93d8a64c3edfef3e8d52c84207a3
 2023-03-20 21:59:18 +00:00
Treehugger Robot
3c79e80233 Merge "Add rkpd to the list of individually toggleable modules" am: 5f3ddd4f41 am: 708b70a554 
Original change: https://android-review.googlesource.com/c/platform/build/+/2497575

Change-Id: I9479b1cc06bcd4d2abd5ac4009bfa92b4f24acfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 21:16:00 +00:00
Cole Faust
bfbb7718c7 Merge "Create image apexes by default instead of flattened apexes" am: 14108b6a57 am: 299878fb17 
Original change: https://android-review.googlesource.com/c/platform/build/+/2491212

Change-Id: Ie773663bd3cd5770af0e754ee29c9f411d574244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 21:14:47 +00:00
Treehugger Robot
5f3ddd4f41 Merge "Add rkpd to the list of individually toggleable modules" 2023-03-20 20:41:51 +00:00
Cole Faust
14108b6a57 Merge "Create image apexes by default instead of flattened apexes" 2023-03-20 19:54:49 +00:00
Treehugger Robot
96a1cfe673 Merge "[config] Boards can supply custom super image script" am: 6dcf429d8f am: d90bc8e5ee 
Original change: https://android-review.googlesource.com/c/platform/build/+/2496355

Change-Id: Ia41fb01d563745f2b13a95875273a5c0347ab7fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 19:02:32 +00:00
Jiakai Zhang
fb2734e36b Use the boot image mainline extension when dexpreopting in Make. 
aosp/2470961 introduces a boot image mainline extension. We need to use
it when dexpreopting apps in Make.

Bug: 274059172
Bug: 269230245
Test: See "boot-framework-adservices.art" in
  out/target/product/vsoc_x86_64/obj/APPS/PrebuiltGmail_intermediates/oat/x86_64/package.invocation
  on internal master.
Change-Id: Ic0b1753a0066bd16a31de028743f1ad908e9bdfc
 2023-03-20 18:42:13 +00:00
Cole Faust
5e2491eff2 Create image apexes by default instead of flattened apexes 
This is a list of all the internal master products that
use flattened apexes before and after this commit:
https://diff.googleplex.com/#key=AcyUcqOwqpXZ

Apexes can still be flattened by setting `TARGET_FLATTEN_APEX := true`
or `OVERRIDE_TARGET_FLATTEN_APEX := true` in their product config.

Bug: 254205429
Test: presubmits
Change-Id: I5b15f0fc9e149730fd33722632a8ac14432ab757
 2023-03-20 18:39:22 +00:00
Treehugger Robot
6dcf429d8f Merge "[config] Boards can supply custom super image script" 2023-03-20 17:52:41 +00:00
Paul Duffin
a537224b3a Add rkpd to the list of individually toggleable modules 
This is needed because the rkpd module is optional at runtime and so
needs to be optional at build time.

Ignore-AOSP-First: rkpd only exists internally
Bug: 259958590
Test: # Add prebuilts for the rkpd module.
      m MODULE_BUILD_FROM_SOURCE=true droid
      m MODULE_BUILD_FROM_SOURCE=false droid
      # Make sure that they build from sources and prebuilts respectively.
Merged-In: Id0c0e482e2928d57a1bb6ee4f3bcd143ca15122c
Change-Id: Id0c0e482e2928d57a1bb6ee4f3bcd143ca15122c
(cherry picked from commit 95b546475f)
 2023-03-20 16:21:23 +00:00
Ziwei Zhang
31337205d6 Merge "Add python mobly test template xml." am: 0a25e67404 am: 863bf01391 
Original change: https://android-review.googlesource.com/c/platform/build/+/2469502

Change-Id: I15452245b1a59125d5e40b6fa1d3bd81090da4b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 03:28:46 +00:00
Ziwei Zhang
0a25e67404 Merge "Add python mobly test template xml." 2023-03-20 02:16:04 +00:00
Ludvig Hansson
6d11991f1d Clean additional Robolectric variable 
Add LOCAL_INSTRUMENT_SRCJARS to list of variables
to reset when calling CLEAR_VARS from a makefile.

This fixes an issue when generating JaCoCo coverage
reports for Robolectric tests.
The value from another module would bleed into the current
one causing the wrong source directory to be used during
report creation, which in turn resulted in an empty report.

This would only happen for modules still using 'Android.mk';
when using Android.bp files the value for LOCAL_INSTRUMENT_SRCJARS
is always set from 'robolectric.go'.

Bug: 214588476
Test: m clockwork-frameworks-robotests-jacoco
Change-Id: I7b527c82bdbe4db06acd1a1fa1a2443e64ed703d
(cherry picked from commit cc799bdf9161dc3c0f6eb437ed064f9712bbfd6b)
 2023-03-17 23:55:29 +00:00
Aidan Wolter
fbf53522cf [config] Boards can supply custom super image script 
Some boards may need to customize the format of the super image. We will
now provide the variable BOARD_CUSTOM_BUILD_SUPER_IMAGE so that boards
can provide their own script for constructing the super image. This
mimics similar code in the same file for allowing boards to supply a
custom VBMeta (BOARD_CUSTOM_AVBTOOL) or boot image
(BOARD_CUSTOM_MKBOOTIMG).

Bug: None
Change-Id: I461caeb6dfb705fd5c671228fc35561ed403a1cb
 2023-03-17 20:17:35 +00:00
Steven Moreland
d733e64b9f Remove vtsc host tool 
We haven't used this in years.

Bug: N/A
Test: N/A
Change-Id: If79b05d75ca358b110c2e1723f1dd7f522e13f12
 2023-03-17 18:10:31 +00:00
Treehugger Robot
cdbc794cd9 Merge "Disable riscv64 dependency on bcc and ld.mc" am: d2b9ad4eb4 am: 01321a6bb2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2448665

Change-Id: I498a9489ef3332f29aba7ffe641103185efa234c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 20:58:38 +00:00
Treehugger Robot
d2b9ad4eb4 Merge "Disable riscv64 dependency on bcc and ld.mc" 2023-03-16 19:39:00 +00:00
Spandan Das
251205d866 New product config flag to gate blueprint modules 
Bug: 270654958

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
Merged-In: Ica82a8f65cbfda600d72fc54fb873c1eaa1666a7
(cherry picked from commit 055e5f89a7bc5d12877fc6bc8110c1e1e8b6ee59)
 2023-03-15 22:15:30 +00:00
Wei Li
90217d9c4c Merge "Generate SBOM of the target product in file sbom.spdx.json in product out directory." am: 15187b6f1a am: 0f06273190 
Original change: https://android-review.googlesource.com/c/platform/build/+/2485540

Change-Id: Ibdca45c0e2c871c9a7f4c26bfa5d18d825112c27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 06:27:44 +00:00
Wei Li
15187b6f1a Merge "Generate SBOM of the target product in file sbom.spdx.json in product out directory." 2023-03-15 05:20:44 +00:00
Wei Li
499333616c Generate SBOM of the target product in file sbom.spdx.json in product out directory. 
Original aosp/2374663 was reverted, so this change cnotains the implementation but disabled by default and SBOM will not be built by default with "m dist".

The feature will be enabled later in small CLs after running tests successfully in forrest.

Test: m sbom
Test: m dist
Test: on aosp, lunch aosp_bluejay-userdebug && m dist
Bug: 266726655
Change-Id: I926d0f97f3a0330ef61d059f12ea660005d370e6
 2023-03-14 15:14:06 -07:00
Xin Li
eb2ad4b002 Merge "Merge Android 13 QPR2" 2023-03-14 21:40:46 +00:00
Steve Berbary
2c4dad8ca3 Update Security String to 2023-05-01 am: 6a3344db86 am: eaaa30b619 am: 07c703d53d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029

Change-Id: I3094f5ac3fdabb17f8083a4fff9addb4f043ba11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 18:23:46 +00:00
Steve Berbary
07c703d53d Update Security String to 2023-05-01 am: 6a3344db86 am: eaaa30b619 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029

Change-Id: Ia798666364797ccfdf9eb95ff70a6bd8c8e7f972
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 17:44:19 +00:00
Steve Berbary
eaaa30b619 Update Security String to 2023-05-01 am: 6a3344db86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029

Change-Id: I1f32dc8fc18928417073ec419dd968841f2412d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 17:09:15 +00:00
Treehugger Robot
f63e3bcc68 Merge "add make_erofs to otatools to support erofs apex" am: d4248892e6 am: 90a8a8b81c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2477085

Change-Id: Id1c7287ba00f9e905eb10813d65a2dcf81d77667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 16:51:27 +00:00
Treehugger Robot
90a8a8b81c Merge "add make_erofs to otatools to support erofs apex" am: d4248892e6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2477085

Change-Id: Ia58dbc4d9ab685fe63ec0fac27829c1a7aff5e2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 16:16:07 +00:00
Treehugger Robot
d4248892e6 Merge "add make_erofs to otatools to support erofs apex" 2023-03-14 15:47:05 +00:00
Steve Berbary
877ca9f537 Update Security String to 2023-05-01 am: 2130534b73 am: 24272b1f7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21960115

Change-Id: I9a6f1a6d9be4978dd534f4e409fa864d4b68b48a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 04:30:17 +00:00
Steve Berbary
24272b1f7e Update Security String to 2023-05-01 am: 2130534b73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21960115

Change-Id: If0001148ac378f7433dc325320d20e4456c056c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 03:50:29 +00:00
Steve Berbary
072f723276 Update Security String to 2023-05-05 am: be772485c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959028

Change-Id: I6d3f9eb5d4c285be1a90852231bf03ef3f5bdcc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 01:17:35 +00:00
Kevin Han
db4eccb0b2 Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: afb2495f6f am: a27f3cef8b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2485539

Change-Id: Icda5099833a520be40518aad9fd61d962e4e0707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 22:03:01 +00:00
Kevin Han
a27f3cef8b Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: afb2495f6f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2485539

Change-Id: I6a2405ac28898643a070616d7da3d5f49df9a9b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 21:28:45 +00:00
Kevin Han
afb2495f6f Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" 2023-03-13 21:03:22 +00:00
Kevin Han
161d711d4d Revert "Generate SBOM of the target product in file sbom.spdx in..." 
Revert submission 2481062-sbom

Reason for revert: b/273332655

Reverted changes: /q/submissionid:2481062-sbom

Change-Id: Ie8a73d8dc50592204acd489482e0e9d96ffbd5df
 2023-03-13 20:57:37 +00:00
Treehugger Robot
21eadd9e7a Merge "Update art-host-tests build rule to support partial download" am: 909a5b40a6 am: 50aeb8e735 
Original change: https://android-review.googlesource.com/c/platform/build/+/2478786

Change-Id: Ia9c3f495ee959ffc083ad6f9fefd287b2e5d3a9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 19:07:09 +00:00
Wei Li
4534fbc056 Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." am: 27d32b0957 am: 1f2ba11661 
Original change: https://android-review.googlesource.com/c/platform/build/+/2481062

Change-Id: Ied7c1b2f563a957ba73b7d076311caf22db80853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 19:06:00 +00:00
Treehugger Robot
50aeb8e735 Merge "Update art-host-tests build rule to support partial download" am: 909a5b40a6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2478786

Change-Id: I2a6d4a7a9018fbbd580088ed16efc6c8cee80c7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 18:35:20 +00:00
Wei Li
1f2ba11661 Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." am: 27d32b0957 
Original change: https://android-review.googlesource.com/c/platform/build/+/2481062

Change-Id: I3410bc5aef8a08df8c707733d4f2addd61087868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 18:33:30 +00:00
Treehugger Robot
909a5b40a6 Merge "Update art-host-tests build rule to support partial download" 2023-03-13 17:54:01 +00:00
Wei Li
27d32b0957 Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." 2023-03-13 17:43:59 +00:00
Wei Li
88ac7ae7df Generate SBOM of the target product in file sbom.spdx in product out directory. 
Original aosp/2374663 was reverted, try to submit it again with some fixes in this.

Test: m sbom
Test: m dist
Test: on aosp, lunch aosp_bluejay-userdebug && m dist
Bug: 266726655
Change-Id: Icf305770473f0c448a1ad721cbe7addf737115e4
 2023-03-13 17:38:04 +00:00
Steve Berbary
6a3344db86 Update Security String to 2023-05-01 
Bug: 272844037

Change-Id: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
Merged-In: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
 2023-03-11 02:52:03 +00:00
Steve Berbary
2130534b73 Update Security String to 2023-05-01 
Bug: 272844037

Change-Id: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
Merged-In: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
 2023-03-11 02:50:50 +00:00
Steve Berbary
be772485c3 Update Security String to 2023-05-05 
Bug: 272844037
Change-Id: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
 2023-03-11 02:47:39 +00:00
Cole Faust
25b05a358a Merge "Don't install jni libs for uninstallable modules" am: 627fa73df5 am: dc6b660798 
Original change: https://android-review.googlesource.com/c/platform/build/+/2482535

Change-Id: I22ecf4fe4b04e75c69777e5792acfbefbfaa14c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-11 01:53:44 +00:00
Cole Faust
dc6b660798 Merge "Don't install jni libs for uninstallable modules" am: 627fa73df5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2482535

Change-Id: I888ca82ce426ce147d44341ea1137dafe904de8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-11 01:13:01 +00:00
Cole Faust
a5511ea91a Don't install jni libs for uninstallable modules 
Bug: 254205429
Test: Presubmits
Change-Id: I6eec24f17bfeac0179558356e07a13dfb071a2bb
 2023-03-10 12:30:12 -08:00
Iván Budnik
9e3c1085a5 Merge "Revert "Don't install jni libs for uninstallable modules"" am: 1c117c5fab am: 4b17107fe3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2481060

Change-Id: I7b6fda015713093840a1d567f2b196620aab6cf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 17:23:18 +00:00
Iván Budnik
4b17107fe3 Merge "Revert "Don't install jni libs for uninstallable modules"" am: 1c117c5fab 
Original change: https://android-review.googlesource.com/c/platform/build/+/2481060

Change-Id: I181241288de1c5e261f01c8acee1ea7cd179fd6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 16:47:30 +00:00
Iván Budnik
1c117c5fab Merge "Revert "Don't install jni libs for uninstallable modules"" 2023-03-10 16:30:32 +00:00
Iván Budnik
4616ec7eb7 Revert "Don't install jni libs for uninstallable modules" 
Revert submission 2462194-androidmk_for_apex_dependencies

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=full-eng&lkgb=9723453&lkbb=9724944&fkbb=9723508, bug b/272663333.

Reverted changes: /q/submissionid:2462194-androidmk_for_apex_dependencies

Bug: 272663333
Change-Id: Iecf99713133b2bc8f35614b6b9596422dc051198
 2023-03-10 16:11:31 +00:00
Wei Li
6f57b6d309 Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: 82308a21a3 am: edd91aa259 
Original change: https://android-review.googlesource.com/c/platform/build/+/2481755

Change-Id: I28f794c3a1686de5bc2fe56cb003dd2a3618cbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:28:40 +00:00
Cole Faust
21f795206c Merge "Add BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES" am: cd70c8d107 am: 474f5f2742 
Original change: https://android-review.googlesource.com/c/platform/build/+/2212539

Change-Id: I3ddf464fe4bdf49fbfe0c3d81a9aaa882985a48c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:28:19 +00:00
Cole Faust
cef47562bb Merge "Don't install jni libs for uninstallable modules" am: c3eb995eef am: ce3615c9e3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2462473

Change-Id: I05805331aad4a13084c67b8305233305336a300c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:27:58 +00:00
Wei Li
edd91aa259 Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: 82308a21a3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2481755

Change-Id: I868b8af6c1086473712073c33dd529129e4cc955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:04:33 +00:00
Cole Faust
474f5f2742 Merge "Add BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES" am: cd70c8d107 
Original change: https://android-review.googlesource.com/c/platform/build/+/2212539

Change-Id: I106a75087660ace09f0ae658d1d2fc9893795fa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:04:02 +00:00
Cole Faust
ce3615c9e3 Merge "Don't install jni libs for uninstallable modules" am: c3eb995eef 
Original change: https://android-review.googlesource.com/c/platform/build/+/2462473

Change-Id: Ifdb261e2f296b89743aa50a5a7c9073028006c88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:03:35 +00:00
Wei Li
82308a21a3 Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" 2023-03-10 06:40:54 +00:00
Cole Faust
cd70c8d107 Merge "Add BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES" 2023-03-10 06:37:24 +00:00
Cole Faust
c3eb995eef Merge "Don't install jni libs for uninstallable modules" 2023-03-10 06:36:03 +00:00
Android Culprit Assistant
95c3ea8704 Revert "Generate SBOM of the target product in file sbom.spdx in..." 
This revert was created by Android Culprit Assistant. The culprit was identified in the following culprit search session (http://go/aca-get/5b65d203-d364-4ade-aabb-1330fe45236a).

Change-Id: I4c7d7645ec0c266eb4d591b3089ba02e78da0659
 2023-03-10 06:18:03 +00:00
Wei Li
cfd8bb8d8d Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." am: 4e2aed055b am: 0939a08e0c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2374663

Change-Id: I9a6a9bbf24eb3a70d47220fa80c3d5caabf8c163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 05:22:44 +00:00
Wei Li
0939a08e0c Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." am: 4e2aed055b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2374663

Change-Id: Id1de64f1e6f73184ee8d0b84b32b643557e2e004
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 04:59:41 +00:00
Wei Li
4e2aed055b Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." 2023-03-10 04:47:47 +00:00
Jooyung Han
864e5b9a2c Merge "Remove the old output of conv_linker_config" am: 580af1bab9 am: 774c439bd8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2479575

Change-Id: I23855e8f7e11951e98e97bb195cf8304faa134fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 03:02:40 +00:00
Jooyung Han
774c439bd8 Merge "Remove the old output of conv_linker_config" am: 580af1bab9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2479575

Change-Id: Ice95d80620a66221e373b2ec4b476700fedba51e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 02:41:31 +00:00
Wei Li
02797aa70e Generate SBOM of the target product in file sbom.spdx in product out directory. 
Test: m sbom
Test: m dist
Bug: 266726655
Change-Id: I6464fa2dc416dea62c5cf688c923d6b496f044f5
 2023-03-09 15:27:58 -08:00
Presubmit Automerger Backend
fddbfae052 [automerge] Remove tradefed-no-fwk from suites 2p: ca46df5783 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754150
Ignore-AOSP-First: Cherry pick
Bug: 262597958
Change-Id: I60b254a6fcfff396b88c80c58a17037817bb5bb7
 2023-03-09 23:13:53 +00:00
Android Build Coastguard Worker
801827969c Version bump to TQ2A.230405.003 [core/build_id.mk] 
Change-Id: Ied48cfb3e60f8dcf2310ca071b509e551a68a11f
 2023-03-09 19:58:20 +00:00
Cole Faust
189905be98 Add BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES 
See other cl in this topic for more details.

Bug: 203436762
Test: m nothing
Change-Id: I76725afece50a022aec611091ef4dead5ad3449a
 2023-03-09 11:55:29 -08:00
Jooyung Han
49bf691c65 Remove the old output of conv_linker_config 
With 3397b6a2aadf8c2eb808fa38f7d6c07d5c82f320 in build/soong,
conv_linker_config fails when the output exists.

For system/vendor partitions, linker.config.pb files are built by
a custom rule, which is missing the removal of the old output. It would
fail with incremental build.

We could fix this by adding --force to overwrite. But I just added `rm`
following the convention in Makefile.

Bug: n/a
Test: m && (touch input of /vendor/etc/linker.config.pb)
      m (again)
Change-Id: Iaeaf861e90b9535394d94c6b16229a4f566789d5
 2023-03-09 16:47:32 +09:00
Ziwei Zhang
75a5f1ad10 Add python mobly test template xml. 
Test: manually check the generated mobly xml config
Bug: 272239365
Change-Id: I871f87f042e67f3fad582171010e5d0af8f3e64f
 2023-03-09 08:40:02 +08:00
Dan Shi
7c2982ab87 Update art-host-tests build rule to support partial download 
Bug: 272110734
Test: build
Change-Id: Icd13530a662e7989c6d8cb5c68b95857bdeb7182
 2023-03-09 00:16:25 +00:00
Dennis Shen
03ef64b134 add make_erofs to otatools to support erofs apex 
Change-Id: I272e7a689c563ac0a266e6cd86984fc85a3380b9
 2023-03-08 23:49:30 +00:00
Julien Desprez
ca46df5783 Remove tradefed-no-fwk from suites 
Test: presubmit
Ignore-AOSP-First: Cherry pick
Bug: 262597958
Change-Id: I672533c475362f4438b5aefc108749be4cfc97df
(cherry picked from commit 917acd67c7)
 2023-03-08 18:32:09 +00:00
Jooyung Han
3540f51a33 Merge "Add dependency to /vendor/etc/linker.config.pb" am: cd10355f3e am: 741d079d3c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2473687

Change-Id: I402c0c51cde1d88369a8e3fbb66c490c4d0b06e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-08 02:47:31 +00:00
Jooyung Han
741d079d3c Merge "Add dependency to /vendor/etc/linker.config.pb" am: cd10355f3e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2473687

Change-Id: I3f8addf829fafda072aff26f3e9d63a1f5c09394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-08 02:11:51 +00:00
Jooyung Han
cd10355f3e Merge "Add dependency to /vendor/etc/linker.config.pb" 2023-03-08 01:34:23 +00:00
Evgenii Stepanov
cc0527f15e Merge "Add armv9-a arch variant." am: e497e7dfba am: fd3a7181df 
Original change: https://android-review.googlesource.com/c/platform/build/+/2471731

Change-Id: I8349bd70d179e88edd8db9f4d457f44f34c878b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-08 00:09:13 +00:00
Evgenii Stepanov
fd3a7181df Merge "Add armv9-a arch variant." am: e497e7dfba 
Original change: https://android-review.googlesource.com/c/platform/build/+/2471731

Change-Id: If684ebdabe50db2c7c78692e861aab8717e5afc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 23:34:08 +00:00
Evgenii Stepanov
e497e7dfba Merge "Add armv9-a arch variant." 2023-03-07 22:58:10 +00:00
Jooyung Han
63975d73b1 Add dependency to /vendor/etc/linker.config.pb 
The rule for the file should depend on vendor files. Otherwise, the rule
can be fired before installation of those stub libraries in /vendor/lib.

Bug: 244531518
Test: m (with a vendor lib with stubs)
Test: check /vendor/etc/linker.config.pb (should have the lib)
    $ conv_linker_config print -s $OUT/vendor/etc/linker.config.pb
Change-Id: If7a81e26a7a105234201b10cd58825c67a1d5967
 2023-03-07 18:28:18 +09:00
Treehugger Robot
218232234c Merge "Create vendor/etc/linker.config.pb with STUB_LIBRARIES" am: 8cd77dcec6 am: cf0325c0c0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2470880

Change-Id: Ib832bf7293b3c4f2d77949e7832b60452a80958b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 19:48:04 +00:00
Treehugger Robot
cf0325c0c0 Merge "Create vendor/etc/linker.config.pb with STUB_LIBRARIES" am: 8cd77dcec6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2470880

Change-Id: I0ba37422a26b7f3a51faee969eef14039690fe22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 19:11:54 +00:00
Evgenii Stepanov
3148fe365b Add armv9-a arch variant. 
Bug: b/263283855
Test: none
Change-Id: I0e9fd48305ad1a26a708ecb2f0d3e7a07e14dbc8
 2023-03-05 14:38:12 -08:00
Jooyung Han
8c119032f4 Create vendor/etc/linker.config.pb with STUB_LIBRARIES 
system/etc/linker.config.pb is automatically populated with
STUB_LIBRARIES. We do the same for vendor/etc/linker.config.pb.

Bug: 244531518
Test: m vendorimage
Change-Id: If930ca07fcf7c6830b70a0332dae05365b90db12
 2023-03-04 08:32:34 +09:00
Treehugger Robot
8849fa52d4 Merge "Can declare 1p without cycles." am: 04d5903f12 am: e26da42cf0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2464668

Change-Id: I61afb68743395d7b3191df96a2041f14836f4bdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-02 05:07:40 +00:00
Treehugger Robot
e26da42cf0 Merge "Can declare 1p without cycles." am: 04d5903f12 
Original change: https://android-review.googlesource.com/c/platform/build/+/2464668

Change-Id: I29ff0ebc7918705924020ef196830709b685e7c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-02 04:31:31 +00:00
Treehugger Robot
931b1ea788 Merge changes I7266c0cc,I3caba054 am: c986b3ada3 am: 6e6fb8291f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2464633

Change-Id: If811f90597118bad5fe7daf53093aae09d625419
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-02 00:28:44 +00:00
Treehugger Robot
bbfc27134d Merge "BUILT_KERNEL_CONFIGS_FILE built by linux tools" am: 37600f4573 am: b7ee2672ec 
Original change: https://android-review.googlesource.com/c/platform/build/+/2464631

Change-Id: Ia7033607ff3bd1a2722870d4beb4d91e7a796084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-02 00:27:36 +00:00
Treehugger Robot
6e6fb8291f Merge changes I7266c0cc,I3caba054 am: c986b3ada3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2464633

Change-Id: I741ebdb2cb8f1f77e99e50d1026dbe507b0ff7a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 23:53:52 +00:00
Treehugger Robot
b7ee2672ec Merge "BUILT_KERNEL_CONFIGS_FILE built by linux tools" am: 37600f4573 
Original change: https://android-review.googlesource.com/c/platform/build/+/2464631

Change-Id: If539a9525ce219b9df192e6dba149db18bbbd67e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 23:53:19 +00:00
Bob Badour
7aee59482b Can declare 1p without cycles. 
Test: m droid dist
Change-Id: I044f1832db36d685628faed569f87491a6789591
 2023-03-01 15:51:24 -08:00
Bob Badour
df0f55e526 Assert copyright on log contents. 
Test: m droid dist
Change-Id: I7266c0cc7c1517482e3aa66f8c7df3a6fbe484fe
 2023-03-01 10:34:34 -08:00
Bob Badour
1d31e2d776 Assert copyright on comments in file. 
Test: m droid dist
Change-Id: I3caba054f44e1dcc9896fd4121c3d6a1a5139158
 2023-03-01 10:31:25 -08:00
Bob Badour
7cc4e334ca BUILT_KERNEL_CONFIGS_FILE built by linux tools 
Doesn't qualify as 0p. Use kernel license text.

Test: m droid dist
Change-Id: Ideb88128b3c0f250d4c978291a028b2952b73ba9
 2023-03-01 10:16:04 -08:00
Cole Faust
a3763c18ef Don't install jni libs for uninstallable modules 
Bug: 254205429
Test: Presubmits
Change-Id: I6739b71ce4a0141ad39d4b6046ae63c4c12e367d
 2023-02-28 18:10:23 -08:00
Joe Onorato
3dc4c35514 Merge "Remove OWNERS access for non-build team people to core build system" am: 10bdfb5f23 am: a29a46050a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2460830

Change-Id: Ia1a2478549efd05eac8d2a1325dea31e96adece5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 22:44:04 +00:00
Joe Onorato
a29a46050a Merge "Remove OWNERS access for non-build team people to core build system" am: 10bdfb5f23 
Original change: https://android-review.googlesource.com/c/platform/build/+/2460830

Change-Id: I5e369235fae2ca61361873f95712dcb9d2d83570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 22:02:37 +00:00
Joe Onorato
10bdfb5f23 Merge "Remove OWNERS access for non-build team people to core build system" 2023-02-28 21:27:22 +00:00
Joe Onorato
682f36220b Remove OWNERS access for non-build team people to core build system 
Test: treehugger
Change-Id: I578a2902b6d0853fffe4c3513322da4c15300513
 2023-02-28 10:52:10 -08:00
Erick Alvarez
4ca5ad6121 Merge "Revert "Disable dexpreopt for aosp_riscv64"" am: 37d0273275 am: e6ff3ed647 
Original change: https://android-review.googlesource.com/c/platform/build/+/2458952

Change-Id: I93c17dc9e2d0b7a0ec24433858c2d7d76701ada7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 00:04:30 +00:00
Florian Mayer
4cb1cd1e80 Merge "driveby: Fix typo" am: 2e39131d80 am: 45f02948a0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2449823

Change-Id: I426146aa487ac016ab0421254460a03487468d59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 00:03:30 +00:00
Android Build Coastguard Worker
e5b3e8763a Version bump to TQ2A.230405.002 [core/build_id.mk] 
Change-Id: Ib2ee903d092e5bc2db11107c4e6170f4450686bb
 2023-02-27 23:29:11 +00:00
Erick Alvarez
e6ff3ed647 Merge "Revert "Disable dexpreopt for aosp_riscv64"" am: 37d0273275 
Original change: https://android-review.googlesource.com/c/platform/build/+/2458952

Change-Id: I3f8601eab485d89375640e65afc1e0674feb9bfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-27 23:19:27 +00:00
Florian Mayer
45f02948a0 Merge "driveby: Fix typo" am: 2e39131d80 
Original change: https://android-review.googlesource.com/c/platform/build/+/2449823

Change-Id: If2b3e5038bd72fc81bc77e278b17290b12e8ab18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-27 23:19:08 +00:00
Erick Alvarez
37d0273275 Merge "Revert "Disable dexpreopt for aosp_riscv64"" 2023-02-27 21:20:34 +00:00
Colin Cross
a1d6109978 Disable riscv64 dependency on bcc and ld.mc 
riscv64 can't build the device version of bcc and ld.mc due to a
dependency on an old version of LLVM, but they are listed in
base_system.mk which can't add them conditionally based on the target
architecture.  Add a hack to base_system.mk to silence the warning
that the host-only modules are listed in PRODUCT_PACKAGES.  This
can be removed once renderscript is removed from the platform.

Test: lunch aosp_riscv64-userdebug && m
Change-Id: I8efd769a34b110dfb838f7016e029369cb9a0f01
 2023-02-27 21:12:07 +00:00
Erick Alvarez
2b8cf0e409 Revert "Disable dexpreopt for aosp_riscv64" 
This reverts commit e325f61525.

Reason for revert: DroidMonitor-triggered revert due to breakage in some branches.

Bug: 270958097
Change-Id: I2c3bb568c7f3b0dc7a364ea74b91574966102ff3
 2023-02-27 20:39:14 +00:00
Florian Mayer
2e39131d80 Merge "driveby: Fix typo" 2023-02-27 19:36:39 +00:00
Ulya Trofimovich
0b41384361 Merge "Disable dexpreopt for aosp_riscv64" am: ee254eca0f am: 18a94331ca 
Original change: https://android-review.googlesource.com/c/platform/build/+/2450642

Change-Id: I1e16b1c36dd81900f8a7dc9b1c1130ef77cddbde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-27 12:51:27 +00:00
Ulya Trofimovich
18a94331ca Merge "Disable dexpreopt for aosp_riscv64" am: ee254eca0f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2450642

Change-Id: I8e96a2f0098577f1bcddadb413ed2f4fc2f33bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-27 12:15:00 +00:00
Florian Mayer
5e3f57c2d5 driveby: Fix typo 
Change-Id: I3aa8a0bdd15d16975b8b630b03590457b8ac9326
 2023-02-24 19:34:25 +00:00
Ulya Trafimovich
e325f61525 Disable dexpreopt for aosp_riscv64 
dex2oat isn't supported for riscv64 yet, disable dexpreopt.  For
aosp_riscv64-user and -userdebug builds it is also necessary to
relax the requirement that dexpreopt is enabled.

Test: trehugger
Change-Id: Ib84f1b40675783d286f4ff89d3c1daa9c7be710a
 2023-02-24 14:09:10 +00:00
William Escande
384a895afc Merge "Modified BT module to be built from source by product" into tm-qpr-dev am: 0f85faa672 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21388898

Change-Id: I69504f57fab421d65992b7e20d3aef3da70af778
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 05:55:39 +00:00
William Escande
0f85faa672 Merge "Modified BT module to be built from source by product" into tm-qpr-dev 2023-02-24 05:09:53 +00:00
Treehugger Robot
b938d10522 Merge "Add zip2zip to dependency of relevant binary targets" am: fddcbb03a1 am: 36b1360655 
Original change: https://android-review.googlesource.com/c/platform/build/+/2447682

Change-Id: Ia7b68cc18ba0fa4451b24a8f90cf49ba359606a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 21:36:29 +00:00
Treehugger Robot
36b1360655 Merge "Add zip2zip to dependency of relevant binary targets" am: fddcbb03a1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2447682

Change-Id: Ia9fe8644d335faf13e40036166708ae58c89b337
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 20:54:39 +00:00
Treehugger Robot
fddcbb03a1 Merge "Add zip2zip to dependency of relevant binary targets" 2023-02-22 19:46:32 +00:00
Koli Lin
5810c0bae8 Modified BT module to be built from source by product 
This CL enables the capability to build from source. Haven't implemented the function on any product yet. To enable it, please follow ag/21397639 to define flag on product mk file.

Bug: 268325561
Test: manual test on local
Change-Id: I10f1901ad26ef941465af20d2bb5ab49434baaf3
 2023-02-22 03:02:26 +00:00
Kelvin Zhang
6d366d36e4 Add zip2zip to dependency of relevant binary targets 
Bug: 269735619
Change-Id: I7eb3de066ec17cfcb072b4072997e3bafa83fbcd
 2023-02-21 12:49:20 -08:00
Vincent Donnefort
f74012fd97 Merge "Fix missing dev nodes in init_boot.img ramdisk" am: 65af9993b3 am: 07738c42b2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2442241

Change-Id: I09c97d6d099179f7760a7ab17467d08b19710455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-20 11:36:17 +00:00
Vincent Donnefort
07738c42b2 Merge "Fix missing dev nodes in init_boot.img ramdisk" am: 65af9993b3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2442241

Change-Id: Iace7a345a0ea5cfa19eb80d20179c2166bd89363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-20 10:33:49 +00:00
Vincent Donnefort
65af9993b3 Merge "Fix missing dev nodes in init_boot.img ramdisk" 2023-02-20 09:24:04 +00:00
Zhenhuang Wang
a82b2b5658 Merge "Enable -sha256 feature to device-tests.zip" am: 195b5fc64c am: c14d68cebe 
Original change: https://android-review.googlesource.com/c/platform/build/+/2442621

Change-Id: I97d1c57c96a46bf973ea6e40f884b9cacaa7646d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-20 09:05:06 +00:00
Zhenhuang Wang
c14d68cebe Merge "Enable -sha256 feature to device-tests.zip" am: 195b5fc64c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2442621

Change-Id: Iea20ef137e33304479451116f8911cf3ec55735a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-20 08:03:32 +00:00
Vincent Donnefort
6e861e9cf8 Fix missing dev nodes in init_boot.img ramdisk 
Previously ("Add null and console dev nodes to the Android initramfs")
introduced into init_boot.img the /dev/console and /dev/null nodes.
Sadly, it missed changing the release tools which are also generating
images in their own way.

Bug: 254835242
Change-Id: I4d2893ac24c09cf0d117422cbe2bde66083e7118
 2023-02-17 10:52:28 +00:00
Zhenhuang Wang
d1dfcda616 Enable -sha256 feature to device-tests.zip 
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: m dist device-tests
Change-Id: Id5d2cba9096983da4f4843146a5eaa84393b4880
 2023-02-17 17:48:24 +08:00
Treehugger Robot
d1b9531f3a Merge "Rename otatools dependency from futility to futility-host" am: 272d090d39 am: 287c48cda6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2264495

Change-Id: I4721c6f4283699012f5785d85305f7152b8cc0d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-16 08:53:33 +00:00
Treehugger Robot
287c48cda6 Merge "Rename otatools dependency from futility to futility-host" am: 272d090d39 
Original change: https://android-review.googlesource.com/c/platform/build/+/2264495

Change-Id: I9f9a37e11c1c3c889ec1b295cabceb8de4102d9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-16 08:12:44 +00:00
Treehugger Robot
272d090d39 Merge "Rename otatools dependency from futility to futility-host" 2023-02-16 07:39:05 +00:00
Zhenhuang Wang
55ed878a74 Merge "Revert "Revert "Enable -sha256 feature to some Soong built zip files""" am: 371da61096 am: 963bc9676e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2434552

Change-Id: If0e839be1b406f6d8f253a9f87c8be0fad86eeff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-16 03:58:45 +00:00
Zhenhuang Wang
963bc9676e Merge "Revert "Revert "Enable -sha256 feature to some Soong built zip files""" am: 371da61096 
Original change: https://android-review.googlesource.com/c/platform/build/+/2434552

Change-Id: I8c9201b19e39bfa3455c1fd231d21cdfa174f5a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-16 03:10:39 +00:00
Zhenhuang Wang
371da61096 Merge "Revert "Revert "Enable -sha256 feature to some Soong built zip files""" 2023-02-16 02:10:40 +00:00
Aaron Kling
e380321735 Rename otatools dependency from futility to futility-host 
The futility target for host is futility-host. This is required for
ryu out of tree signing.

Change-Id: I6c06ec69f991abc23597e19dd4478774cc4d56c4
 2023-02-15 21:12:23 +00:00
Xin Li
27b4d0c71f Merge "Merge TQ2A.230305.008" into stage-aosp-master 2023-02-15 19:45:53 +00:00
Spandan Das
48b2aa9d87 Merge "Dist api_fingerprint file for droidcore" am: d3e1b41c33 am: 3c48d0938d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2435767

Change-Id: I5b8cabb5459b2850482bf1709882d9f71c7adb31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-15 19:31:35 +00:00