StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,640 Commits 1 Branch 0 Tags
03cf98057f3ea48cdaf70204b1eec7553ddc71e9
Commit Graph

34640 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Duffin
03cf98057f Merge "Prevent ApexInfoMutator from creating unnecessary variants" am: b72dd403de 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642102

Change-Id: Ibe41f734d4983e7da974cb3c46ddd697a8308d14
 2021-03-18 15:49:49 +00:00
Paul Duffin
b72dd403de Merge "Prevent ApexInfoMutator from creating unnecessary variants" 2021-03-18 15:13:39 +00:00
Paul Duffin
c899e88474 Merge changes I9aad3e4e,I150889a0 am: b01125f92b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643949

Change-Id: I9db02b2be30cf5be39850bfe657b42304ba54b27
 2021-03-18 14:48:12 +00:00
Paul Duffin
b01125f92b Merge changes I9aad3e4e,I150889a0 
* changes:
  Convert xml package to fixtures
  Add preparers for xml
 2021-03-18 14:16:31 +00:00
Paul Duffin
c5b7854036 Merge "Add prebuilt_platform_compat_config" am: d5065cfc66 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642109

Change-Id: I13a379afd6596d4dbba95e21b35fb29b3d77a0ac
 2021-03-18 12:37:19 +00:00
Paul Duffin
3d7a4af9e4 Merge "Convert android/namespace_test.go to test fixtures" am: 4b9bb5c057 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1641399

Change-Id: I48a641ba34d7a3232289de22501308d28c3b3c83
 2021-03-18 12:37:11 +00:00
Paul Duffin
40a2e4ba4d Merge "Add FixtureIgnoreErrors" am: cb460c91f1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640338

Change-Id: Idfcad6a994bae3012705fea83d8749f2ef8db7ab
 2021-03-18 12:37:00 +00:00
Paul Duffin
973956dba9 Merge "Convert android/rule_builder_test.go to test fixtures" am: 50eb3829f9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640337

Change-Id: I6459ad88c50bca1ae50e2eadb0d2a7b3afa8d634
 2021-03-18 12:36:08 +00:00
Paul Duffin
d5065cfc66 Merge "Add prebuilt_platform_compat_config" 2021-03-18 12:28:00 +00:00
Paul Duffin
4b9bb5c057 Merge "Convert android/namespace_test.go to test fixtures" 2021-03-18 12:14:01 +00:00
Paul Duffin
cb460c91f1 Merge "Add FixtureIgnoreErrors" 2021-03-18 12:13:36 +00:00
Paul Duffin
50eb3829f9 Merge "Convert android/rule_builder_test.go to test fixtures" 2021-03-18 12:13:12 +00:00
Paul Duffin
412a1ed781 Merge "Convert android/paths_test.go to test fixtures" am: 0700f77806 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640336

Change-Id: Ia7ee38c0c492940f6d57d9991e619757736b5836
 2021-03-18 09:14:05 +00:00
Paul Duffin
55d4f4c4bc Merge "Convert android/module_test.go to test fixtures" am: e9ae3616a2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640335

Change-Id: Ib548ea2b18ae6b78ba6a2a1423b9ba1656d7bf3f
 2021-03-18 09:13:57 +00:00
Lukács T. Berki
0a70e6f72c Merge "Compile soong_build for debugging if needed." am: 734b215d66 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642103

Change-Id: Icdd146de55e8ac3fe78f20259b60cd82cea351a4
 2021-03-18 09:13:43 +00:00
Paul Duffin
8a861d2148 Merge "Convert android/defaults_test.go to test fixtures" am: 7f09fd298a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640334

Change-Id: Ib1780577c1420abf5f0fd35019d49fd0e20079ef
 2021-03-18 09:13:00 +00:00
Paul Duffin
573989d821 Prevent ApexInfoMutator from creating unnecessary variants 
Adds the AlwaysRequireApexVariantTag interface to enable
ApexInfoMutator to differentiate between a tag that is excluded from
apex contents but still requires an apex variant and a tag that is
excluded from apex contents and does not require an apex variant.

That is needed to support the sdkMemberVersionedDepTag which excludes
the target from being added to the APEX but requires an APEX variant.
A more detailed explanation is in the comments.

The AlwaysRequireApexVariant() method follows the pattern used in
ReplaceSourceWithPrebuilt of having a method that returns a bool to
trigger the behavior and not say ExcludeFromApexContentsTag that simply
relies on the tag implementing an interface to trigger. That is because
the former is more flexible and allows a tag type to parameterize the
behavior if necessary.

The tags that this will exclude from creating an apex variant are:
* PrebuiltDepTag - by the time the apex variant has been created any
  preferred prebuilts will have replaced the sources so there is no
  need to create an APEX variant if the only dependency path from the
  APEX to the prebuilt is via this tag.
* hiddenApiAnnotationsDependencyTag - the target of which is a purely
  build time artifect and MUST NEVER end up in the APEX.

It will also stop calling DepIsInSameApex for any dependency created
by the sdkMemberVersionedDepTag. Which will fix the issue reported in
the bug.

Bug: 182992071
Test: m nothing
Change-Id: I9569e488d6446ca45d3ea8f32a9b74524eb865df
 2021-03-18 09:05:28 +00:00
Paul Duffin
0700f77806 Merge "Convert android/paths_test.go to test fixtures" 2021-03-18 08:58:54 +00:00
Paul Duffin
e9ae3616a2 Merge "Convert android/module_test.go to test fixtures" 2021-03-18 08:58:19 +00:00
Lukács T. Berki
734b215d66 Merge "Compile soong_build for debugging if needed." 2021-03-18 08:58:16 +00:00
Paul Duffin
7f09fd298a Merge "Convert android/defaults_test.go to test fixtures" 2021-03-18 08:57:31 +00:00
Paul Duffin
f91adb93a2 Merge "Add AssertSame" am: c14e8aa6a8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640333

Change-Id: Ifb97e8ff4ba7e0e9437d7309d4e7711851a1a6de
 2021-03-18 08:56:38 +00:00
Paul Duffin
e8d96aa86b Merge "Convert android/csuite_config_test.go to test fixtures" am: 28f0e9e2cb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640332

Change-Id: Iab0fa2e8459f3d97c06b189de0d67881d35fa56f
 2021-03-18 08:56:30 +00:00
Paul Duffin
4323de3c85 Merge "Convert android/arch_test.go to test fixtures" am: 3bf545fa6b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640331

Change-Id: I92065d6ed2279960348a44cd2e5be276038a1bb1
 2021-03-18 08:56:22 +00:00
Paul Duffin
c14e8aa6a8 Merge "Add AssertSame" 2021-03-18 08:56:21 +00:00
Paul Duffin
f59543d75b Merge "Add OptionalFixturePreparer" am: abc6ec9d16 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640330

Change-Id: Ie6f2f51ffae94a7b3861f576826e9ac6501f3600
 2021-03-18 08:56:13 +00:00
Paul Duffin
c7cca88433 Merge "Remove android/apex_test.go use of buildDir" am: 81e7e2b9a3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640329

Change-Id: I13d38fe6a8f73f79a60fec8f33b5a48057ba9300
 2021-03-18 08:56:05 +00:00
Paul Duffin
03088ba909 Merge "Convert android/androidmk_test.go to test fixtures" am: aa8270eca7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640328

Change-Id: Iecbd20eb999bfa994b619e05d4a195804d1bbf62
 2021-03-18 08:55:57 +00:00
Paul Duffin
28f0e9e2cb Merge "Convert android/csuite_config_test.go to test fixtures" 2021-03-18 08:55:55 +00:00
Paul Duffin
85010603f7 Merge "Migrate bpf package to a per test build directory" am: 21d1b9a52c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640325

Change-Id: I90f05c107d1a78e79e74f7731071f43591f5ed61
 2021-03-18 08:55:49 +00:00
Paul Duffin
7eccf3774b Merge "Correct typo in the name of compatConfigTag" am: 603fa13e08 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642108

Change-Id: If070b560f51925193e504017f59047670930a172
 2021-03-18 08:55:41 +00:00
Paul Duffin
69f4244007 Merge "Allow apex dependencies to be restricted to source modules only" am: c0a5ccbf3b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642107

Change-Id: Ic8455ee25a714bac4113b62f1b60aeb51c3095c5
 2021-03-18 08:55:32 +00:00
Paul Duffin
3bf545fa6b Merge "Convert android/arch_test.go to test fixtures" 2021-03-18 08:55:29 +00:00
Paul Duffin
1d83ba3a10 Merge "Separate metadata provider from apex contents provider" am: 533cf74318 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642106

Change-Id: I83083ae32b307c648e6b8d482fd639a38c2e62c7
 2021-03-18 08:55:24 +00:00
Paul Duffin
308053d678 Merge "Add AssertIntEquals" am: a8c065522d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643062

Change-Id: I4aadae5694e78f508037525fada874a79eb6c57a
 2021-03-18 08:55:15 +00:00
Paul Duffin
f2dec10262 Merge "Add emptyFixtureFactory in java package" am: 93b61b49dd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642105

Change-Id: I7b0434c39d81563aa6e293ca83edb5fb04ad93a7
 2021-03-18 08:55:06 +00:00
Paul Duffin
abc6ec9d16 Merge "Add OptionalFixturePreparer" 2021-03-18 08:55:04 +00:00
Paul Duffin
95b93bf6a8 Merge "Reorganize the platform_compat_config.go file" am: 177cba31cf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642104

Change-Id: I0800fd26c99a26ea6b86af099ae5487e325922f1
 2021-03-18 08:54:57 +00:00
Paul Duffin
dca128e44a Merge "Add preparers for python" am: f49f72f271 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643943

Change-Id: I85699bfb7220dc9f44abe665a4f86967ccd9a616
 2021-03-18 08:54:44 +00:00
Paul Duffin
81e7e2b9a3 Merge "Remove android/apex_test.go use of buildDir" 2021-03-18 08:54:35 +00:00
Paul Duffin
21a1d22ec3 Merge "Fix hole in python testing code that ignored a broken test" am: 0a00e2680d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643942

Change-Id: I41ed6dc12e3202730fae9fa94aa457768925c73c
 2021-03-18 08:54:05 +00:00
Paul Duffin
aa8270eca7 Merge "Convert android/androidmk_test.go to test fixtures" 2021-03-18 08:52:15 +00:00
Paul Duffin
21d1b9a52c Merge "Migrate bpf package to a per test build directory" 2021-03-18 08:51:45 +00:00
Paul Duffin
603fa13e08 Merge "Correct typo in the name of compatConfigTag" 2021-03-18 08:48:36 +00:00
Paul Duffin
c0a5ccbf3b Merge "Allow apex dependencies to be restricted to source modules only" 2021-03-18 08:48:05 +00:00
Paul Duffin
533cf74318 Merge "Separate metadata provider from apex contents provider" 2021-03-18 08:46:49 +00:00
Paul Duffin
a8c065522d Merge "Add AssertIntEquals" 2021-03-18 08:42:16 +00:00
Paul Duffin
93b61b49dd Merge "Add emptyFixtureFactory in java package" 2021-03-18 08:40:03 +00:00
Paul Duffin
177cba31cf Merge "Reorganize the platform_compat_config.go file" 2021-03-18 08:39:39 +00:00
Paul Duffin
f49f72f271 Merge "Add preparers for python" 2021-03-18 08:28:35 +00:00