StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,615 Commits 1 Branch 0 Tags
7ae8fc2a6ced89ca021fb1afcfd0eda4ee19c6e9
Commit Graph

4169 Commits

Author SHA1 Message Date
Paul Duffin
50c454e2e4 Merge "Java build components require android build components" am: d5deba1126 am: babd0895fc am: f7dad7b189 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1645677

Change-Id: Icccf7bbb67f93b5407c0d3a55a100e3305be859d
 2021-03-21 14:59:48 +00:00
Paul Duffin
f7dad7b189 Merge "Java build components require android build components" am: d5deba1126 am: babd0895fc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1645677

Change-Id: Iecd8fc4791163ad73b313ae6bde2aad674fb7d7f
 2021-03-21 13:38:20 +00:00
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
7c3ac74625 Merge "Take Module implementations out of java/java.go." am: 2406d689bf am: dd9c7b9f38 am: 23893fe81e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643842

Change-Id: Id84db25e38159c103372051ba9f4c5801cada702
 2021-03-20 17:16:20 +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
6dee49ca7f Merge changes Iab4e09d9,Icf2f24dd,I15be5ef1,Ic0db9619 am: d2db7953a0 am: fa5bd82ef0 am: 5c2afde7f1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634812

Change-Id: Ic4b43962a5ac32605216fec53a1b2e5803874191
 2021-03-19 19:20:57 +00: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
bf96557467 Merge "Remove javaMockFS()" am: 54a5e9a467 am: bb1441b473 am: 1c92818e64 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634638

Change-Id: If87828079cb0799b5df4786dec2fd4096684c7dc
 2021-03-19 16:28:37 +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
31b5e8540f Merge "Fix TestTurbine to work without javaMockFS()" am: 89fbdb2387 am: 9f05456008 am: 9ac835e9c9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634637

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

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

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

Change-Id: I6d5bab4871744856bda2697604b67c570f7c31a4
 2021-03-19 12:46:51 +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
cc82353898 Merge "Clean up java package use of python build components" am: c3f89bece1 am: a3a8cabb64 am: b7878471b6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643945

Change-Id: Id97114056f6cd1a86a8e3c50701fdfae3d5c8132
 2021-03-18 22:05:22 +00: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
c76957fd75 Merge "Add prebuilt_platform_compat_config" am: d5065cfc66 am: c5b7854036 am: 8185bd8586 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642109

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

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

Change-Id: I0a53f4b11d41d440745aff9966efae725d3f2471
 2021-03-18 15:16:22 +00:00
Paul Duffin
6e55c425b8 Merge "Reorganize the platform_compat_config.go file" am: 177cba31cf am: 95b93bf6a8 am: ef3ada76c4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642104

Change-Id: Ia6cb2acfac42f5eb5c6aebc6e1387e91db1a6da6
 2021-03-18 15:16:14 +00:00
Paul Duffin
bc38431e4c Merge "Fix app tests to work without javaMockFS()" am: e26e597fc8 am: 9679be9ea5 am: 8255a16c37 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634633

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

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

Change-Id: Ie0e3769750189209cdd88beb035beda0cb3af5e9
 2021-03-18 15:15:26 +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
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
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