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

4191 Commits

Author SHA1 Message Date
Paul Duffin
7bcaee1d12 Merge "Remove uses of buildDir in java/hiddenapi_singleton_test.go" am: eed60863d0 am: 5054e0dc9e am: 8c0829717b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649796

Change-Id: I00f3b95045d9ba66a26d778aadd90b10260baaa7
 2021-03-24 08:56:38 +00:00
Paul Duffin
7ad7d9ccbc Merge "Remove uses of buildDir from java/dexpreopt_bootjars_test.go" am: 1b095e5177 am: cf0f595e90 am: ec4fbf21fa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649795

Change-Id: I3c4ec1d2e2dadf2a6d59f631536f2b96747eebab
 2021-03-24 08:56:30 +00:00
Paul Duffin
84de891342 Merge "Register java_plugin in PrepareForTestWithJavaBuildComponents" am: 5863c2ae65 am: 9c976257f7 am: 8da7bc4a85 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649794

Change-Id: I6b101075a3231d52ce9555faeffcb8bacce5668f
 2021-03-24 08:56:21 +00:00
Paul Duffin
8c0829717b Merge "Remove uses of buildDir in java/hiddenapi_singleton_test.go" am: eed60863d0 am: 5054e0dc9e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649796

Change-Id: I24fac8fba16e54a21eefface0449cd87420577f2
 2021-03-24 08:52:18 +00:00
Paul Duffin
ec4fbf21fa Merge "Remove uses of buildDir from java/dexpreopt_bootjars_test.go" am: 1b095e5177 am: cf0f595e90 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649795

Change-Id: I297585f390acbeb8fd3e630161f37f44fa6a31aa
 2021-03-24 08:52:09 +00:00
Paul Duffin
8da7bc4a85 Merge "Register java_plugin in PrepareForTestWithJavaBuildComponents" am: 5863c2ae65 am: 9c976257f7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649794

Change-Id: Ic10b1169c3d2411f7c5608d078e90febba99f1e4
 2021-03-24 08:52:00 +00:00
Paul Duffin
2f9e71e5ad Remove uses of buildDir in java/hiddenapi_singleton_test.go 
Remove any uses, either direct (or indirect via testJavaConfig or
similar methods), of the package level buildDir variable from this
file.

Bug: 182885307
Test: m nothing
Change-Id: I664465808cd4edf1fef611c07ae05a32683dc976
 2021-03-24 00:01:15 +00:00
Paul Duffin
67d485e9d4 Remove uses of buildDir from java/dexpreopt_bootjars_test.go 
Remove any uses, either direct (or indirect via testJavaConfig or
similar methods), of the package level buildDir variable from this
file.

Bug: 182885307
Test: m nothing
Change-Id: I852dbb5ad2e1aa58df103679c5e9de14cf64abc3
 2021-03-24 00:01:15 +00:00
Paul Duffin
c029c43c99 Register java_plugin in PrepareForTestWithJavaBuildComponents 
Bug: 182885307
Test: m nothing
Change-Id: I550d39ba46c548b6b099d8dc6a9c458ca931b2fa
 2021-03-24 00:01:15 +00:00
Paul Duffin
939d2f1a47 Merge "Add platform_compat_config to sdk" am: 7ee6e8fa0f am: 8b149228f4 am: 61b3496d7d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1645683

Change-Id: I1c02dce336f80ab9af3b82371518948a4ac8ee17
 2021-03-23 14:06:23 +00:00
Paul Duffin
b0406ec20b Merge "Register the propagateRROEnforcementMutator" am: 713b501017 am: 70532c454d am: 3ef2a04850 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649793

Change-Id: I1cf73256e63e134c873a1b626741c23f3a0361d3
 2021-03-23 14:05:59 +00:00
Paul Duffin
61b3496d7d Merge "Add platform_compat_config to sdk" am: 7ee6e8fa0f am: 8b149228f4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1645683

Change-Id: Ie0157ea8741a955e723220155fcc571d0d067d02
 2021-03-23 12:10:19 +00:00
Paul Duffin
3ef2a04850 Merge "Register the propagateRROEnforcementMutator" am: 713b501017 am: 70532c454d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649793

Change-Id: I8858132d2f823b348dc95b422595b1f2fd2e4a89
 2021-03-23 12:10:00 +00:00
Paul Duffin
08f195698c Merge "Add preparer for overlay pre-singleton registration" am: e0998ab561 am: f84f035e13 am: b781d9d00c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649792

Change-Id: I4e9ed4d9115fffc58b958658bcb3ebb5cb31b48d
 2021-03-23 11:36:45 +00:00
Paul Duffin
7ee6e8fa0f Merge "Add platform_compat_config to sdk" 2021-03-23 11:17:06 +00:00
Paul Duffin
b781d9d00c Merge "Add preparer for overlay pre-singleton registration" am: e0998ab561 am: f84f035e13 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649792

Change-Id: Ie46a00406a3d88ec5a3a312d93ebe8325fcac744
 2021-03-23 09:27:36 +00:00
Paul Duffin
9a7e792892 Remove emptyFixtureFactory from apex and java am: 70d3bee3e0 am: 752a5a2122 am: 231efa2172 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1647204

Change-Id: Ie33180b91d67f4b178c44fd9ad526e00f74e263a
 2021-03-23 00:01:31 +00:00
Paul Duffin
231efa2172 Remove emptyFixtureFactory from apex and java am: 70d3bee3e0 am: 752a5a2122 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1647204

Change-Id: I62583a37a802a400b848dff16119b550e70de8d5
 2021-03-22 23:19:39 +00:00
Paul Duffin
04ba70d665 Register the propagateRROEnforcementMutator 
This adds the registration of the mutator to the existing register...
method which will include it in PrepareForTestWithJavaBuildComponents.

Bug: 182885307
Test: m nothing
Change-Id: I6cea716a3ff4d8abdb80543b7e0ddf22246ffa30
 2021-03-22 22:09:53 +00:00
Paul Duffin
42da69d784 Add preparer for overlay pre-singleton registration 
It appears as though this is the first pre-singleton type to actually
be registered with the InitRegistrationContext as it failed due to an
uninitialized map, so this change also fixes that.

Bug: 182885307
Test: m nothing
Change-Id: Ibbf6d0db5f3c2fcc89291a16aa5f16b8b5009bd3
 2021-03-22 22:09:53 +00:00
Paul Duffin
001b2342f7 Add platform_compat_config to sdk 
Bug: 182402754
Test: m nothing
Change-Id: Ife3f4f64fc116d62eb7c3cc10c50e00f19d1d81c
 2021-03-22 19:13:40 +00:00
Paul Duffin
70d3bee3e0 Remove emptyFixtureFactory from apex and java 
Bug: 183235980
Test: m nothing
Change-Id: I350b45e2f57430fb158f4141a566e75de17208cd
 2021-03-22 18:31:53 +00:00
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