Commit Graph

35187 Commits

Author SHA1 Message Date
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
Thiébaud Weksteen e8b0ee73f4 rust: Add features list to rust_project.json
Bug: 183679729
Test: SOONG_GEN_RUST_PROJECT=1 m nothing
Test: manually check v1 feature resolution for libprofcollectd
Change-Id: Ib59b63372865f7f4545fe327e92d1642d76ce9c9
2021-03-25 09:59:49 +01: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
Ulyana Trafimovich a90c28ccce Merge "Split functions for compiling boot jars to allow future code reuse." am: 8ef5b4f95f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1648368

Change-Id: I613280fbc308e8f2ecfa96a0c9b0646f0eff9ea4
2021-03-24 11:13:46 +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
Lukacs T. Berki c99c947c88 Make null builds always be null builds.
Previously, soong.environment.used was written after build.ninja and if
the amount of time that passed between the two was long enough, Ninja
would decide that build.ninja is older than soong.environment.used and
rebuild it.

Test: test_null_build in bootstrap_test.sh in a loop.
Change-Id: I5467da487e8e8f2646644b8a7fb9549b9ff18276
2021-03-24 10:51:05 +01: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 1c496b075d Merge "Remove javaFixtureFactory" am: b6535d329f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649805

Change-Id: Iaf3eb19c3cb165f9d7e59527fba9588c1a8f172b
2021-03-24 08:30:13 +00:00
Paul Duffin b87810c575 Merge "Remove unused test methods and buildDir" am: 9d33cf237a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649804

Change-Id: Ic2f00510495c04f5a98c7ba6d1de32ba04c36e1d
2021-03-24 08:30:03 +00:00
Paul Duffin 541e2124bf Merge "Remove uses of buildDir from java/rro_test.go" am: 38e73fcfc0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649803

Change-Id: Ibd4ac5ab8d80664ba6fed738b6d05b0ae4c5f8c9
2021-03-24 08:29:54 +00:00
Paul Duffin 2d074dd87d Merge "Remove uses of buildDir from java/kotlin_test.go" am: 5916fe6856
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649802

Change-Id: I5c1277d53b3708c39430632d0465535247ea1a8a
2021-03-24 08:29:44 +00:00
Paul Duffin 372c1fc7f4 Merge "Remove uses of buildDir from java/java_test.go and java/sdk_test.go" am: 369c3aae53
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649801

Change-Id: I25384cb6b55ca61d30911b74482da06015af5f55
2021-03-24 08:29:35 +00:00
Paul Duffin 306639beac Merge "Remove uses of buildDir from java/app_test.go" am: 700185b1f8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649800

Change-Id: Iceaffac4a1469f2d5ab87fc6d4a9a5c162427629
2021-03-24 08:29:26 +00:00
Paul Duffin 84e6aaa26c Merge "Remove uses of buildDir from java/app_set_test.go" am: 86da0448c6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649799

Change-Id: Iabb1d2fb39eb6246e17c9d29e6b6e11fca6bbee1
2021-03-24 08:29:17 +00:00
Paul Duffin c9d8035712 Merge "Remove uses of buildDir from java/app_import_test.go" am: 6567d07f59
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649798

Change-Id: I4290def093844abd74fe7d3150c4b48ba97a4ece
2021-03-24 08:29:07 +00:00
Paul Duffin 1a5e03e155 Merge "Remove uses of buildDir in java/androidmk_test.go" am: 6f59e6a568
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649797

Change-Id: Ic44e14b3ef04f7041dae0d67c5988a0881814efb
2021-03-24 08:28:56 +00:00
Paul Duffin 5054e0dc9e Merge "Remove uses of buildDir in java/hiddenapi_singleton_test.go" am: eed60863d0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649796

Change-Id: Ic1b1885024121015b7f48a513ccd7f36a00a7a73
2021-03-24 08:28:43 +00:00
Paul Duffin cf0f595e90 Merge "Remove uses of buildDir from java/dexpreopt_bootjars_test.go" am: 1b095e5177
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649795

Change-Id: Id022d82b5ee429ad62290dfb97ad83044ae0cf94
2021-03-24 08:28:32 +00:00
Paul Duffin 9c976257f7 Merge "Register java_plugin in PrepareForTestWithJavaBuildComponents" am: 5863c2ae65
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649794

Change-Id: I4c191f302cc6529ea8d94d79b18defab3ac734d4
2021-03-24 08:27:31 +00:00