StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,937 Commits 1 Branch 0 Tags
436b98b4bb5dd32c6565a4510c1dc5a60d2317c6
Commit Graph

4245 Commits

Author SHA1 Message Date
Roland Levillain
436b98b4bb Merge "Fix a typo in the definition of varApexNames in java/dexpreopt_bootjars.go." am: 737ad608ab am: 1cb436ebf0 am: ff6d63e4f2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652467

Change-Id: Ida829111b3ef8f005ff6f138411904de2f1ce093
 2021-03-25 19:42:56 +00:00
Roland Levillain
ff6d63e4f2 Merge "Fix a typo in the definition of varApexNames in java/dexpreopt_bootjars.go." am: 737ad608ab am: 1cb436ebf0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652467

Change-Id: Ibd098123bdde4b3c08d71b557f9b9a9b1e26b106
 2021-03-25 19:00:06 +00:00
Roland Levillain
737ad608ab Merge "Fix a typo in the definition of varApexNames in java/dexpreopt_bootjars.go." 2021-03-25 17:25:44 +00:00
Ulyana Trafimovich
0fb7be1174 Merge "Allow using updatable boot jars in dexpreopt (but don't use them yet)." am: 2258cbbe42 am: 29dae7ed73 am: a7836fa341 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1647188

Change-Id: Ib00f2aced5791d0c36e4593b36c09fd7976ad006
 2021-03-25 12:25:01 +00:00
Ulyana Trafimovich
a7836fa341 Merge "Allow using updatable boot jars in dexpreopt (but don't use them yet)." am: 2258cbbe42 am: 29dae7ed73 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1647188

Change-Id: I1849bcde5949b3d19a996bc01837469518c6cba7
 2021-03-25 11:29:43 +00:00
Paul Duffin
c80f01ee04 Merge "Convert test that disallows non existent paths to use fixtures" am: e742ee14f8 am: 4a08263f48 am: cd3cc29952 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1647169

Change-Id: I2e08b61169a01a256e87da0d5ff338c83751814f
 2021-03-25 10:52:55 +00:00
Ulyana Trafimovich
2258cbbe42 Merge "Allow using updatable boot jars in dexpreopt (but don't use them yet)." 2021-03-25 10:13:45 +00:00
Paul Duffin
cd3cc29952 Merge "Convert test that disallows non existent paths to use fixtures" am: e742ee14f8 am: 4a08263f48 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1647169

Change-Id: I7d91d68f6402e087a1f7693373fe101e979907a2
 2021-03-25 10:03:03 +00:00
Paul Duffin
49ed211c7a Merge "Cleanup usages of Dex2oatDepTag" am: 958408d921 am: 15204cf1ea am: 6a8ac75e6a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652452

Change-Id: If6f759f545421848c466659e1cd8ccc80ef50e4b
 2021-03-24 23:51:28 +00:00
Paul Duffin
6a8ac75e6a Merge "Cleanup usages of Dex2oatDepTag" am: 958408d921 am: 15204cf1ea 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652452

Change-Id: Iea09f5217e72ff0a1051f455adee3bfff1ebe889
 2021-03-24 23:10:25 +00:00
Nicolas Geoffray
8fb9e03dfa Merge "Fix "filename too long" issue on Luci caused by test name" am: ed35a90d2c am: 1176680a1e am: 938db1752c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652453

Change-Id: I59ad97dd6cb5d883866ed7be36c86068721c7965
 2021-03-24 22:38:12 +00:00
Paul Duffin
76e5c8a37f Convert test that disallows non existent paths to use fixtures 
This change needed to add some additional files to the registered
files for PrepareForTestWithJavaDefaultModules because otherwise they
would fail when "TestAllowNonExistentPaths = false". Those files were
being added by the TestJavaLintRequiresCustomLintFileToExist (albeit in
some cases in different locations to that required by the default
modules but as the files are needed by the modules defined in
PrepareForTestWithJavaDefaultModules they should be defined in it.

A couple of other places also provided some files so moving them into
PrepareForTestWithJavaDefaultModules caused some conflicts which needed
to be resolved.

Bug: 183184375
Test: m nothing
Change-Id: I76ce9f1673c1c1c4000635b76b8377d582224bf1
 2021-03-24 22:08:05 +00:00
Paul Duffin
958408d921 Merge "Cleanup usages of Dex2oatDepTag" 2021-03-24 22:04:58 +00:00
Nicolas Geoffray
938db1752c Merge "Fix "filename too long" issue on Luci caused by test name" am: ed35a90d2c am: 1176680a1e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652453

Change-Id: Icfaf4342d2236a45c69db7ab26ff62b72f73d40e
 2021-03-24 21:55:13 +00:00
Paul Duffin
13a70313b2 Merge changes I94f66e3e,I233a4fe1,Idbb37485 am: a1063c09f6 am: 842bbe246a am: 14ef1b2928 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1651209

Change-Id: I809f1327c8838d24f0b4a41f4b09642c533c960d
 2021-03-24 15:49:12 +00:00
Paul Duffin
a35178b105 Fix "filename too long" issue on Luci caused by test name 
Stop including fields in the test name for TestJavaSdkLibraryEnforce to
reduce its length to avoid the filename too long limit.

Test: m nothing
      Check the lengths before (~240) and after (~74) to make sure
      there was a sizeable reduction.
Change-Id: I275a1110e5102b8ea8376759f28c7c6333a5efee
 2021-03-24 15:09:37 +00:00
Paul Duffin
14ef1b2928 Merge changes I94f66e3e,I233a4fe1,Idbb37485 am: a1063c09f6 am: 842bbe246a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1651209

Change-Id: I8a4ab1c605742ab62a6f871b378c96d2d2febaa9
 2021-03-24 15:02:36 +00:00
Paul Duffin
b506c9dc11 Cleanup usages of Dex2oatDepTag 
Creates a new deptag type for it so that it can implement the marker
interfaces that will exclude it from being added to the APEX and from
visibility enforcement. The latter is probably not an issue ATM because
the dependencies are added after visibility checks are enforced but
this code is undergoing lots of refactoring so that may change.

Bug: 177892522
Test: m nothing
Change-Id: Ibd167d557adec761a2e3eed78f4d334c40a04fb9
 2021-03-24 14:34:40 +00:00
Roland Levillain
d603c7dbae Fix a typo in the definition of varApexNames in java/dexpreopt_bootjars.go. 
Change-Id: If1267cf18dcd307316cce8d2cac7c6f5c173f3d4
Test: `m nothing` in internal tree
Bug: 180325915
 2021-03-24 14:24:04 +00:00
Paul Duffin
a1063c09f6 Merge changes I94f66e3e,I233a4fe1,Idbb37485 
* changes:
  Group all the preparations needed for testing dexpreopt
  Separate methods used for fixture based and legacy tests
  Use more inclusive language in dexpreopt/testing.go
 2021-03-24 13:41:56 +00:00
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
Ulya Trafimovich
9023b02c00 Allow using updatable boot jars in dexpreopt (but don't use them yet). 
This CL handles updatable boot jars in the same hacky way as we handle
non-updatable boot jars: it creates a set of predefined paths to the dex
jars in a global config, then traverses all modules in a singleton
context, finds updatable boot jars and adds copy rules from these jars
to the predefined paths. A proper way would be to register dependencies
of the dexpreopted modules on the boot jars and extracting paths to dex
files by walking these dependencies.

Bug: 178467404
Test: lunch aosp_cf_x86_64_phone-userdebug && m
Test: added new Soong test
Change-Id: I87f764109315f79315d73bf43799b70eb010fc0b
 2021-03-24 11:16:11 +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
9fc9f53423 Group all the preparations needed for testing dexpreopt 
Make it easier to test dexpreopt functionality by grouping all the
fixture preparations together.

Bug: 177892522
Test: m nothing
Change-Id: I94f66e3ec82efc4fd791f4fdab678d298565e452
 2021-03-24 08:30:27 +00:00
Paul Duffin
3c84eaaa98 Separate methods used for fixture based and legacy tests 
The fixture mechanism makes it easy to refactor by splitting up an
existing preparer into separate ones and then combining them back
together. Unfortunately, that becomes slightly more tricky when
preparers and legacy tests use the same functions to register build
components and define default modules.

This change splits the RegisterRequiredBuildComponentsForTest and
GatherRequiredDepsForTest methods into two methods each, with the
existing method used for legacy tests and calling the new method that
is used for the preparer.

At the moment all the functionality is in the new methods but over
time, as functionality is extracted into separate preparers, the
functionality can also be moved from the method that is common to both
legacy and fixture based tests into the legacy only method.

Bug: 177892522
Test: m nothing
Change-Id: I233a4fe1fb072a00292acc2bb20821ec82a9bd67
 2021-03-24 08:27:04 +00:00