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

34440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
satayev
ebfe02a781 Merge "Don't track modules that are only available to APEXes." am: 2338d6f6e4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628693

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I78ef7f5255da2dffa208fd609052645c32c86bfe
 2021-03-15 12:52:18 +00:00
Thiébaud Weksteen
c634756619 Merge "Export OUT_DIR variable to rust-project.json" am: e5eb33b634 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1608134

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4072bf62bf64ac74f30dc7012ebc2975ad4d073f
 2021-03-15 12:50:40 +00:00
satayev
2338d6f6e4 Merge "Don't track modules that are only available to APEXes." 2021-03-15 12:47:00 +00:00
Thiébaud Weksteen
e5eb33b634 Merge "Export OUT_DIR variable to rust-project.json" 2021-03-15 12:16:48 +00:00
Paul Duffin
feed9a6153 Merge "Convert ...InstallHwasan.. tests to use fixtures" am: ef0449b0f3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626503

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2529a69e75f0c15e0ede332865792ad82670207f
 2021-03-15 11:33:54 +00:00
Paul Duffin
ef0449b0f3 Merge "Convert ...InstallHwasan.. tests to use fixtures" 2021-03-15 11:09:22 +00:00
Nicolas Geoffray
b684567a46 Merge "Treat core_platform as stable unless module uses legacy" am: fb856f6add 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1619411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8706f0ad6f9dc4d105f8953f5a16c42d2cb75210
 2021-03-15 09:17:49 +00:00
Nicolas Geoffray
fb856f6add Merge "Treat core_platform as stable unless module uses legacy" 2021-03-15 08:42:43 +00:00
Thiébaud Weksteen
ee6a89ba44 Export OUT_DIR variable to rust-project.json 
This variable is required by rust-analyzer to correctly process crates
that uses the include!(concat!(env!("OUT_DIR"), ...)) pattern.

Adds an initialize method to baseCompiler to save the computed path for
this directory. It is not possible to use the BeginMutator as the
BaseModuleContext does not contain enough information to use
PathForModuleOut.

Bug: 175004835
Test: SOONG_GEN_RUST_PROJECT=1 m nothing; inspect rust-project.json
Change-Id: If47b3832d3cca5712ae87773c174a61f5ee27bf8
 2021-03-15 08:13:20 +00:00
Remi NGUYEN VAN
d0d52172ed Merge "Add service-connectivity-pre-jarjar to legacy core platform list" am: aa52d66cd5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625964

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b7568d3e4ec0719c29eed58e2de2d16deffb57d
 2021-03-15 02:05:41 +00:00
Remi NGUYEN VAN
aa52d66cd5 Merge "Add service-connectivity-pre-jarjar to legacy core platform list" 2021-03-15 01:32:47 +00:00
Paul Duffin
67cec05bc9 Remove TestHelper am: d7aea1dbe5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629631

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e6bbf87ae8b9bbf7d5b4767cc34b67e80b5cd68
 2021-03-13 16:35:23 +00:00
Paul Duffin
19e1af81a4 Switch to Assert... functions in dexpreopt_bootjars_test.go am: 012b6679d3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1633660

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a43c59f371af822d29e1fb5f380adc95971058d
 2021-03-13 16:35:16 +00:00
Paul Duffin
9683cee9c4 Stop error handler relying on testing.T being embedded in TestResult am: c81854a642 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629630

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ee2bcb961b74e397b795e0194320a48f4175ef4
 2021-03-13 16:35:07 +00:00
Paul Duffin
f1a5907244 Stop sdk package depending on testing.T being embedded in TestResult am: 36474d322b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629629

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff501eb17aba2fe72263f3c502eaf7e9b6fa723c
 2021-03-13 16:34:16 +00:00
Paul Duffin
d7aea1dbe5 Remove TestHelper 
Bug: 181070625
Test: m nothing
Change-Id: Idc39c8621424e25c1b4310c72ed2943d34a66bbc
 2021-03-13 16:02:30 +00:00
Paul Duffin
012b6679d3 Switch to Assert... functions in dexpreopt_bootjars_test.go 
Bug: 181070625
Test: m nothing
Change-Id: I74a0be8fab257966aecffa914fcc7c1e6f750eb2
 2021-03-13 16:02:30 +00:00
Paul Duffin
c81854a642 Stop error handler relying on testing.T being embedded in TestResult 
This change is in preparation for removing testing.T from TestResult.

Bug: 181070625
Test: m nothing
Change-Id: Iac627cc3c9f922ec4a41ce657442e4139fe7defb
 2021-03-13 16:00:51 +00:00
Paul Duffin
36474d322b Stop sdk package depending on testing.T being embedded in TestResult 
This change is in preparation for removing testing.T from TestResult.

Bug: 181070625
Test: m nothing
Change-Id: I67535aff0d894e6e3d8456b75540f340af853355
 2021-03-13 15:59:33 +00:00
Paul Duffin
37e8d92321 Migrate from result methods to function Asserts am: e84b1338c5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629626

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib7280a80b99b4188be7afdf2f584ae0318b9dc57
 2021-03-13 02:02:00 +00:00
Paul Duffin
8dbca215ed Merge "Stop android package depending on testing.T being embedded in TestResult" am: bf6dcccfc4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629628

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8787793b34abdd96fe950fe09e46305e20c17bf4
 2021-03-12 22:45:15 +00:00
Paul Duffin
e84b1338c5 Migrate from result methods to function Asserts 
Bug: 181070625
Test: m nothing
Change-Id: Iadb85270290acb52c55f2ad70c9f145f1c34b611
 2021-03-12 22:24:51 +00:00
Paul Duffin
bf6dcccfc4 Merge "Stop android package depending on testing.T being embedded in TestResult" 2021-03-12 21:45:39 +00:00
Jaewoong Jung
1e4e5172fa Merge "Delete defaultsFactory in java.go." am: b37b009b16 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626340

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06b8e31f39707325d3c33c6ca62d9b0ee5c25c3a
 2021-03-12 19:07:50 +00:00
Jaewoong Jung
b37b009b16 Merge "Delete defaultsFactory in java.go." 2021-03-12 18:37:38 +00:00
Paul Duffin
a02cae345b Convert ...InstallHwasan.. tests to use fixtures 
These tests rely on changing the definition of the "libc" module which
is a default module provided by the cc.GatherRequiredDepsForTest()
function. That function is called from within testApexContext() and so
added by default.

Previously, the tests relied on a number of factors to work:
1. All the default cc modules were added to the bp contents that were
   passed to testApexContext().
2. testApexContext() passed the augmented bp contents to
   TestArchConfig().
3. TestArchConfig() only stored the supplied bp contents in the root
   Android.bp file if it did not exist.

So, in order to override the default modules it simply made sure to add
its own Android.bp file into the file system first.

Unfortunately, that does not work with the test fixtures as the default
modules are defined in their own specific paths to avoid conflicting
with each other. To achieve the same effect as previously, i.e. no
default modules, this test uses an emptyFixtureFactory and only adds
preparers for cc and apex build components and ignores the default
module definitions altogether.

Bug: 181070625
Test: m nothing
Change-Id: Ic6b961dd2bd78c32cb326b2c7905426ee971c2d8
 2021-03-12 18:26:41 +00:00
Paul Duffin
7f28027dd3 Merge changes If7977493,I3b2ccf66 am: 5a0595639a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629625

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cf7ab4765deb5832fa717e79ed33b401c377d0f
 2021-03-12 17:35:58 +00:00
Paul Duffin
86cf01868a Merge "Remove unused TestResult methods" am: e2c140624c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629627

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibcf13a31b8633201fc87817f5d59568b26226c60
 2021-03-12 17:34:28 +00:00
Paul Duffin
5a0595639a Merge changes If7977493,I3b2ccf66 
* changes:
  Add new function Assert methods
  Separate TestHelper from fixtures
 2021-03-12 17:27:25 +00:00
Paul Duffin
e2c140624c Merge "Remove unused TestResult methods" 2021-03-12 16:59:13 +00:00
Julien Desprez
fb44fbd6be Merge "Remove the robolectric heuristic out of java_test" am: c001dc6d2f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1624564

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic27b8d33b725d7787f1e95ccf68c43e9bcb16967
 2021-03-12 16:15:20 +00:00
Julien Desprez
c001dc6d2f Merge "Remove the robolectric heuristic out of java_test" 2021-03-12 15:40:19 +00:00
Lev Proleev
894c8eb61b Merge "Add libruy_static to allowed_deps" am: f6b5f8217c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1610793

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I62b88ffda8a4043eb6cb70798f6b406b4733d527
 2021-03-12 14:42:27 +00:00
Paul Duffin
3d0ddff8ed Stop android package depending on testing.T being embedded in TestResult 
This change is in preparation for removing testing.T from TestResult.

Bug: 181070625
Test: m nothing
Change-Id: Ib51c7d4e5efdcbe0652df10b66140058a8bfa471
 2021-03-12 14:26:04 +00:00
Paul Duffin
9dcf253197 Add new function Assert methods 
Bug: 181070625
Test: m nothing
Change-Id: If7977493d4f7380e746df1b9b8b4cb13c39abeac
 2021-03-12 14:25:33 +00:00
Paul Duffin
3fdb1bd9a2 Remove unused TestResult methods 
Left over from a previous incarnation of the fixture mechanism.

Bug: 181070625
Test: m nothing
Change-Id: Ifb3811b7b030613cbff93994f7d370d402b1e73d
 2021-03-12 14:25:33 +00:00
Paul Duffin
0550055007 Separate TestHelper from fixtures 
Although they are intended to be used together they are separate pieces
of functionality so should be separate.

Bug: 181070625
Test: m nothing
Change-Id: I3b2ccf66748a3c53b63c112256a8eb20e0448179
 2021-03-12 14:25:33 +00:00
Lev Proleev
f6b5f8217c Merge "Add libruy_static to allowed_deps" 2021-03-12 14:00:45 +00:00
Cindy Zhou
809e91cf12 Merge "Enable cfi for 32bit arch" am: 34d300ba76 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1570600

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I853848ed2877765da887880dd5fc7901b64ade72
 2021-03-12 13:04:52 +00:00
Cindy Zhou
34d300ba76 Merge "Enable cfi for 32bit arch" 2021-03-12 12:41:39 +00:00
Paul Duffin
34fc4cf2fb Merge "Convert testDexpreoptBoot to use test fixtures" am: a8c443618a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629622

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I022fddb34521d8835efe57bea93bd858183d0a7c
 2021-03-12 12:24:35 +00:00
Paul Duffin
a8c443618a Merge "Convert testDexpreoptBoot to use test fixtures" 2021-03-12 11:40:03 +00:00
Jooyung Han
a200f6a134 Merge "Fix bootimg.cmdline to use ShellEscapeIncludingSpaces" am: d0b3574072 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620649

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic71f37154a75b796b9856c50d2dff6ee736466ed
 2021-03-12 09:19:55 +00:00
Jooyung Han
d0b3574072 Merge "Fix bootimg.cmdline to use ShellEscapeIncludingSpaces" 2021-03-12 09:10:22 +00:00
Paul Duffin
451aeef583 Convert testDexpreoptBoot to use test fixtures 
Bug: 181070625
Test: m nothing
Change-Id: Iaca15c87c68383630aed015e0e17adad3c37c4b1
 2021-03-12 09:02:13 +00:00
Paul Duffin
83bf57a459 Fix build failure in boot_image_sdk_test.go am: ebddef39dd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629621

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifac4e4d66bac1a04c1cbfca72ed4d4078db663d9
 2021-03-12 08:43:08 +00:00
Paul Duffin
7b1c7dc98f Merge "Add prebuilt_boot_image and add boot_images to sdk" am: 32a8aadfaa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626501

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I079826943a95173a362ac003bb8a03c853877767
 2021-03-12 08:25:30 +00:00
Paul Duffin
a517bddd85 Merge "Prevent mock filesystem files being overridden by accident" am: 412a209d87 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629639

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f27928b7142c141c91ebd6b6a2b2fa3ea27c572
 2021-03-12 08:25:19 +00:00
Paul Duffin
b1ef3e2ce9 Merge changes Ifc96992e,Ic76523ba am: c10ee77ea6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628691

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I62a6d450597de5d28f09c58cc30475774ec8a795
 2021-03-12 08:25:11 +00:00
Paul Duffin
83eb3ba314 Merge "Improve name of getModuleHeaderJarsAsNormalizedPaths" am: c7cdd1513c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628682

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10858332c12a0455be46c15893e353f82ea02f66
 2021-03-12 08:24:33 +00:00