Commit Graph

32202 Commits

Author SHA1 Message Date
Treehugger Robot 882c042575 Merge "Document more functions, minor cleanup" 2020-12-01 14:07:35 +00:00
Ivan Lozano 259a07f0d1 Merge "rust: Add support for multiple protos per module." am: 9c3f653207
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1503832

Change-Id: Id97e7b1a7270b992c988cabefe8d6159d133f806
2020-12-01 13:25:51 +00:00
Ivan Lozano 9c3f653207 Merge "rust: Add support for multiple protos per module." 2020-12-01 13:11:57 +00:00
Jiyong Park d630bdd4dd Remove the arch-based filtering hack in packaging.go
aosp/1501613 has landed. The filtering hack is no longer needed.

Also, fixed a bug that the dependency to the dynamic linker is not
treated as install dep.

Bug: N/A
Test: `m hosttar` and compare the built cvd-host_package.tar.gz with and
without this change. There is no removed file.

Change-Id: I19ef64e10d34bc8be2592c5258505cd632c91af9
2020-12-01 19:25:39 +09:00
Ulyana Trafimovich e5b0fb9ee4 Merge changes from topic "soong-fixit-skavdrik" am: 0d18ef42ec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1507578

Change-Id: Id8ad46f99181aa7ca41fee9cbf8402ff2a2a5483
2020-12-01 10:24:19 +00:00
Ulyana Trafimovich 0d18ef42ec Merge changes from topic "soong-fixit-skavdrik"
* changes:
  Documenting java/dexpreopt_bootjars.go
  Documenting dexpreopt/class_loader_context.go.
2020-12-01 10:01:43 +00:00
Jiyong Park 31fc18441b Reformat comments in packaging.go am: cc1157cd49
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1509691

Change-Id: I25f06182273ed50ad3e610dfe80c37d84b92ee78
2020-12-01 05:51:09 +00:00
Jiyong Park cc1157cd49 Reformat comments in packaging.go
set textwidth=100

Bug: N/A
Test: N/A

Change-Id: I2fb315c9488010d189b7757a4d93be181672b4a6
2020-12-01 05:27:48 +00:00
Kiyoung Kim 24dfc1fbb2 Generate system stub library list at build time
List of stub libraries from system (and bionic APEX) is currently
managed in static file. This change generates the list at build time and
adds to the system config so linkerconfig can use it.

Bug: 172889962
Test: Build cuttlefish and confirmed list is generated in
/system/etc/linker.config.pb

Change-Id: Ie0400e9d1098b0de19c6a7c25f261384aadde0a3
2020-12-01 14:09:03 +09:00
Jiyong Park e989d3269d Merge "Clients of PackagingBase can customize dependency tag to use" am: 493e7ec3ee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1509690

Change-Id: I5599c23a746cc0056fefe0f063faf35509228748
2020-12-01 04:21:11 +00:00
Jiyong Park 493e7ec3ee Merge "Clients of PackagingBase can customize dependency tag to use" 2020-12-01 03:44:38 +00:00
Jiyong Park 65b6224471 Clients of PackagingBase can customize dependency tag to use
Previously, the dep tag used by PackagingBase was fixed, which prevented
some of its clients (e.g. cvd-host-package) from opting in to
android.InstallAlwaysNeededDependencyTag. Now, PackagingBase.AddDeps
accepts the dependency tag to use.

Also, dependencies toward rust dylib, rlib, and proc_macro are
configured to return true on InstallDepNeeded. This is required to
install shared_lib dependencies of the rust modules when they are
depended on by a rust binary.

Exempt-From-Owner-Approval: a trivial change after +2 from the owner.
This has to land ASAP as many users are affected by acloud being
unavailable.

Bug: N/A
Test: m
Test: acloud create --local-instance --local-image
Change-Id: If22aee7c6f314fcb03b9d4fe6901a2557f1e899c
2020-12-01 03:43:05 +00:00
Treehugger Robot 963d959672 Merge "Allow rust code in device/google/cuttlefish" am: 93bfe6bf76
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1511774

Change-Id: I5b1e10aafae6464d1ea0fc4018010d2df09eb1c6
2020-12-01 01:01:42 +00:00
Treehugger Robot f048eeb107 Merge "Soong: use deterministic temp dir names in sbox" am: 6e25bb9e5f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1511909

Change-Id: I79f298c95919a9e5c53a9cc964833ea8fe6e99fa
2020-12-01 00:59:57 +00:00
Treehugger Robot 93bfe6bf76 Merge "Allow rust code in device/google/cuttlefish" 2020-12-01 00:16:41 +00:00
Treehugger Robot 6e25bb9e5f Merge "Soong: use deterministic temp dir names in sbox" 2020-12-01 00:00:30 +00:00
Treehugger Robot bc7a7a3156 Merge "Add and update comments in ui/build/upload.go" am: bd8b0d26b2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1501490

Change-Id: I8cacc40caafd998dffda593acfc28e304d8025ba
2020-11-30 23:22:14 +00:00
Dan Albert b19953d04a Rename __ANDROID_SDK_VERSION__.
__ANDROID_SDK_VERSION__ is ambiguous. Rename it
__ANDROID_APEX_MIN_SDK_VERSION__ so it's clear which SDK version it
refers to.

Note that this is still different from the minSdkVersion of the module
being compiled. This is the max of *all* the minSdkVersions of modules
that this module shares an APEX with.

Test: treehugger
Bug: None
Change-Id: Id9cbd80a6bc99db8227daef4e1db9c893e63ad1e
2020-11-30 14:39:01 -08:00
Jaewoong Jung 60d6d57771 Improve comments in java/aapt2.go
Test: N/A
Change-Id: I4b35a7c8707b9c4b173bb4587f7634e570d78674
2020-11-30 14:16:02 -08:00
Treehugger Robot bd8b0d26b2 Merge "Add and update comments in ui/build/upload.go" 2020-11-30 22:01:38 +00:00
Alex Humesky facd16bb19 Merge "Update comments in genrule.go." am: ff5c9fcf48
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1507121

Change-Id: I60deb48cb71eca0df8af305eb8db98ae3b2f9863
2020-11-30 21:38:09 +00:00
Alex Humesky ff5c9fcf48 Merge "Update comments in genrule.go." 2020-11-30 21:16:29 +00:00
Treehugger Robot 1b639537e3 Merge "droidstubs: Remove unnecessary setting of DistFiles" am: 2f53f61d59
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1511917

Change-Id: I875da57a0ba28b3666c8a7a6c995af4349138bf2
2020-11-30 21:09:41 +00:00
Treehugger Robot 58ab27473d Merge "Add 'lo-prio' tag to temp blocklist." am: fd9fdec18e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1513211

Change-Id: Ia37a2695662da924238f97abfc005084c11ef4ce
2020-11-30 21:06:38 +00:00
Treehugger Robot 2f53f61d59 Merge "droidstubs: Remove unnecessary setting of DistFiles" 2020-11-30 20:49:17 +00:00
Treehugger Robot fd9fdec18e Merge "Add 'lo-prio' tag to temp blocklist." 2020-11-30 20:37:47 +00:00
Alex Humesky 29e3bbe8b8 Update comments in genrule.go.
Test: Noop
Change-Id: Ib341899ea0f04e059d5471ee6e5bff8ebba82583
2020-11-30 12:30:20 -05:00
Paul Duffin d8aed4b275 droidstubs: Remove unnecessary setting of DistFiles
Instead of setting DistFiles to use the api stub (if present) as the
default dist file this simply makes OutputFiles(tag) return the api
stub file for the DefaultDistTag.

Test: m nothing
      m dist sdk - before and after this change, compare result to
      make sure that there are no significant differences.
Bug: 174226317
Change-Id: I39d615c5bf8d20d59db7eeb98d942210ec0aa8ba
2020-11-30 17:20:09 +00:00
Sasha Smundak 1e53392425 Document more functions, minor cleanup
Fixes: 173745248
Test: treehugger
Change-Id: I075cc5197fff79179ea976927701290078e4d9ac
2020-11-30 08:53:58 -08:00
Jiyong Park 88365d1894 Merge "rust modules can be included in apex" am: fdea25781f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1508096

Change-Id: I0e33459ce8207779367bdf6b3abee79718f8adba
2020-11-30 16:36:39 +00:00
Jiyong Park fdea25781f Merge "rust modules can be included in apex" 2020-11-30 15:41:28 +00:00
Jiyong Park 99644e92c8 rust modules can be included in apex
We will have some APEXes having rust binaries and libraries. So, adding
the support for the types of modules.

rust.Module now inherits from android.ApexModuleBase and implements
the android.ApexModule interface.

Bug: 172414324
Test: m

Exempt-From-Owner-Approval: rebased after +2 from the owner
Change-Id: I356ef4c45f782a6460f001e83af96d1710642d80
2020-11-30 15:40:48 +00:00
Ivan Lozano 57f434e858 rust: Add support for multiple protos per module.
This further emulates the rust-protobuf gen_mod_rs flag by providing
support for generating a single module containing multiple protobuf
definitions.

Bug: 171361369
Test: New Soong tests.
Test: Example module containing multiple protos works.
Change-Id: I815f9628a8289ae512758073dac49bc4535abf01
2020-11-30 14:55:00 +00:00
Paul Duffin dd60120cfb Merge "java_sdk_library: Copy removed API specification file to dist" am: 8abcbdc0b3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1511916

Change-Id: I1181a19f5102c2b7c837492332186f12320c831f
2020-11-30 13:41:37 +00:00
Paul Duffin ba5ddbd78c Merge "Remove redundant setting of DistFiles by apexBundle" am: 11402caa47
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1511915

Change-Id: Ib12f4c17bd41dad2a005a28dd060ebbe1d245f06
2020-11-30 13:41:27 +00:00
Paul Duffin e9b3c66e22 Merge "Remove redundant setting of DistFiles by java.Library" am: a67ff601d9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1511914

Change-Id: I2795ea81390fe4532e10c4c208a47ab725b972d4
2020-11-30 13:41:15 +00:00
Paul Duffin 8abcbdc0b3 Merge "java_sdk_library: Copy removed API specification file to dist" 2020-11-30 13:24:19 +00:00
Paul Duffin 11402caa47 Merge "Remove redundant setting of DistFiles by apexBundle" 2020-11-30 13:24:00 +00:00
Paul Duffin a67ff601d9 Merge "Remove redundant setting of DistFiles by java.Library" 2020-11-30 13:23:50 +00:00
Paul Duffin fed1c082d0 Merge "Generalize the handling of dist tags" am: 5e95589fe9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1511913

Change-Id: If811b96f5ae891e85f7fbca7a7cf642568e2d808
2020-11-30 13:05:45 +00:00
Paul Duffin 982093faaf Merge "Differentiate between no dist tag and an empty dist tag" am: 4326e0e094
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1511911

Change-Id: I9044ee88fbf8bd7b0fc800ea11f4369816bb23b9
2020-11-30 13:05:01 +00:00
Paul Duffin 5e95589fe9 Merge "Generalize the handling of dist tags" 2020-11-30 12:42:55 +00:00
Paul Duffin 4326e0e094 Merge "Differentiate between no dist tag and an empty dist tag" 2020-11-30 12:31:53 +00:00
Mathew Inwood 17a8cd9634 Add 'lo-prio' tag to temp blocklist.
This is a temporary measure to allow these APIs to be identified by
downstream tooling. Before S is finished, these APIs will be moved
to the max-target-R list anyway.

Adding the lo-prio flag should have no semantic impact on these APIs
but does allow them to be distinguished from the regular blocklist
APIs.

Test: m
Bug: 174455522
Change-Id: I031dcecbdef34a4f93a0fec1a92d95f769918486
2020-11-30 11:47:30 +00:00
Thiébaud Weksteen db1f2483da Merge "Use 1.48.0 prebuilts" am: c9b71a446a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1512614

Change-Id: I03d2c3fdc6753a840557c94540bd610928e55bbb
2020-11-30 09:51:20 +00:00
Thiébaud Weksteen c9b71a446a Merge "Use 1.48.0 prebuilts" 2020-11-30 09:29:23 +00:00
Paul Duffin 61a4f20964 Improve test coverage of dist processing code am: 62269498be
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1512612

Change-Id: Id74f0ee3d7b4077ca3ff60292530ec12c0696b3c
2020-11-27 19:13:06 +00:00
Paul Duffin 879488716b Expand dist property checks to cover dists am: 89968e3dec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1511912

Change-Id: Ie88a749d00c712cc92ff9f7d2376ab0cc30d03c4
2020-11-27 19:13:02 +00:00
Paul Duffin f3f916c2a6 Remove duplicate tests from TestGetDistForGoals am: d83988dbad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1512611

Change-Id: Ic06bb2b734c237bd51aec0ad961358d8a5260880
2020-11-27 19:12:58 +00:00
Paul Duffin 04159e7961 Separate dist processing from make specific output am: 8b0349c652
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1512610

Change-Id: Ied0373d2789934815175f7b761e331cc5106553c
2020-11-27 19:12:28 +00:00