Commit Graph

4260 Commits

Author SHA1 Message Date
Colin Cross
8a63fa9fd2 Merge changes Ie8721dcd,If1827b9d,Iec250a2d,I3f46f611,Idf136919, ... am: ba5fff85a7 am: 0b0fcae3ca am: defc5c9f8a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1651847

Change-Id: Ifc60075b65f4f27134aaab9315e4c0ffe90f2481
2021-03-25 23:03:02 +00:00
Colin Cross
defc5c9f8a Merge changes Ie8721dcd,If1827b9d,Iec250a2d,I3f46f611,Idf136919, ... am: ba5fff85a7 am: 0b0fcae3ca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1651847

Change-Id: I93a2b690fa182ec885e3c941df516c2e04679f1c
2021-03-25 22:13:56 +00:00
Colin Cross
ba5fff85a7 Merge changes Ie8721dcd,If1827b9d,Iec250a2d,I3f46f611,Idf136919, ...
* changes:
  Replace ANDROID_SDK_HOME with ANDROID_PREFS_ROOT for metalava
  Simplify lint rules using improved RuleBuilder rsp support
  Support multiple rsp files in RuleBuilder
  Pass rsp files into sbox and rewrapper
  Add test for sbox input sandboxing
  Support multiple rsp files in REParams
  Move response file handling to a separate package
2021-03-25 20:55:56 +00:00
Paul Duffin
b682a0d827 Merge "Filter duplicate modules in platform_compat_config_singleton" am: f329307878 am: 8313fb112c am: d412d5404f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652267

Change-Id: I638fd20fa3ec3220985dc5b9f36d66c30015e276
2021-03-25 19:47:55 +00:00
Paul Duffin
2f2b70575f Merge "Fix TestDroiddoc's reliance on absolute paths" am: 6c968b1f0f am: 166ae29441 am: 37bb2910cc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652617

Change-Id: I4c1bcda18cd65b19766aa385759696a5d7f0fbda
2021-03-25 19:47:37 +00:00
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
Paul Duffin
d412d5404f Merge "Filter duplicate modules in platform_compat_config_singleton" am: f329307878 am: 8313fb112c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652267

Change-Id: I0d3d24bb408375cf08d129acb8b6f89c66636a34
2021-03-25 19:02:17 +00:00
Paul Duffin
37bb2910cc Merge "Fix TestDroiddoc's reliance on absolute paths" am: 6c968b1f0f am: 166ae29441
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652617

Change-Id: I0342edafa036858721bfc0e919cfc7c63ae5010d
2021-03-25 19:02:02 +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
Paul Duffin
f329307878 Merge "Filter duplicate modules in platform_compat_config_singleton" 2021-03-25 18:09:38 +00:00
Colin Cross
7ee54ffd70 Replace ANDROID_SDK_HOME with ANDROID_PREFS_ROOT for metalava
Fixes warnings:
Warning: Using ANDROID_SDK_HOME for the location of the '.android' preferences location is deprecated, please use ANDROID_PREFS_ROOT instead.
Support for ANDROID_SDK_HOME is deprecated and will be removed in 6.0

Test: m android_stubs_current
Change-Id: Ie8721dcda0578c670dfc796675ba43cda16883f6
2021-03-25 11:06:45 -07:00
Colin Cross
5bedfa2d45 Simplify lint rules using improved RuleBuilder rsp support
With the improved RuleBuilder rsp support a manual resources.list
file is not necessary, use FlagWithRspFileInputList instead.

The switch to RBE support in RuleBuilder in
Iab4e09d961891ef182643583d4d456e413bc5e39 obsoleted tracking remoteInputs
and remoteRSPInputs, remove them.

writeLintProjectXML was written to allow it to be applied to a separate
rule than the one that ran lint, but it is not used that way.  Using
the same rule for both means that manual tracking of the input
dependencies described by the project.xml rule but read by the lint
rule is not necessary, just treat them as inputs to the single rule.

Test: m lint-check
Test: m USE_RBE=true RBE_LINT=true RBE_LINT_EXEC_STRATEGY=remote lint-check
Change-Id: If1827b9dede3ebcd0792b6b4b8114d3199f6570b
2021-03-25 11:06:45 -07:00
Colin Cross
ce3a51dc96 Support multiple rsp files in RuleBuilder
The lint rule is manually creating a second rsp file because Ninja
only supports on per rule.  Move the support into RuleBuilder so
that it can apply the same rewrites that it does to the primary
one.

Test: TestRuleBuilder_Build
Change-Id: Iec250a2d60e74ccf1b4ad085a960fec6867ea559
2021-03-25 11:06:45 -07:00
Colin Cross
a4eafddc41 Support multiple rsp files in REParams
rewrapper supports a comma separate list of rsp files, replace
REParams.RSPFile with REParmas.RSPFiles.

Test: remoteexec_test.go
Change-Id: I7850c071c23d368d6fad4480dd527d146c13c6d3
2021-03-25 11:06:45 -07:00
Paul Duffin
6c968b1f0f Merge "Fix TestDroiddoc's reliance on absolute paths" 2021-03-25 18:02:26 +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
Paul Duffin
4dd6cdb3bc Fix TestDroiddoc's reliance on absolute paths
TestDroiddoc compares the value returned by OutputFiles(""), which will
usually be absolute paths including the temporary buildDir, against
paths returned from TestingBuildParam.RelativeToTop(), which does not
currently change the Path contents and so will include absolute
temporary paths. However, a follow up change to this will make the
TestingBuildParam.RelativeToTop() also change the Path contents at
which point this test would be comparing relative to absolute paths.

So, this change makes sure that they are all converted to relative to
top paths before comparison.

Bug: 183650682
Test: m droid
Change-Id: Ia4478f527af27a920945f5849525e5031cc5b8b6
2021-03-25 13:14:37 +00:00
Paul Duffin
bb9ff5108b Filter duplicate modules in platform_compat_config_singleton
Previously, unpacking a snapshot containing a
prebuilt_platform_compat_config into a source build would cause build
failure because of duplicate ids because the singleton would collate
ids from both prebuilts (versioned and unversioned) and source.

This change filters out versioned prebuilts and only uses prebuilts
that are preferred and source modules that have not been replaced by a
prebuilt.

Bug: 182402754
Test: m nothing
Change-Id: Idacbb34444e5156370df70bf88c6e8a7e2d67890
2021-03-25 12:53:25 +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