Commit Graph

35187 Commits

Author SHA1 Message Date
Martin Stjernholm 3311c129d4 Merge "Allow dependencies from platform variants to APEX modules." am: f8c9713fb8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1654679

Change-Id: I5c7f1abe0b76fe7392be039c03f0c2453a8e25a6
2021-04-01 07:37:21 +00:00
Martin Stjernholm f8c9713fb8 Merge "Allow dependencies from platform variants to APEX modules." 2021-04-01 06:53:13 +00:00
Treehugger Robot 4ce23de995 Merge ""current" is implicitly added to stubs.versions" am: 25c47a43a5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1641782

Change-Id: I282a22d88d5eb9447cac06379d920400260a6bba
2021-04-01 05:30:50 +00:00
Treehugger Robot 25c47a43a5 Merge ""current" is implicitly added to stubs.versions" 2021-04-01 04:53:55 +00:00
Yi Kong dd19e029a5 Merge "Move gen_sorted_bss_symbols.sh to use LLVM binutils" am: 9d9e053964
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1659997

Change-Id: Id8c53b797052a0ed422e512872d7500ddda383da
2021-04-01 03:56:26 +00:00
Yi Kong 9d9e053964 Merge "Move gen_sorted_bss_symbols.sh to use LLVM binutils" 2021-04-01 03:10:08 +00:00
Colin Cross 2d4d403560 Merge "Fix multiple copies of read-only files in sbox" am: 85920c9389
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660771

Change-Id: Id5fe4b0d8b4d276644458b4f1258893a002f1b8e
2021-04-01 01:33:17 +00:00
Colin Cross 85920c9389 Merge "Fix multiple copies of read-only files in sbox" 2021-04-01 01:09:45 +00:00
Jiyong Park d4a3a137ed "current" is implicitly added to stubs.versions
So far, when a library `libfoo` has `stubs.versions: ["10", "11"]`, then
`shared_libs: ["libfoo"]` is linked to the version 11 of the stub.

This requires the author of `libfoo` to manually update the property
whenever a new version is introduced. Otherwise, clients are not able
to use the newly added APIs because the latest stub is for an old
version.

This change eliminates the need for manual updating. "current" version
is always implicitly added to `stubs.versions`. It is added even when
nothing is set on the property, if `stubs.symbol_file` is set. i.e.

```
cc_library {
    name: "libfoo",
    stubs: {
        symbol_file: "libfoo.map.txt",
	// no versions: [...] needed
    },
}

cc_library {
    name: "a_client",
    shared_libs: ["libfoo"],
    apex_available: ["myapex"],
    min_sdk_version: "29",
}

apex {
    name: "myapex",
    native_shared_libraries: ["a_client"],
    min_sdk_version: "29",
}
```

`a_client` links to the "current" stub of `libfoo` that has all symbols
shown in the map file.

Note that, above doesn't mean that the client has unlimited access to
APIs that are introduced even after the min_sdk_version of the client
(29 in this example). The use of such APIs still has to be guarded with
`__builtin_available` check.

Bug: N/A
Test: m
Change-Id: I70bb1600c18e74d36c6b24c3569d2149f02aaf96
2021-04-01 09:58:53 +09:00
Treehugger Robot 0c00222c5e Merge "Add default group support for logical_partition" am: ce08a57bb1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1657799

Change-Id: Iac93209083514c337fc09d75b6b8d148d4d85507
2021-04-01 00:49:01 +00:00
Treehugger Robot ce08a57bb1 Merge "Add default group support for logical_partition" 2021-04-01 00:15:19 +00:00
Paul Duffin 3971c45155 Merge "Remove unused java testing methods" am: 4aa7faf487
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658077

Change-Id: I55beb41a60f7c77110143987534bf5e0200cf03a
2021-03-31 22:47:02 +00:00
Paul Duffin 7eee85fcae Merge "Convert testDexpreoptWithApexes to use test fixtures" am: bcaf0fcb55
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658076

Change-Id: I53a4b8bccc0069d1957e5b5637bcf6827e472a3d
2021-03-31 22:46:53 +00:00
Paul Duffin 6f3f57cbd8 Merge "Convert TestApexPermittedPackagesRules to use test fixtures" am: b00c7ed2e8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658075

Change-Id: I8f695e8d3efd6c54592c5eca3e5de6c940f55af4
2021-03-31 22:46:00 +00:00
Paul Duffin 4aa7faf487 Merge "Remove unused java testing methods" 2021-03-31 21:41:42 +00:00
Paul Duffin bcaf0fcb55 Merge "Convert testDexpreoptWithApexes to use test fixtures" 2021-03-31 21:41:00 +00:00
Paul Duffin b00c7ed2e8 Merge "Convert TestApexPermittedPackagesRules to use test fixtures" 2021-03-31 21:40:09 +00:00
Colin Cross 607c0b795c Fix multiple copies of read-only files in sbox
Sbox preserves the permissions of input files when copying them into the
sandbox.  A read-only file copied into the sandbox multiple times causes
a permission denied error on the second write.  Building in Bazel results
in more read-only files, which triggers the issue on existing sbox rules
with duplicate input files.  Remove the destination file when copying if
it exists.

Bug: 184113103
Test: m USE_BAZEL=true
Change-Id: I7edf92d82b766100e3cbbd90d22428269d7d0167
2021-03-31 13:17:42 -07:00
Treehugger Robot 1a7afb484c Merge "Do not build stats-log-api-gen-exports in mainline builds" am: fdfb9540f6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1656192

Change-Id: Icc3d770747da437c9e98d92eb4ebe99591fc4136
2021-03-31 19:55:37 +00:00
Liz Kammer 2cc845060d Merge "Handle product_variable asflag for cc_object." am: acacbc1166
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652787

Change-Id: If76000e28e7499243a87a5811852a62350dbe5a0
2021-03-31 19:51:48 +00:00
Liz Kammer 227e8e9493 Merge "Don't use custom mixed build logic for cc_object" am: 7dfaa3a732
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1615643

Change-Id: I517f16a5ce4b141fa26b50d7533ee0ba8ef6fa19
2021-03-31 19:51:30 +00:00
Treehugger Robot fdfb9540f6 Merge "Do not build stats-log-api-gen-exports in mainline builds" 2021-03-31 18:48:18 +00:00
Liz Kammer acacbc1166 Merge "Handle product_variable asflag for cc_object." 2021-03-31 18:43:55 +00:00
Liz Kammer 7dfaa3a732 Merge "Don't use custom mixed build logic for cc_object" 2021-03-31 18:43:55 +00:00
Paul Duffin cffb5bf2c4 Merge "Remove varargs from Fixture(t *testing.T)" am: 301099e451
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660017

Change-Id: I907a9533e80eafb33c6f0389cac12c4fb3d9f006
2021-03-31 17:56:11 +00:00
Paul Duffin f199bedb2d Merge "Remove varargs from RunTest(t *testing.T)" am: 5086512524
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658078

Change-Id: Ib8249d0e33acbc0f6da88d90e3758b810debedc0
2021-03-31 17:55:24 +00:00
Paul Duffin 301099e451 Merge "Remove varargs from Fixture(t *testing.T)" 2021-03-31 17:18:58 +00:00
Paul Duffin 5086512524 Merge "Remove varargs from RunTest(t *testing.T)" 2021-03-31 17:18:14 +00:00
Christopher Parsons 776f9ef8cb Merge "Register bp2build module types even outside generation" am: c68bc37e51
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1657219

Change-Id: I6804bd38c95e121746995a18a59f5473338ce2cf
2021-03-31 16:56:19 +00:00
Treehugger Robot c2afccd7a2 Merge "Add license for bloaty subdirectory." am: 838449d993
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655029

Change-Id: I5ad9baf2e55554ecfecbd4e550f5200e1fb39c9b
2021-03-31 16:52:29 +00:00
Christopher Parsons c68bc37e51 Merge "Register bp2build module types even outside generation" 2021-03-31 16:32:37 +00:00
Chris Parsons b164b381b2 Register bp2build module types even outside generation
Without this fix, mixed builds are silently disabled, as a recent change
disabled mixed builds for all module types which are not listed in this
map. This map should be populated for both bp2build generation and for
mixed builds.

Test: lunch aosp_flame && USE_BAZEL_ANALYSIS=1 m libc
Change-Id: Ib2a3fb2de2e7a5204ef01355522ae569e0424dc7
2021-03-31 12:26:01 -04:00
Treehugger Robot 838449d993 Merge "Add license for bloaty subdirectory." 2021-03-31 16:14:51 +00:00
Paul Duffin 535e0a105e Remove unused java testing methods
Also, stops exporting methods that are no longer used outside the java
package.

Bug: 181070625
Test: m nothing
Change-Id: I23d35bbc21f82f2dae802aa53badda4c58b41024
2021-03-31 16:20:12 +01:00
Paul Duffin 5560712323 Convert testDexpreoptWithApexes to use test fixtures
Bug: 181070625
Test: m nothing
Change-Id: Id40064c539c1d4eeb39396f0881a97529f3a3452
2021-03-31 16:16:20 +01:00
Paul Duffin 45338f05e3 Convert TestApexPermittedPackagesRules to use test fixtures
Adds PrepareForTestWithNeverallowRules to make it easy to test
neverallow rules. Avoid exporting any unnecessary neverallow related
methods from the android package.

Bug: 181070625
Test: m nothing
Change-Id: Idfc6955cb23f1a4d1790be7879388154b03f3980
2021-03-31 16:16:18 +01:00
Paul Duffin 18674bc4a8 Merge changes Ia3e93b8a,I964af3cb am: 4f6d15465b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655215

Change-Id: Ic544a97baed5a669a9528505b5a4110b8e738762
2021-03-31 15:15:17 +00:00
Paul Duffin 3b56761441 Merge "Extract prepareForCcTest" am: d11d199ba6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655213

Change-Id: I16a5fd04cedaa91b98b82c3450a39d80070a64a2
2021-03-31 15:15:01 +00:00
Paul Duffin 34a7fff9e0 Remove varargs from Fixture(t *testing.T)
Bug: 182885307
Test: m nothing
Change-Id: I71c3cf47ba1dc8d29d1533789c4c991cb825bd88
2021-03-31 16:04:07 +01:00
Paul Duffin 55e740e9a6 Remove varargs from RunTest(t *testing.T)
Use GroupFixturePreparers instead.

Bug: 182885307
Test: m nothing
Change-Id: Iaedb0ddc9d6a704f4d41363e705f3025a1291dc8
2021-03-31 16:03:59 +01:00
Paul Duffin 4f6d15465b Merge changes Ia3e93b8a,I964af3cb
* changes:
  Remove ccFixtureFactory
  Remove buildDir from cc package
2021-03-31 14:26:03 +00:00
Paul Duffin d11d199ba6 Merge "Extract prepareForCcTest" 2021-03-31 14:25:19 +00:00
Paul Duffin 4ac8cd6582 Merge "Rename OptionalPath.RelativeToPath -> RelativeToTop" am: 32eccae1ac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658072

Change-Id: I6b9fd21978838a5bae4926e51ef94ca4d81e1560
2021-03-31 09:24:51 +00:00
Yi Kong bf1db7b149 Move gen_sorted_bss_symbols.sh to use LLVM binutils
Test: build
Change-Id: I496b92d963d127087daef405dafa24377d6bac97
2021-03-31 17:13:43 +08:00
Paul Duffin 32eccae1ac Merge "Rename OptionalPath.RelativeToPath -> RelativeToTop" 2021-03-31 08:57:43 +00:00
Ryan Prichard 1a454d987c Merge "Revert "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"" am: ae4246488f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658930

Change-Id: If041c23640c24b1b55ce360a8e8c2f38b1b598f7
2021-03-31 05:52:22 +00:00
Ryan Prichard ae4246488f Merge "Revert "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"" 2021-03-31 05:29:51 +00:00
Jose "Pepe" Galmes db27fa0986 Merge "Fix missing snapshot headers." am: 9d54139763
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658921

Change-Id: I3bb44e08056acef7021535bed77fa845c27a2d4e
2021-03-31 05:27:25 +00:00
Jose "Pepe" Galmes 9d54139763 Merge "Fix missing snapshot headers." 2021-03-31 04:45:43 +00:00
Ryan Prichard 74bdc28817 Revert "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"
This reverts commit 29b9de083e.

Reason for revert: b/184095989

Change-Id: I11d90562e0703631258a5e9f1b2dc36f1702289a
2021-03-31 03:25:57 +00:00