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
Paul Duffin
ee7bab4e04
Merge "Add Path.RelativeToTop" am: 301deecd6c
am: f1cf5308f9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652616
Change-Id: I0f9c4bf26f577cc7865575379eeebd2f2a5d4277
2021-03-25 19:01:56 +00:00
Pirama Arumuga Nainar
bf56f6b1f6
Merge "[pgo] Do not explicitly link profile runtime" am: 4c0b11a16e
am: a65c8e8172
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1651751
Change-Id: I528de2e25b0c31ad8e9a637e825df5e7b2cf1b22
2021-03-25 19:01:12 +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
166ae29441
Merge "Fix TestDroiddoc's reliance on absolute paths" am: 6c968b1f0f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652617
Change-Id: I48cd4a6a6d2a50a1b756c59bbdcf4ead8bc2dccf
2021-03-25 18:20:46 +00:00
Paul Duffin
f1cf5308f9
Merge "Add Path.RelativeToTop" am: 301deecd6c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652616
Change-Id: I194fc8c451e39d06bab40db3f0c12f1b1170776b
2021-03-25 18:20:37 +00:00
Pirama Arumuga Nainar
a65c8e8172
Merge "[pgo] Do not explicitly link profile runtime" am: 4c0b11a16e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1651751
Change-Id: Ia3c2d72cf450e1a86671940a198afac669bad45a
2021-03-25 18:20:27 +00:00
Roland Levillain
1cb436ebf0
Merge "Fix a typo in the definition of varApexNames
in java/dexpreopt_bootjars.go
." am: 737ad608ab
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652467
Change-Id: I41c0e1ac6ba7737b8fa237be1c58dca87093003c
2021-03-25 18:19:07 +00:00
Paul Duffin
6c968b1f0f
Merge "Fix TestDroiddoc's reliance on absolute paths"
2021-03-25 18:02:26 +00:00
Paul Duffin
301deecd6c
Merge "Add Path.RelativeToTop"
2021-03-25 18:01:31 +00:00
Pirama Arumuga Nainar
4c0b11a16e
Merge "[pgo] Do not explicitly link profile runtime"
2021-03-25 17:57:49 +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
Jingwen Chen
4efc3be553
Merge "bp2build: add a per-module denylist." am: 6400f20430
am: 3b8237f945
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652238
Change-Id: If35b10160ce1b05b1aa3dbe27bf89f4730afabf8
2021-03-25 15:45:18 +00:00
Paul Duffin
f5776e8bbd
Merge "Remove config from basePath" am: 618eeff010
am: d92c7a13ed
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652615
Change-Id: I64fc284efc2d09e92879d6771e35437665fb19a4
2021-03-25 15:45:13 +00:00
Paul Duffin
76af577bae
Merge changes I12e1854c,I08f7dba4 am: 85484e344a
am: 000fe1cfe5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652614
Change-Id: Ibb3b208fac94d9eb979ccb9502abade750577285
2021-03-25 15:45:06 +00:00
Jingwen Chen
3b8237f945
Merge "bp2build: add a per-module denylist." am: 6400f20430
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652238
Change-Id: I659b327ff1f4eed86b9151dfcda94a9d93ef34e1
2021-03-25 15:10:18 +00:00
Paul Duffin
d92c7a13ed
Merge "Remove config from basePath" am: 618eeff010
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652615
Change-Id: I10dc32d568e6812dd714000fd79bfc4b1e4edf5f
2021-03-25 15:10:08 +00:00
Paul Duffin
000fe1cfe5
Merge changes I12e1854c,I08f7dba4 am: 85484e344a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652614
Change-Id: I95aba831638f6b195b0e1006f721a4054bebfde5
2021-03-25 15:09:36 +00:00
Jingwen Chen
6400f20430
Merge "bp2build: add a per-module denylist."
2021-03-25 15:02:57 +00:00
Paul Duffin
618eeff010
Merge "Remove config from basePath"
2021-03-25 14:45:43 +00:00
Paul Duffin
85484e344a
Merge changes I12e1854c,I08f7dba4
...
* changes:
Add buildDir to WritablePath implementations
Add srcDir to SourcePath
2021-03-25 14:44:51 +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
85d8f0dcd9
Add Path.RelativeToTop
...
Makes Path.RelativeToTop the source of truth as to what `relative to
top` means.
Uses it in PathRelativeToTop so that it will be tested by the existing
tests that use AssertPathRelativeToTop.
Also adds RelativeToTop() to WritablePaths and Paths.
Bug: 183650682
Test: m droid
Change-Id: I88dc56afd1314e51b4e41795a2448cab4ce8a899
2021-03-25 13:14:37 +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
Ulyana Trafimovich
29dae7ed73
Merge "Allow using updatable boot jars in dexpreopt (but don't use them yet)." am: 2258cbbe42
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1647188
Change-Id: I7097c866c3dd01fa8e19c8aa74c4b74c1e78538b
2021-03-25 10:48:01 +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
be7a13be42
Merge "Cleanup some issues left over from previous reviews" am: 2b1d2b6e4d
am: ed3f3fc4f7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1651487
Change-Id: I8bcf6f753e2185c8c885b725b6889cc5ba0c47b1
2021-03-25 10:03:09 +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
Treehugger Robot
ef42232afb
Merge "Enable safe ICF for all devices" am: f7e79a591c
am: 660e778db6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649333
Change-Id: Iedd890db0c4d5c65e3eb5b5d94808efa23208ea1
2021-03-25 10:02:54 +00:00
Jingwen Chen
5d72cba25c
bp2build: add a per-module denylist.
...
This speeds up development of experimental converters.
Test: TH
Change-Id: I1623d3dbf63c8ed777646d64560d77b38edf9213
2021-03-25 09:29:26 +00:00
Paul Duffin
ed3f3fc4f7
Merge "Cleanup some issues left over from previous reviews" am: 2b1d2b6e4d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1651487
Change-Id: I30866d664063f5a682312ef6631b2b7f457f03a0
2021-03-25 09:23:49 +00:00
Paul Duffin
4a08263f48
Merge "Convert test that disallows non existent paths to use fixtures" am: e742ee14f8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1647169
Change-Id: Icd8fa81faa7c0e62a33d3baeaa0368a18e3917ad
2021-03-25 09:23:40 +00:00
Treehugger Robot
660e778db6
Merge "Enable safe ICF for all devices" am: f7e79a591c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649333
Change-Id: I15ef7c4835348f90cb86d30987713327fdec0c84
2021-03-25 09:21:31 +00:00
Paul Duffin
74abc5d4ee
Remove config from basePath
...
Bug: 183650682
Test: m droid
Change-Id: I60eb2b8ed0317e874ecdafd5cb37d7c997d41bb8
2021-03-25 09:18:29 +00:00
Paul Duffin
d65c58b204
Add buildDir to WritablePath implementations
...
First, the buildDir() method was renamed to getBuildDir() to avoid
clashing with the buildDir field.
Then, a buildDir was added to both `OutputPath` and `InstallPath` but
not to `PhonyPath` as it does not contain any path components. Instead
the `PhonyPath.getBuildDir()` was changed to simply return "".
Bug: 183650682
Test: m droid
Change-Id: I12e1854c829b980c5c01205753c62c00dc0a4774
2021-03-25 09:18:29 +00:00
Paul Duffin
580efc8716
Add srcDir to SourcePath
...
Bug: 183650682
Test: m droid
Change-Id: I08f7dba449538d289a6c4d6b5325c1a833cff834
2021-03-25 09:18:29 +00:00
Paul Duffin
2b1d2b6e4d
Merge "Cleanup some issues left over from previous reviews"
2021-03-25 09:16:40 +00:00
Paul Duffin
e742ee14f8
Merge "Convert test that disallows non existent paths to use fixtures"
2021-03-25 09:16:20 +00:00
Treehugger Robot
f7e79a591c
Merge "Enable safe ICF for all devices"
2021-03-25 08:59:00 +00:00
Jingwen Chen
8729dfc636
Merge "Revert "Add bp2build support for cc_library_static."" am: 8b086655cd
am: 1763a4add1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652233
Change-Id: I42b3cc57dfa2654be6919e3fe988aad73eb5f41a
2021-03-25 07:06:50 +00:00
Rupert Shuttleworth
ce8062d357
Merge "Add bp2build support for cc_library_static." am: d3e10104b0
am: 76d01a0522
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1594371
Change-Id: Ic116a271ce2235d895d7a23a09720031610995d0
2021-03-25 07:06:34 +00:00
Jingwen Chen
1763a4add1
Merge "Revert "Add bp2build support for cc_library_static."" am: 8b086655cd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652233
Change-Id: I2839b7035eab47feb05634421d0dd1e8265d107f
2021-03-25 06:28:37 +00:00
Rupert Shuttleworth
76d01a0522
Merge "Add bp2build support for cc_library_static." am: d3e10104b0
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1594371
Change-Id: I85b57630efd5ecf8ad3b32941e094591621a2eed
2021-03-25 06:28:03 +00:00
Jingwen Chen
8b086655cd
Merge "Revert "Add bp2build support for cc_library_static.""
2021-03-25 06:14:03 +00:00
Jingwen Chen
f9410540a8
Revert "Add bp2build support for cc_library_static."
...
Revert submission 1594391-bp2build-cc_library_static
Reason for revert: Broke the build on aosp-master
Reverted Changes:
Ib16ccf31a:Add cc_library_static macro to help with bp2build ...
I37c856be2:Add bp2build support for cc_library_static.
Change-Id: Ie94d5bc6da81758cd4e0461c08a810a29643c971
2021-03-25 06:11:59 +00:00
Rupert Shuttleworth
d3e10104b0
Merge "Add bp2build support for cc_library_static."
2021-03-25 05:39:39 +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
Jingwen Chen
a7b2d95cf6
Merge "bp2build: add allowlist for package-level conversions." am: 95c6eb3959
am: cf615d8640
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625820
Change-Id: Iefc2f925a7c1cdf33594e794544cf0fb629bac3f
2021-03-24 23:10:14 +00:00
Paul Duffin
15204cf1ea
Merge "Cleanup usages of Dex2oatDepTag" am: 958408d921
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652452
Change-Id: I6eea8ea370adf745908b9e8b5d669eb182c92c1c
2021-03-24 22:34:02 +00:00
Jingwen Chen
cf615d8640
Merge "bp2build: add allowlist for package-level conversions." am: 95c6eb3959
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625820
Change-Id: Ic4d3be3dfe3bb312b3c4bdca0289ef3fc3ef81d9
2021-03-24 22:33:25 +00:00