Commit Graph

33784 Commits

Author SHA1 Message Date
Paul Duffin
b79c3ab08e Merge changes I0f746a11,I08e61a24 am: 7e2fad3f89
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1571201

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb6345907acc569c8497f14909c910de91fbaa77
2021-02-03 10:21:44 +00:00
Paul Duffin
e1f9b35d92 Merge "Switch hiddenapi to use OutputPath instead of ModuleOutPath" 2021-02-03 10:02:36 +00:00
Paul Duffin
7e2fad3f89 Merge changes I0f746a11,I08e61a24
* changes:
  Make OutputPath implement objPathProvider
  Allow CopyDepsToZip() to work on WritablePath
2021-02-03 10:01:39 +00:00
Treehugger Robot
f35814e5fd Merge "bp2build: rename method for readability." am: ee0c35bcf8 am: 7b54f05a94
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1570320

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d6a9f191b5e5bd6a81b20c7f8aa76b29db38529
2021-02-03 09:37:15 +00:00
Treehugger Robot
7b54f05a94 Merge "bp2build: rename method for readability." am: ee0c35bcf8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1570320

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib9f0cd2022a9ae2de42f0ac6fc30f09c734767dc
2021-02-03 08:35:52 +00:00
Treehugger Robot
ee0c35bcf8 Merge "bp2build: rename method for readability." 2021-02-03 07:40:26 +00:00
Treehugger Robot
181e42ba45 Merge changes from topic "mkboot" am: 7a1c2b181c am: 11af963277
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1567523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6be7e700a2af235ef75b17dc2292c0bd017d9fd4
2021-02-03 00:04:10 +00:00
Jiyong Park
f0dcffaeaa android_filesystem supports compressed cpio format am: 11a65979d8 am: ce0e76fa91
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1567522

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I08746153b28346e2c9f8002dbade3b1b57cb9117
2021-02-03 00:04:09 +00:00
Jiyong Park
449b3f584c add prebuilt_kernel_modules module am: 6446b62e9e am: 0ffde39420
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1567521

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ec4bb6dd4e9f6e561c59fa42a704f866c0acc81
2021-02-03 00:04:08 +00:00
Jiyong Park
2f8ace64a9 arch.<arch>.deps now works in android_filesystem am: 2136d15326 am: 99f2002048
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1567520

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d692ad8c977df315bb894f68870335a863f17cc
2021-02-03 00:04:05 +00:00
Treehugger Robot
11af963277 Merge changes from topic "mkboot" am: 7a1c2b181c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1567523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71c9c501373049f668d2c08f1382ba8e064961ab
2021-02-02 23:41:38 +00:00
Jiyong Park
ce0e76fa91 android_filesystem supports compressed cpio format am: 11a65979d8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1567522

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03e03647e3407f68ca04b98e5deea3ba48e378ac
2021-02-02 23:41:34 +00:00
Jiyong Park
0ffde39420 add prebuilt_kernel_modules module am: 6446b62e9e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1567521

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd3d1555c38713c593d38174f7cf053bc717f2fb
2021-02-02 23:41:31 +00:00
Jiyong Park
99f2002048 arch.<arch>.deps now works in android_filesystem am: 2136d15326
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1567520

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ff90233fd24299cbfb1b80b167fb1d4089ba602
2021-02-02 23:41:05 +00:00
Treehugger Robot
7a1c2b181c Merge changes from topic "mkboot"
* changes:
  Add bootimg module type
  android_filesystem supports compressed cpio format
  add prebuilt_kernel_modules module
  arch.<arch>.deps now works in android_filesystem
2021-02-02 23:26:57 +00:00
Matthew Maurer
4b301ab299 Merge "rust: Use v0 mangling format globally" am: 632f080f88 am: 23d4dd8808
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1567744

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I26054a6b2b74de79ed4015939d16c9080c44b020
2021-02-02 22:32:37 +00:00
Martin Stjernholm
bd396b6d8a Force ART modules to be built from source here, regardless of default.
When we start switching vanilla platform builds to use ART prebuilts,
this script should still build from sources.

Test: TH
Bug: 172480615
Change-Id: I04cb61b484855d22f22fd9b82f6abb30eb5665c3
2021-02-02 22:24:00 +00:00
Matthew Maurer
23d4dd8808 Merge "rust: Use v0 mangling format globally" am: 632f080f88
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1567744

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic51f4a951cf4931107ae12f88bf1c4caaffaed15
2021-02-02 21:50:20 +00:00
Matthew Maurer
632f080f88 Merge "rust: Use v0 mangling format globally" 2021-02-02 20:30:56 +00:00
Tobias Thierer
dec7caec15 Merge "go/Android.bp: Clarify sdk_version documentation." am: dadc62cdb4 am: 922e7f941a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1518598

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie46c8ea7ea179f2e87fe6f1a6741c0035cb87766
2021-02-02 19:34:48 +00:00
Tobias Thierer
922e7f941a Merge "go/Android.bp: Clarify sdk_version documentation." am: dadc62cdb4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1518598

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3db7ccef7b97dc90425a310371356e82f6feec51
2021-02-02 19:06:50 +00:00
Tobias Thierer
dadc62cdb4 Merge "go/Android.bp: Clarify sdk_version documentation." 2021-02-02 18:19:38 +00:00
Paul Duffin
612e610063 Switch hiddenapi to use OutputPath instead of ModuleOutPath
In order to allow the hiddenapi code which expects its inputs to be
ModuleOutPath to consume the output from the deapexer module type (used
by prebuilt_apex) this change converts the hiddenapi from using
ModuleOutPath to use OutputPath instead.

This is part of a general cleanup to remove ModuleOutPath that is
separated out in order to avoid having the hiddenapi work dependent
upon and possibly delayed by issues with that general cleanup.

Bug: 178361284
Bug: 179124768
Test: m droid
Change-Id: I890f775bf5e33528dbaa62b95fa4198185ff8bf8
2021-02-02 14:42:05 +00:00
Paul Duffin
0267d49255 Make OutputPath implement objPathProvider
Needed to allow OutputPath to replace some usages of ModuleOutPath.

Bug: 179124768
Test: m droid
Change-Id: I0f746a11c53ed8c9c9193b57afc0b06c0249ff75
2021-02-02 13:33:51 +00:00
Paul Duffin
4076a75fd7 Allow CopyDepsToZip() to work on WritablePath
Makes the method more generally usable as it can work with any
WritablePath not just OutputPath. Also, makes it independent of whether
PathForModuleOut() returns ModuleOutPath or OutputPath.

Bug: 179124768
Test: m nothing
Change-Id: I08e61a24722198aa92fa2f8a2d096b1a8bf9c5c2
2021-02-02 13:32:12 +00:00
Jingwen Chen
4d2c0878a3 bp2build: rename method for readability.
Rename GenerateSoongModuleTargets to GenerateBazelTargets to reflect its return type.

Test: TH
Change-Id: I5359c8f4365750790837a9d412946d0b7fae64b7
2021-02-02 07:06:56 -05:00
Inseob Kim
20fb5d4e24 Allow common arch for recovery
Test: build
Change-Id: I9cffd399e0d00b53c344aac6045eadcf5be78cb3
2021-02-02 20:07:58 +09:00
Julien Desprez
3b933d3165 Test changing default of cc_test_host
Switching all cc_test_host to unit_tests: true by default.
Resolved all the failures (passing presubmit) to enable this.

Test: presubmit trigger
Bug: 177450457
Change-Id: I815e40786c0b62cf0aadd9b837d35c48332639da
2021-02-01 17:34:44 -08:00
Inseob Kim
eb313b0574 Merge changes from topics "snapshot_androidmk_suffix", "snapshot_list_module" am: 38ce066d3b am: de6f9afbed
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1558812

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1f641f034265c154e6c6635b5e1eb22f96877ad5
2021-02-02 01:23:54 +00:00
Colin Cross
ba1e014129 Remove some global state from vendor and recovery snapshots am: e0edaf9d49 am: cdab9928d0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1558811

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibcc76ae785be4d01c1cf70b7caa25fb946d6b124
2021-02-02 01:23:52 +00:00
Inseob Kim
de6f9afbed Merge changes from topics "snapshot_androidmk_suffix", "snapshot_list_module" am: 38ce066d3b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1558812

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0ad754f7386433b343fbc81c557d85dca12d342
2021-02-02 00:45:43 +00:00
Colin Cross
cdab9928d0 Remove some global state from vendor and recovery snapshots am: e0edaf9d49
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1558811

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8248f5ea290648630e5608d3b4beb023805b4970
2021-02-02 00:45:16 +00:00
Matthew Maurer
20768b8840 rust: Use v0 mangling format globally
By default, rust uses the `legacy` mangling format. Using llvm coverage
switches it to using the new `v0` format. Rather than pushing the llvm
coverage back to `legacy` format, move Android forwards to `v0`. This
also has the added benefit that Rust symbols can be detected in the
codebase by looking for a leading "_R", aiding in demangler selection.

Test: builds, resulting object files have leading _R rather than _Z
Test: atest keystore2_test
Bug: 178565008
Change-Id: I7fcd591535d08260686c62fbfa6f7b61b31ed989
2021-02-02 00:23:26 +00:00
Inseob Kim
38ce066d3b Merge changes from topics "snapshot_androidmk_suffix", "snapshot_list_module"
* changes:
  Remove global state on module suffixes from vendor and recovery snapshots
  Remove some global state from vendor and recovery snapshots
2021-02-01 23:46:02 +00:00
Paul Duffin
3e9ce4716a Merge "Move creation of paths into hiddenAPIGenerateCSV" am: 8705ba06bf am: 9031379011
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1564637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37d8002f30b31451dc683ce72156d50f2e55ac64
2021-02-01 19:49:23 +00:00
Paul Duffin
9031379011 Merge "Move creation of paths into hiddenAPIGenerateCSV" am: 8705ba06bf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1564637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58db0940c7f677b262424abca5519c8401b1804f
2021-02-01 18:48:55 +00:00
Paul Duffin
8705ba06bf Merge "Move creation of paths into hiddenAPIGenerateCSV" 2021-02-01 17:28:20 +00:00
Treehugger Robot
c4cc98ccfd Merge "bp2build: flatten *_defaults properties." am: 1020772b04 am: 5b526fa4f5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1567079

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I359467b3f336affed6d5e5e9dd0775ad2abec309
2021-02-01 16:58:29 +00:00
Treehugger Robot
5b526fa4f5 Merge "bp2build: flatten *_defaults properties." am: 1020772b04
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1567079

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1efe9a38ec5e3b375f1192c1d7c1a3d658fbb140
2021-02-01 16:33:49 +00:00
Treehugger Robot
1020772b04 Merge "bp2build: flatten *_defaults properties." 2021-02-01 15:54:20 +00:00
Jiyong Park
11a65979d8 android_filesystem supports compressed cpio format
The format is used to create ramdisk image. Building ramdisk image in
Soong is required to have vendor_boot.img in the virt APEX.
vendor_boot.img consists of ramdisk and dtb.

Bug: 178980227
Test: m
Change-Id: Ie4e90cef8407b6e4bdf7f03f93724cdc3cd45c20
2021-02-02 00:41:57 +09:00
Jiyong Park
6446b62e9e add prebuilt_kernel_modules module
prebuilt_kernel_modules is a build rule for processing and installing
kernel module files. The module files are processed by depmod to build
modules.{load|alias|deps|softdeps} files. Debug symbols are stripped
from the module files and then all the files are installed to
./lib/modules/<kernel_version> directory.

This is the Soong-equivalent of the 'build-image-kernel-modules-dir`
macro and is expected to replace it in the future.

Bug: 178980227
Test: m

Change-Id: I772ac816824921d275869e35b93a083d239a2450
2021-02-02 00:41:57 +09:00
Jiyong Park
1f7b93e976 Add bootimg module type
The new module type is to build the boot partition images. Boot
partition image consists of kernel, ramdisk, dtb, etc. which are
processed by the mkbootimg tool. There are two flavors of boot
partition: boot and vendor_boot. The choice is configured via the
'vendor_boot' property. Currently, only `vendor_boot: true` case is
supported.

But: 178978059
Test: m cf_bootimg-5.10
Change-Id: Iee689d9d666e8e6e5af7db02a76dd39d1e4d0e3a
2021-02-02 00:41:57 +09:00
Jiyong Park
2136d15326 arch.<arch>.deps now works in android_filesystem
android_filesystem is a multi targets module type inhering from
PackagingBase. Since it's a multi-targets module, it is mutated only for
the common arch and therefore arch-specific properties are NOT squashed
into the matching top level property (i.e. setArchProperties is no op).

As a result, the values set in arch.<arch>.deps property were ignored.

This fixes the issue by explicitly adding the properties in
arch-specific structs and reading the properties in the matching arch.

Also added a set of tests for non-multi-target modules.

Bug: N/A
Test: m
Change-Id: Ibd4b509e73fa1760cc38b3661a08f83a6f639705
2021-02-02 00:41:28 +09:00
Colin Cross
a889080aba Remove global state on module suffixes from vendor and recovery snapshots
Propgate the Android.mk suffix from source modules into the snapshot so
that it can be used for the prebuilt modules.

Bug: 177098205
Test: vendor_snapshot_test.go
Change-Id: Iea151dc91395f714fbcad1df3a6fd0874e5455d9
2021-02-01 20:06:29 +09:00
Colin Cross
e0edaf9d49 Remove some global state from vendor and recovery snapshots
Snapshots storead global sets of modules that should be replaced with
vendor snapshot modules.  Move the data instead to a vendor_snapshot
or recovery_snapshot module type that depends on all the modules in
the snapshot, and then have modules that should use the snaphsot
depend on it to query for the set of modules that should be replaced.

Bug: 177098205
Test: vendor_snapshot_test.go
Change-Id: I2826adacfb473e9139b5ea93ba83b8a54cc1a56b
2021-02-01 20:02:39 +09:00
Paul Duffin
2c1c3cac9e Merge "Fix some minor issues with boot_image" am: aded43c808 am: 92db324beb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1566176

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I54537d03a79ad26895ecbee9be0e64fbde575c0f
2021-02-01 11:02:35 +00:00
Paul Duffin
4694cf7c81 Merge "Add boot_images to apex" am: 4a838dfb3f am: 4849ec99b9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560278

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I61aa45660665daf63e98ff1d51c2171ba76e0aa8
2021-02-01 11:02:23 +00:00
Ulyana Trafimovich
136d087a8e Merge "Write module dexpreopt.config for Make." am: a4fce3b488 am: 682808f0ad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1541538

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c0696bbcf536ddbf875c9e6c9e43bbc602b4b3f
2021-02-01 11:02:14 +00:00
Paul Duffin
4c73a0d554 Merge "Add documentation for the different files created by hiddenapi" am: 523bb85995 am: e3b48e4034
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1564636

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I442b5bfd65dbb863d79926c562dbe81205518501
2021-02-01 11:02:07 +00:00