Commit graph

33045 commits

Author SHA1 Message Date
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
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
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
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
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
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
d2b9ad4eb4 Merge "Disable riscv64 dependency on bcc and ld.mc" 2023-03-16 19:39:00 +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
Treehugger Robot
d4248892e6 Merge "add make_erofs to otatools to support erofs apex" 2023-03-14 15:47:05 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
3c48d0938d Merge "Dist api_fingerprint file for droidcore" am: d3e1b41c33
Original change: https://android-review.googlesource.com/c/platform/build/+/2435767

Change-Id: Iaa2c36fc11d69793ec0a7a455191a3846ec400e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 18:48:55 +00:00
Kelvin Zhang
f0a1afdd56 Merge "Copy all files from BOARD_SYSTEM_DLKM_SRC" am: 8ffc90d4e9
Original change: https://android-review.googlesource.com/c/platform/build/+/2435770

Change-Id: Ia538767800ec15b648b21ea84c215b28ccfa8ef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 18:47:30 +00:00
Spandan Das
d3e1b41c33 Merge "Dist api_fingerprint file for droidcore" 2023-02-15 18:06:27 +00:00
Kelvin Zhang
8ffc90d4e9 Merge "Copy all files from BOARD_SYSTEM_DLKM_SRC" 2023-02-15 18:03:02 +00:00
Kelvin Zhang
19961b53c4 Copy all files from BOARD_SYSTEM_DLKM_SRC
BOARD_SYSTEM_DLKM_SRC might contain files such as modules.dep. These
files also need to be copied, so relax the globbing pattern to copy all
files under BOARD_SYSTEM_DLKM_SRC.

Test: th
Bug: 267014648
Change-Id: I1fef8f8d7fe01fd4bd99d62981c108d95ef47bfe
2023-02-14 18:23:28 -08:00
Xin Li
95bbef8402 Merge TQ2A.230305.008
Bug: 264720040
Merged-In: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
Change-Id: I0cf59fc2635e8d951da0bbeced842f92c3d5b655
2023-02-14 16:13:00 -08:00