StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,735 Commits 1 Branch 0 Tags
05ecab28a375dbbad2c27dde975c009325d98433
Commit Graph

4017 Commits

Author SHA1 Message Date
Paul Duffin
d5deba1126 Merge "Java build components require android build components" 2021-03-21 11:06:33 +00:00
Paul Duffin
ce5a4547bb Java build components require android build components 
Java build components invariably require android build components such
as the arch mutator (to create the common variant) so include them
together.

Bug: 181070625
Test: m nothing
Change-Id: I435b09a34c48c67b890368b37b8da27e8de97c9a
 2021-03-21 10:20:25 +00:00
Jaewoong Jung
23893fe81e Merge "Take Module implementations out of java/java.go." am: 2406d689bf am: dd9c7b9f38 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643842

Change-Id: I591714d8d40dbcfc4a196862509340af2074c607
 2021-03-20 16:34:00 +00:00
Jaewoong Jung
2406d689bf Merge "Take Module implementations out of java/java.go." 2021-03-20 15:29:32 +00:00
Jaewoong Jung
263426431a Take Module implementations out of java/java.go. 
Test: TreeHugger
Change-Id: I5c39915ad2cadf5981c201a2b412916524d4c3e2
 2021-03-19 15:46:38 -07:00
Colin Cross
5c2afde7f1 Merge changes Iab4e09d9,Icf2f24dd,I15be5ef1,Ic0db9619 am: d2db7953a0 am: fa5bd82ef0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634812

Change-Id: I70d44d99d603a83f574e21eab03e778f2721938e
 2021-03-19 18:38:50 +00:00
Colin Cross
d2db7953a0 Merge changes Iab4e09d9,Icf2f24dd,I15be5ef1,Ic0db9619 
* changes:
  Run lint actions in sbox
  Support sbox-in-RBE
  Move android package on top of remotexec
  Support sandboxing inputs in RuleBuilder
 2021-03-19 17:25:14 +00:00
Paul Duffin
1c92818e64 Merge "Remove javaMockFS()" am: 54a5e9a467 am: bb1441b473 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634638

Change-Id: I9b100ed98446bb9a6c8501b9974bb66d0ece367d
 2021-03-19 15:46:08 +00:00
Paul Duffin
54a5e9a467 Merge "Remove javaMockFS()" 2021-03-19 14:18:46 +00:00
Paul Duffin
9ac835e9c9 Merge "Fix TestTurbine to work without javaMockFS()" am: 89fbdb2387 am: 9f05456008 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634637

Change-Id: Id797b863f7529f25724acd4556db45d5d5e92a96
 2021-03-19 12:06:04 +00:00
Paul Duffin
356f5c13d4 Merge "Fix testDexpreoptBoot to work without javaMockFS()" am: 64df56def9 am: a5807d2dfb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634636

Change-Id: I2872821a77332630cb0c6c9d96bf2644b1d2874c
 2021-03-19 12:05:57 +00:00
Paul Duffin
d827b98966 Merge "Fix TestClasspath to work without javaMockFS()" am: 750f8f3515 am: e9cbe547f1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634635

Change-Id: I5b01c2a947132abe301909c409db91fa7595a593
 2021-03-19 12:05:45 +00:00
Paul Duffin
f6bc52175d Merge "Convert TestClasspath to test fixtures" am: 903a8a08ab am: d5e47f1edb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634634

Change-Id: I368f0f9e09222003beaaeead5241ae8e64cc407b
 2021-03-19 12:05:40 +00:00
Paul Duffin
89fbdb2387 Merge "Fix TestTurbine to work without javaMockFS()" 2021-03-19 11:11:42 +00:00
Paul Duffin
64df56def9 Merge "Fix testDexpreoptBoot to work without javaMockFS()" 2021-03-19 11:09:21 +00:00
Paul Duffin
750f8f3515 Merge "Fix TestClasspath to work without javaMockFS()" 2021-03-19 11:08:35 +00:00
Paul Duffin
903a8a08ab Merge "Convert TestClasspath to test fixtures" 2021-03-19 11:08:17 +00:00
Colin Cross
1661aff8be Run lint actions in sbox 
Run lint actions in sbox with RuleBuilder.SandboxInputs.  This
copies all input files into the sandbox, which prevents the lint
tool from finding nearby source files that were not presented to it.

Using SandboxInputs requires use of PathForInput or PathForOutput
anywhere a path is used outside of the RuleBuilderCommand methods
that take paths so that they can be translated to the paths that
will be used in the sandbox.

Bug: 181681346
Test: lint_test.go
Test: m lint-check dist
Test: m USE_RBE=true RBE_LINT=true lint-check dist
Test: m USE_RBE=true RBE_LINT=true RBE_LINT_EXEC_STRATEGY=remote lint-check dist
Change-Id: Iab4e09d961891ef182643583d4d456e413bc5e39
 2021-03-18 16:17:34 -07:00
Colin Cross
77cdcfdeaf Move android package on top of remotexec 
Remove the references to the android package in remotexec so that
the android package can reference the remoteexec package.  This
will allow RuleBuilder to integrate directly with remoteexec.

Bug: 182612695
Test: m checkbuild
Change-Id: I15be5ef126d8aacbd605518638f341daf6f31bb3
 2021-03-18 16:17:34 -07:00
Paul Duffin
b7878471b6 Merge "Clean up java package use of python build components" am: c3f89bece1 am: a3a8cabb64 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643945

Change-Id: I979297cc28aee70c723c18b70630474e4ead4d13
 2021-03-18 18:19:55 +00:00
Paul Duffin
c3f89bece1 Merge "Clean up java package use of python build components" 2021-03-18 17:02:44 +00:00
Paul Duffin
8185bd8586 Merge "Add prebuilt_platform_compat_config" am: d5065cfc66 am: c5b7854036 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642109

Change-Id: I85be48a0c65bc9caa2e2d4b7063ac41ec2581b6c
 2021-03-18 13:12:21 +00:00
Paul Duffin
d5065cfc66 Merge "Add prebuilt_platform_compat_config" 2021-03-18 12:28:00 +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
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
8255a16c37 Merge "Fix app tests to work without javaMockFS()" am: e26e597fc8 am: 9679be9ea5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634633

Change-Id: I402492eedbecf7db1d37d14791ff42fd096912b4
 2021-03-18 08:54:35 +00:00
Paul Duffin
59ff1fbc73 Merge "Convert app tests that depend on javaMockFS() to test fixtures" am: 9e993c6162 am: 85bcdfcb3c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634632

Change-Id: I9fb3e99104264bb607ca7d14234d559794948555
 2021-03-18 08:54:26 +00:00
Paul Duffin
13b31ab6f2 Merge "Convert TestUsesLibraries to test fixtures" am: 8a6fef4db3 am: 3e2173905d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634631

Change-Id: Iac19b34bbca50601ab205a55ea4e139a85ad35b5
 2021-03-18 08:54:20 +00:00
Paul Duffin
533cf74318 Merge "Separate metadata provider from apex contents provider" 2021-03-18 08:46:49 +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
1efdb30182 Remove javaMockFS() 
Also, removes the workaround that allowed preparers to override files
added in javaMockFS().

The performance of the java tests was determined by running:
  m nothing
  rm -fr out/soong/.bootstrap/soong-java/test/
  time m nothing

Prior to starting this work that returned:
  real  1m30.060s
  user  33m3.028s
  sys   13m25.413s

Immediately prior to this change that returned:
  real  1m2.777s
  user  14m14.352s
  sys   9m40.745s

After applying this change that returned:
  real  0m20.282s
  user  3m7.429s
  sys   0m43.601s

So, this reduced the real time cost of running the java tests from 90
seconds to 20 seconds.

Bug: 182638834
Test: m nothing
Change-Id: I30490fd40ddb0684a5a4975ce1811bab5dc79e4e
 2021-03-18 08:02:38 +00:00
Paul Duffin
3d9f268437 Fix TestTurbine to work without javaMockFS() 
Bug: 182638834
Test: m nothing
Change-Id: Idf400b5f0d171a504acf006425cbfc514b391e74
 2021-03-18 08:02:38 +00:00
Paul Duffin
57c4d79c00 Fix testDexpreoptBoot to work without javaMockFS() 
Bug: 182638834
Test: m nothing
Change-Id: I1725d6ce7e1201d8d77e95d3cebb7d8cc882d437
 2021-03-18 08:02:38 +00:00
Paul Duffin
171de3ef7c Fix TestClasspath to work without javaMockFS() 
Bug: 182638834
Test: m nothing
Change-Id: Icd6fe93cbda418cb4eaf5e99800894d4c4cc5e6f
 2021-03-18 08:02:38 +00:00
Paul Duffin
76101fa5ec Convert TestClasspath to test fixtures 
The main complication with this change was that many of the tests check
paths that are provided by the default java modules. The location of
them is different in the test fixtures that it is when using
testConfig() and so the test needed to be changed.

Bug: 182638834
Test: m nothing
Change-Id: I6d325dbd3ba39e5de7e53c576d7cfe07bd95a965
 2021-03-18 08:02:38 +00:00
Paul Duffin
e26e597fc8 Merge "Fix app tests to work without javaMockFS()" 2021-03-18 08:00:29 +00:00
Paul Duffin
9e993c6162 Merge "Convert app tests that depend on javaMockFS() to test fixtures" 2021-03-18 07:59:54 +00:00
Paul Duffin
8a6fef4db3 Merge "Convert TestUsesLibraries to test fixtures" 2021-03-18 07:59:04 +00:00
Paul Duffin
220ddd7a6b Clean up java package use of python build components 
Bug: 182885307
Test: m nothing
Change-Id: I206ebc075c568a09008ec8b63122922dd87ba318
 2021-03-17 23:56:58 +00:00
Paul Duffin
1b29e003f3 Add prebuilt_platform_compat_config 
It just provides the metadata needed by the global singleton as the
rest is in the apex.

Bug: 182402754
Test: m nothing
Change-Id: I511df7a3a06dab13ddb9ad63392ae5310dfee9c4
 2021-03-17 18:16:31 +00:00
Paul Duffin
29072a9c1e Separate metadata provider from apex contents provider 
The platform_compat_config_singleton only needs access to the metadata
so this separates that method into its own interface, distinct from the
one needed by the apex. This also adds a test to ensure that the merging
still works.

Bug: 182402754
Test: m nothing
Change-Id: I5212239786810e5fc5eb99831b1122db93d1329f
 2021-03-17 18:16:28 +00:00
Paul Duffin
afeee22c17 Add emptyFixtureFactory in java package 
Bug: 182402754
Test: m nothing
Change-Id: I6a01b846a8aee5a0ace9e6ac056ee439bf6f12f7
 2021-03-17 17:50:22 +00:00
Paul Duffin
961543309f Reorganize the platform_compat_config.go file 
The types and methods are separated and interleaved with each other
so this moves them so that they are together.

Bug: 182402754
Test: m nothing
Change-Id: I275f6af30491d2440499b9ee3f201eea227d23f8
 2021-03-17 17:50:22 +00:00
Colin Cross
27a4326c78 Add explicit rspfile argument to RuleBuilderCommand.FlagWithRspFileInputList am: 70c4741215 am: 37225a7b05 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634804

Change-Id: Iec8ea5fdda5786380e52d244d73e3dd182d7bc52
 2021-03-17 15:50:48 +00:00
Colin Cross
37225a7b05 Add explicit rspfile argument to RuleBuilderCommand.FlagWithRspFileInputList am: 70c4741215 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634804

Change-Id: Id1d3d6b1047f0492eaa88ada521dd8c4cdb22670
 2021-03-17 15:31:16 +00:00
Colin Cross
45a4971808 Merge changes from topic "rule_builder_rsp" 
* changes:
  Remove unescaped spans support from RuleBuilder
  Add explicit rspfile argument to RuleBuilderCommand.FlagWithRspFileInputList
  Ninja escape RuleBuilder rule params
 2021-03-17 15:14:19 +00:00
Paul Duffin
2645a2912f Fix app tests to work without javaMockFS() 
Bug: 182638834
Test: m nothing
Change-Id: Ia1815557e6d9dba1cb24f824a988c7599263bf85
 2021-03-17 14:01:02 +00:00
Paul Duffin
cdb88a996a Convert app tests that depend on javaMockFS() to test fixtures 
Bug: 182638834
Test: m nothing
Change-Id: Ice668cf58695839d4929a0744822c0ded441d9c4
 2021-03-17 14:01:02 +00:00