Ulyana Trafimovich
cf27a77fab
Merge "Split functions for compiling boot jars to allow future code reuse." am: 8ef5b4f95f
am: a90c28ccce
am: eea78d54fc
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1648368
Change-Id: Icbde32ebea96a52793c145d6c5fc82c82bed7ed9
2021-03-24 12:34:55 +00:00
Ulyana Trafimovich
eea78d54fc
Merge "Split functions for compiling boot jars to allow future code reuse." am: 8ef5b4f95f
am: a90c28ccce
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1648368
Change-Id: Ic8677e9a98645440bfaca2a0ce7ada819a73b079
2021-03-24 11:50:56 +00:00
Ulyana Trafimovich
8ef5b4f95f
Merge "Split functions for compiling boot jars to allow future code reuse."
2021-03-24 10:48:51 +00:00
Paul Duffin
4ec34413d1
Merge "Remove javaFixtureFactory" am: b6535d329f
am: 1c496b075d
am: 91d532241f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649805
Change-Id: I822ca0cd8dc6ad443020b70c089d966d4d0fb6da
2021-03-24 08:57:50 +00:00
Paul Duffin
c91736086d
Merge "Remove unused test methods and buildDir" am: 9d33cf237a
am: b87810c575
am: f40055f794
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649804
Change-Id: I61094853fffcea72e940ac790e3963e8df585dc3
2021-03-24 08:57:42 +00:00
Paul Duffin
cbbc2b0dce
Merge "Remove uses of buildDir from java/rro_test.go" am: 38e73fcfc0
am: 541e2124bf
am: ced05d6327
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649803
Change-Id: I466f2bbfbdb75478dd990eb9649a77c4331b52a3
2021-03-24 08:57:33 +00:00
Paul Duffin
5a99ccf127
Merge "Remove uses of buildDir from java/kotlin_test.go" am: 5916fe6856
am: 2d074dd87d
am: a4d25c3350
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649802
Change-Id: I203ca2d055155aa5f1bdebdf94262e69620fb460
2021-03-24 08:57:26 +00:00
Paul Duffin
f67c8ce8e5
Merge "Remove uses of buildDir from java/java_test.go and java/sdk_test.go" am: 369c3aae53
am: 372c1fc7f4
am: 0053a19238
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649801
Change-Id: Ibdcf255112e226e52fb02d7f8d92e23442d53f8b
2021-03-24 08:57:17 +00:00
Paul Duffin
7c72b1bda6
Merge "Remove uses of buildDir from java/app_test.go" am: 700185b1f8
am: 306639beac
am: 1cf0f03fac
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649800
Change-Id: I9da43d6ff493e744fb471cbaa0482c98dbaadedd
2021-03-24 08:57:10 +00:00
Paul Duffin
b372ae4c1f
Merge "Remove uses of buildDir from java/app_set_test.go" am: 86da0448c6
am: 84e6aaa26c
am: 7f76b4acbd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649799
Change-Id: I11c1fee12d5b09060974f1d4d004b3ce1e693213
2021-03-24 08:57:02 +00:00
Paul Duffin
24f983c98d
Merge "Remove uses of buildDir from java/app_import_test.go" am: 6567d07f59
am: c9d8035712
am: de9cbc5d2e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649798
Change-Id: Ie9348fcb8641066fc0159a83d94fbeecb9eaf2b6
2021-03-24 08:56:54 +00:00
Paul Duffin
5264ba2b97
Merge "Remove uses of buildDir in java/androidmk_test.go" am: 6f59e6a568
am: 1a5e03e155
am: 656096fa43
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649797
Change-Id: I7f99e5065c47a1f5f1d95bd0a685c20aa97abf4f
2021-03-24 08:56:46 +00:00
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
91d532241f
Merge "Remove javaFixtureFactory" am: b6535d329f
am: 1c496b075d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649805
Change-Id: I0e1527fb0a46de68af78621ead4d819fa1e22e87
2021-03-24 08:53:37 +00:00
Paul Duffin
f40055f794
Merge "Remove unused test methods and buildDir" am: 9d33cf237a
am: b87810c575
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649804
Change-Id: Ibfd37931c9dfe217f3165f02085e579d1ad5deec
2021-03-24 08:53:29 +00:00
Paul Duffin
ced05d6327
Merge "Remove uses of buildDir from java/rro_test.go" am: 38e73fcfc0
am: 541e2124bf
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649803
Change-Id: I24a33795db144f676ac9810fd5003e1fef109326
2021-03-24 08:53:21 +00:00
Paul Duffin
a4d25c3350
Merge "Remove uses of buildDir from java/kotlin_test.go" am: 5916fe6856
am: 2d074dd87d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649802
Change-Id: I458512183e0c4dbe77212b55805539194350cc5f
2021-03-24 08:53:11 +00:00
Paul Duffin
0053a19238
Merge "Remove uses of buildDir from java/java_test.go and java/sdk_test.go" am: 369c3aae53
am: 372c1fc7f4
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649801
Change-Id: Icf83624c876f69517fcdb2d4166a5f294a27b0b6
2021-03-24 08:53:02 +00:00
Paul Duffin
1cf0f03fac
Merge "Remove uses of buildDir from java/app_test.go" am: 700185b1f8
am: 306639beac
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649800
Change-Id: Ie950744c2f4cbc3c3aaa62ad8ebccacd1a069c78
2021-03-24 08:52:53 +00:00
Paul Duffin
7f76b4acbd
Merge "Remove uses of buildDir from java/app_set_test.go" am: 86da0448c6
am: 84e6aaa26c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649799
Change-Id: I0594d5584a24393bb46581eb8687054f1bd6773b
2021-03-24 08:52:44 +00:00
Paul Duffin
de9cbc5d2e
Merge "Remove uses of buildDir from java/app_import_test.go" am: 6567d07f59
am: c9d8035712
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649798
Change-Id: Ia01eb0d840fad738684107da378a48edc7d6780f
2021-03-24 08:52:35 +00:00
Paul Duffin
656096fa43
Merge "Remove uses of buildDir in java/androidmk_test.go" am: 6f59e6a568
am: 1a5e03e155
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649797
Change-Id: I9a1f2065e2fd1c346c882ed1dacc062cb157c99c
2021-03-24 08:52:26 +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
71ae59412b
Remove javaFixtureFactory
...
Replaces uses of javaFixtureFactory with prepareForJavaTest and removes
the unused javaFixtureFactory.
Bug: 182885307
Test: m nothing
Change-Id: I809772d14af2af211b9e15ad676fbdc06b07cd46
2021-03-24 01:07:12 +00:00
Paul Duffin
d6339af0b6
Remove unused test methods and buildDir
...
Bug: 182885307
Test: m nothing
Change-Id: I251145a82479428a82f19cbde6b415d149acd619
2021-03-24 01:07:12 +00:00
Paul Duffin
0342dc9c35
Remove uses of buildDir from java/rro_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: Id0e5710f1f121aec9c5f744a7bc7df82d95484f6
2021-03-24 01:07:12 +00:00
Paul Duffin
b148a49319
Remove uses of buildDir from java/kotlin_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: Id1d449d55fe992ebc3d7bad38a76bb1652844f52
2021-03-24 01:07:12 +00:00
Paul Duffin
414ea5eb73
Remove uses of buildDir from java/java_test.go and java/sdk_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: I4d9dc39d3b1e5c37ba1f9e72da94048949c0fd17
2021-03-24 01:07:12 +00:00
Paul Duffin
fb0fe9f5cb
Remove uses of buildDir from java/app_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: Ia8f835a8250934ef328cad02b272e6b94b13c459
2021-03-24 01:07:02 +00:00
Paul Duffin
f71e4ed326
Remove uses of buildDir from java/app_set_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: I64b13dcb310e0a0a2049b5e3b0ea0115e7e9c2f5
2021-03-24 00:01:15 +00:00
Paul Duffin
fb8bc95199
Remove uses of buildDir from java/app_import_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: I700a3cafaa427243212aab1eb903d1871327483c
2021-03-24 00:01:15 +00:00
Paul Duffin
f04311cbc1
Remove uses of buildDir in java/androidmk_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: Ibb9520d1500fcef9a4348570926a07b5bb54bf8c
2021-03-24 00:01:15 +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