Commit Graph

34947 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Paul Duffin
3cb2c06b44 Cleanup some issues left over from previous reviews
Bug: 183235980
Test: m nothing
Change-Id: I187765c56b889445de3a4729405ee745e5f73729
2021-03-24 22:08:05 +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
Jingwen Chen
95c6eb3959 Merge "bp2build: add allowlist for package-level conversions." 2021-03-24 21:38:07 +00:00
Nicolas Geoffray
1176680a1e Merge "Fix "filename too long" issue on Luci caused by test name" am: ed35a90d2c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652453

Change-Id: I50916f844b5c8467209e5a2b68b83ec5c7ac5645
2021-03-24 21:14:35 +00:00
Nicolas Geoffray
ed35a90d2c Merge "Fix "filename too long" issue on Luci caused by test name" 2021-03-24 20:45:38 +00:00
Paul Duffin
8c93baf574 Merge "Remove testSdkWithJava" am: 688ba5bc2b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1645685

Change-Id: I44f69e2848a60a024f58b23189eb12f9374eb8b7
2021-03-24 19:00:36 +00:00
Paul Duffin
defe86ba99 Merge "Convert java_sdk_test.go tests to fixtures" am: c8ad86479f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1645684

Change-Id: I3b1c5b71e986059eda6a1a194f4f4ef15bdac918
2021-03-24 18:53:55 +00:00
Paul Duffin
688ba5bc2b Merge "Remove testSdkWithJava" 2021-03-24 17:59:09 +00:00
Paul Duffin
c8ad86479f Merge "Convert java_sdk_test.go tests to fixtures" 2021-03-24 17:57:47 +00:00
Lukács T. Berki
0a37746e67 Merge "Make null builds always be null builds." am: f2926e751c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1651489

Change-Id: I19fd9cd08be6acf338dea6160b201263772f82da
2021-03-24 16:24:48 +00:00
Lukács T. Berki
f2926e751c Merge "Make null builds always be null builds." 2021-03-24 15:48:02 +00:00
Paul Duffin
ac94726ef2 Remove testSdkWithJava
Bug: 181070625
Test: m nothing
Change-Id: I9ef906a386cc87f69b166ec88e0b6c7388c3d06a
2021-03-24 15:47:28 +00:00
Paul Duffin
9ec86b14e7 Convert java_sdk_test.go tests to fixtures
Bug: 182638834
Test: m nothing
Change-Id: I6a1fabdd2c8385e5fbaef6985047f9d0bdceb209
2021-03-24 15:47:28 +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
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
Paul Duffin
842bbe246a Merge changes I94f66e3e,I233a4fe1,Idbb37485 am: a1063c09f6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1651209

Change-Id: Ie73dc7d76f4f3029d0a5eb501ef99fdaa47b27e8
2021-03-24 14:26:38 +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
Rupert Shuttleworth
21e743df41 Add bp2build support for cc_library_static.
Also refactor bp2build-related code for cc_library_headers.

Test: Added unit test.

Test: bp2build-sync.py write; bazel build //bionic/... still works (but bp2build is disabled for most cc_library_static targets for other reasons)

Change-Id: I37c856be20a47b154909338a22a7dba1ab55693f
2021-03-24 13:56:44 +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
Thiébaud Weksteen
2de8ae0b15 Merge "rust: Drop libgcc dependency" am: 70204f9fc9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1648248

Change-Id: I1c25330b88dd50ecb04219a0001f8e788ddd11d3
2021-03-24 13:08:13 +00:00
Thiébaud Weksteen
70204f9fc9 Merge "rust: Drop libgcc dependency" 2021-03-24 12:44:09 +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