openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
39,610 Commits 2 Branches 1 Tag 34 MiB
Commit Graph

39610 Commits

Author SHA1 Message Date
Paul Duffin a2f599ce8a Merge "Convert android/namespace_test.go to test fixtures" am: 4b9bb5c057 am: 3d7a4af9e4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1641399

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

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

Change-Id: Ibfa462cba444a668179ab13581b24d4db1b58c68
 2021-03-18 13:11:40 +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 1afa515929 Migrate android package to a per test build directory 
Bug: 182885307
Test: m nothing
Change-Id: I6b868bacc36be1f6768fbb2fb1d7ed4ad6e4118c
 2021-03-18 12:18:09 +00:00
Paul Duffin c3bdd310bd Convert android/packaging_test.go to test fixtures 
Bug: 182885307
Test: m nothing
Change-Id: Ic2384bfe3f1edb8d252053fda7df66d49c46fd0f
 2021-03-18 12:18:09 +00:00
Paul Duffin d9ec7d2694 Convert android/ninja_deps_test.go to test fixtures 
Bug: 182885307
Test: m nothing
Change-Id: Iccba8caffc7e5a82ff13d93a032edcf3f748fc40
 2021-03-18 12:18:09 +00:00
Paul Duffin d518b7e2f2 Convert android/path_properties_test.go to test fixtures 
Bug: 182885307
Test: m nothing
Change-Id: If75f471885b5e4022b406e267e04b7a20e0be080
 2021-03-18 12:18:09 +00:00
Paul Duffin 78c36216a8 Add NinjaDeps to TestResult 
Bug: 182885307
Test: m nothing
Change-Id: I1eb49f2514b13f52f367cd8f57e5cb0ab3336bd7
 2021-03-18 12:18:09 +00:00
Paul Duffin a9237b6eeb Convert android/singleton_module_test.go to test fixtures 
Bug: 182885307
Test: m nothing
Change-Id: Id77575f8ceda43545e2fad97fa1bd6b612c967b4
 2021-03-18 12:18:09 +00:00
Paul Duffin 3c6a4ea24a Convert android/neverallow_test.go to test fixtures 
Bug: 182885307
Test: m nothing
Change-Id: I5679cb517151ceaf468f2fe2e0ccab718cc7b4a3
 2021-03-18 12:18:09 +00:00
Paul Duffin d65970072d Convert android/singleton_module_test.go to test fixtures 
Bug: 182885307
Test: m nothing
Change-Id: I7f9f3eb66279fe5a2447aefa9b636144c32ce92a
 2021-03-18 12:18:05 +00:00
Paul Duffin 4bb2b219d6 Convert android/variable_test.go to test fixtures 
Bug: 182885307
Test: m nothing
Change-Id: I51d3651244b110bf41cb0e4c331ac663bf816f84
 2021-03-18 12:17:05 +00:00
Paul Duffin 791302b412 Convert android/soong_config_modules_test.go to test fixtures 
Bug: 182885307
Test: m nothing
Change-Id: I53231b820154447e359e48afa47cdf76f0ec6c47
 2021-03-18 12:17:05 +00:00
Paul Duffin e8a4ac49fe Convert android/mutator_test.go to test fixtures 
Bug: 182885307
Test: m nothing
Change-Id: Id7eb915af21ccde5acf1d4a0ec339e0672bc3d57
 2021-03-18 12:17:05 +00:00
Paul Duffin 485079130d Convert android/deptag_test.go to test fixtures 
Bug: 182885307
Test: m nothing
Change-Id: I837c7b9944a9adbe9019ae8a4e69ff3b7086ca5c
 2021-03-18 12:17:01 +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
Ulyana Trafimovich 928c87711a Revert^2 "Don't depend on nonexistent manifest when manifest_check is disabled." 
Reason for revert: relanding original change. The fix was to add AAPT to
the dependencies of the failed command. It didn't fail in AOSP, and on
some targets in sc-dev, because the build order happened to be different
and AAPT was built by the time it was needed. This also explains why
some builds oscillated between red and green.

Reverted Changes:
I52f00c9f4:Revert "Don't depend on nonexistent manifest when ...
I4c2d4e1c7:Revert "Reimplement verify_uses_libraries.sh in ma...
Ibebd616a7:Revert "Reimplement verify_uses_libraries.sh in ma...

Bug: 132357300
Bug: 183010666
Change-Id: I28b20308f4d68185af8ec15407b35ded1aaa2eb0
Test: treehugger
Test: forrest on git_sc-dev target aosp_blueline-userdebug
 2021-03-18 11:43:06 +00:00
Ulyana Trafimovich ec22282610 Revert^2 "Reimplement verify_uses_libraries.sh in manifest_check.py." 
Reason for revert: relanding original change. The fix was to add AAPT to
the dependencies of the failed command. It didn't fail in AOSP, and on
some targets in sc-dev, because the build order happened to be different
and AAPT was built by the time it was needed. This also explains why
some builds oscillated between red and green.

Reverted Changes:
I52f00c9f4:Revert "Don't depend on nonexistent manifest when ...
I4c2d4e1c7:Revert "Reimplement verify_uses_libraries.sh in ma...
Ibebd616a7:Revert "Reimplement verify_uses_libraries.sh in ma...

Bug: 132357300
Bug: 183010666
Change-Id: I6fd3935e951503b6c505b1e45b27bb8dc498665a
Test: treehugger
Test: forrest on git_sc-dev target aosp_blueline-userdebug
 2021-03-18 11:42:53 +00:00
Lukács T. Berki 4a581ea4ca Merge "Fix writing soong.variables ." am: 828b1e99ec am: 85787f8720 am: 8f35b4df58 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1641405

Change-Id: I1ef94c752459994c75248d9525fab6eadad87c40
 2021-03-18 09:39:52 +00:00
Paul Duffin d8f766953e Merge "Convert android/paths_test.go to test fixtures" am: 0700f77806 am: 412a1ed781 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640336

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

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

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

Change-Id: I321a7e805b7a46a94f6e4410784185e1332fe1e4
 2021-03-18 09:14:33 +00:00
Paul Duffin 53e157deca Merge "Add AssertSame" am: c14e8aa6a8 am: f91adb93a2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640333

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

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

Change-Id: Id00ee5998ff515afb858f1df9cae302409ad0823
 2021-03-18 09:14:15 +00:00
Paul Duffin 1f24390277 Merge "Add OptionalFixturePreparer" am: abc6ec9d16 am: f59543d75b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640330

Change-Id: I95e509911eb74db6b332dc3c96791ff4555efb0e
 2021-03-18 09:14:10 +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 7c5492b19a Merge "Remove android/apex_test.go use of buildDir" am: 81e7e2b9a3 am: c7cca88433 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640329

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

Change-Id: I76bcbb8545ce01350f8a6defbc8856bc1f3fab9f
 2021-03-18 09:13:57 +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
Paul Duffin e9a4c704bf Merge "Migrate bpf package to a per test build directory" am: 21d1b9a52c am: 85010603f7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640325

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

Change-Id: I68e973776e85b2966ca182eb21d9fa4296c2cee0
 2021-03-18 09:13:44 +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 25703000a5 Merge "Allow apex dependencies to be restricted to source modules only" am: c0a5ccbf3b am: 69f4244007 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642107

Change-Id: I97bdc2f4f20f15bc72708f461eb05d9f2a2e597d
 2021-03-18 09:13:38 +00:00
Paul Duffin 126181b054 Merge "Separate metadata provider from apex contents provider" am: 533cf74318 am: 1d83ba3a10 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642106

Change-Id: I96b09fd79851a036c6a420d9d3f5d27e5950f250
 2021-03-18 09:13:33 +00:00
Paul Duffin 96c9a5fc28 Merge "Add AssertIntEquals" am: a8c065522d am: 308053d678 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643062

Change-Id: I2326d1d0afa34d80f8c9f3782d7b78eea3042c3c
 2021-03-18 09:13:26 +00:00
Paul Duffin 22ec063dff Merge "Add emptyFixtureFactory in java package" am: 93b61b49dd am: f2dec10262 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642105

Change-Id: Ice08a34e362e1d50ae953a3f68a3db31e2398522
 2021-03-18 09:13:20 +00:00
Paul Duffin ef3ada76c4 Merge "Reorganize the platform_compat_config.go file" am: 177cba31cf am: 95b93bf6a8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642104

Change-Id: I282d3c89167ec58b9b424c5d7b5ee01ca1cfbbd9
 2021-03-18 09:13:14 +00:00
Paul Duffin b7200fc522 Merge "Add preparers for python" am: f49f72f271 am: dca128e44a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643943

Change-Id: I67128d1e938020770d60b3dff7c669a9d7864507
 2021-03-18 09:13:07 +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