Commit Graph

76862 Commits

Author SHA1 Message Date
Cole Faust
03e69e168c Merge "Make hiddenAPIFlagFileCategory an int" into main am: 1627236844
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2925155

Change-Id: Ie0d3b014803746ad9a99c312aefb58a840d77f37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 23:12:20 +00:00
Cole Faust
1627236844 Merge "Make hiddenAPIFlagFileCategory an int" into main 2024-01-25 22:42:39 +00:00
Asmita Poddar
ef0e9c3cf4 Merge "Revert "Ensure sscp jars get copied to $OUT/soong/system_server_dexjars"" into main am: 1f4475cee1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2927392

Change-Id: I4dc9eca8826a9d9fb7a90e477860ecc5b18a72e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 10:53:58 +00:00
Asmita Poddar
1f4475cee1 Merge "Revert "Ensure sscp jars get copied to $OUT/soong/system_server_dexjars"" into main 2024-01-25 10:08:11 +00:00
Treehugger Robot
14eea647f9 Merge "Replace goldmont-without-xsaves build with goldmont-without-sha-xsaves" into main am: 471e181f92
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2926131

Change-Id: Id216ec35a89513512109c1ae187f361ffaf1e71a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 08:47:05 +00:00
Treehugger Robot
471e181f92 Merge "Replace goldmont-without-xsaves build with goldmont-without-sha-xsaves" into main 2024-01-25 08:11:40 +00:00
Treehugger Robot
b64d65ad85 Merge "Export clang coverage flags" into main am: 2a7e184383
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2852912

Change-Id: I9a479478fb86ad5e1d003a01a08a3a583c64f11b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 06:38:54 +00:00
Treehugger Robot
2a7e184383 Merge "Export clang coverage flags" into main 2024-01-25 06:18:23 +00:00
Spandan Das
b2fd4ff43f Revert "Ensure sscp jars get copied to $OUT/soong/system_server_dexjars"
This reverts commit 0b7089f134.

Reason for revert: Breaks auto builds https://groups.google.com/a/google.com/g/android-build-police/c/DfXeyxkyfYk/m/4SvZa-jkAAAJ

Change-Id: Ia6ebdf64d03284d2318978c35cb87fd4f0b79531
2024-01-25 04:25:38 +00:00
LaMont Jones
922fffb67a Merge "Propagate AconfigFiles in ModuleBase." into main am: d381b62ac4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2915905

Change-Id: I80435548e66d78503a5804c0b18ea5feaef10013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 02:18:56 +00:00
Spandan Das
a3c8609972 Merge "Ensure sscp jars get copied to $OUT/soong/system_server_dexjars" into main am: 9d4ad66a93
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2923733

Change-Id: Ie566d78cd8a5f4d64c749c341e1e1d1a64e1fa60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 02:18:25 +00:00
LaMont Jones
d381b62ac4 Merge "Propagate AconfigFiles in ModuleBase." into main 2024-01-25 01:31:12 +00:00
Spandan Das
9d4ad66a93 Merge "Ensure sscp jars get copied to $OUT/soong/system_server_dexjars" into main 2024-01-25 01:27:18 +00:00
LaMont Jones
b509938e4f Propagate AconfigFiles in ModuleBase.
Aconfig file dependencies are module-independent, and properly part of
ModuleBase.

Bug: b/308625757
Test: manual

Change-Id: I38c5907d1671cc69bb198345201316ae781fdc9f
2024-01-24 23:45:12 +00:00
Jihoon Kang
e3602321e4 Merge "Prepare to generate "runtime" stubs in droidstubs" into main am: dbc88dc4d0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2921390

Change-Id: Ic15e891878fe70cd635f85e8939150ff39fec05c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-24 22:02:45 +00:00
Jihoon Kang
dbc88dc4d0 Merge "Prepare to generate "runtime" stubs in droidstubs" into main 2024-01-24 21:30:38 +00:00
Colin Cross
038f35114a Merge changes from topic "transition-mutator-config" into main am: c50999eb0a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2923151

Change-Id: I1246b7ef231ba6fa3b2fab5bf9dd95feb4967c4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-24 20:36:25 +00:00
Colin Cross
c50999eb0a Merge changes from topic "transition-mutator-config" into main
* changes:
  Add ArchModuleContext to TransitionMutator contexts
  Split ArchMutatorContext out of BaseMutatorContext
2024-01-24 20:03:46 +00:00
Jihoon Kang
325278c925 Merge "Error when WITHOUT_CHECK_API=true in from-text stub build" into main am: 5373efc1c7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2925990

Change-Id: Ibd54f2bc9b49c8ed69658cf627693cdaf834d749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-24 19:22:36 +00:00
Colin Cross
4aa3e0ab81 Add ArchModuleContext to TransitionMutator contexts
Converting coverageMutator to a TransitionMutator requires adding
the ctx.Device() and ctx.DeviceConfig() methods.

Bug: 319288033
Test: builds
Change-Id: I697b48eb89bc23800d2d3c62d68358769f0d1075
2024-01-24 10:17:10 -08:00
Colin Cross
1d3d9f13b8 Split ArchMutatorContext out of BaseMutatorContext
Split the context methods that are useful on anything visiting a
module that has arch variants into a separate ArchMutatorContext
for reuse by TranstitionMutators.

Bug: 319288033
Test: builds
Change-Id: Ifdc21983c6c79f22965a49f169812a8cc3ad975b
2024-01-24 10:17:10 -08:00
Jihoon Kang
5373efc1c7 Merge "Error when WITHOUT_CHECK_API=true in from-text stub build" into main 2024-01-24 18:06:53 +00:00
Satoshi Niwa
b6d818dbf0 Replace goldmont-without-xsaves build with goldmont-without-sha-xsaves
For chromebooks, we need a new build variant whose target arch is
goldmont, but without SHA and XSAVES support (b/314243939#comment21)

Bug: 314243939
Test: Build an image with TARGET_ARCH_VARIANT:=goldmont-without-sha-xsaves
Change-Id: If73660b515b443d5c138ca367fa3d1c6f18485b5
2024-01-24 16:27:56 +09:00
Spandan Das
0b7089f134 Ensure sscp jars get copied to $OUT/soong/system_server_dexjars
(This was missed in aosp/2876756, which copied only the bcp jars)

This hardcoded location is used by dex2oat to compile the dexpreopt
artifacts. The copy rules are currently generated by java_(sdk)_library
for source builds, and their prebuilt counterparts in prebuilt builds.

After this change, the copy rule will be bifurcated between source and
prebuilt builds
1. For source builds, it will come from java_(sdk)_library
2. For prebuilt builds, it will come from the top-level prebuilt apex.
   Since there can be multiple prebuilt apexes in trunk stable,
   HideFromMake will be used to determine which deapexed jar to copy.

The bifurfaction is expected to be temporary. It is needed for now since
the `apex_contributions` which will be used for source vs prebuilt
selection have not been populated completely.

Test: Added a unit test
Test: Presubmits
Test: git_master-art-host:
art-gtest (https://android-build.corp.google.com/builds/abtd/run/L40800030001459791)
Test: git_main:art_standalone_tests
(https://android-build.corp.google.com/builds/abtd/run/L09000030001463855)

Bug: 308790457

Change-Id: I3105d3b3a7e5c41cb601d07806f4ea483a61b50a
2024-01-24 05:14:40 +00:00
Cole Faust
22e8abcaa6 Make hiddenAPIFlagFileCategory an int
hiddenAPIFlagFileCategory used to contain function pointers, and is
used in a provider. Providers must be serializable for incremental
soong support, so the function pointers must be removed.

Refactor hiddenAPIFlagFileCategory into a simple int.

Bug: 322069292
Test: m nothing --no-skip-soong-tests
Change-Id: I2bd50fa1b59979f30869b405314cbef16ee345f1
2024-01-23 18:01:47 -08:00
Jihoon Kang
91bf3dd4ac Error when WITHOUT_CHECK_API=true in from-text stub build
Given that WITHOUT_CHECK_API=true is incompatible with from-text stub
build, this change makes the module raise an error when the two
conflicting configurations are set.

This change also modifies the checkapi error message, that
DISABLE_STUB_VALIDATION does not bypass checkapi.

Test: m nothing --no-skip-soong-tests && WITHOUT_CHECK_API=true m nothing
Bug: 322060779
Change-Id: I597309baa8fcfbefa05863c7b392bfb8b6774cea
2024-01-24 01:21:47 +00:00
Treehugger Robot
7a6afde325 Merge "Really disable auto-vectorization." into main am: 1e33a311c6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2922685

Change-Id: I192096adfe4a5accaf156bae869e2900a3d5c78b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-23 19:09:18 +00:00
Treehugger Robot
1e33a311c6 Merge "Really disable auto-vectorization." into main 2024-01-23 17:46:58 +00:00
Ronald Braunstein
9a412422cc Merge "Add team property to all modules." into main am: 43f3b601e2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2883106

Change-Id: I4ec4d527ab773373b4b3640e7a03df5f8ca854f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-23 16:30:03 +00:00
Elliott Hughes
ffbaa4063c Merge "Greatly reduce build warning spam." into main am: 45fd5175ff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2923136

Change-Id: Ie2681ff051168cc48248c72c5be9937ac84ab18b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-23 16:29:50 +00:00
Ronald Braunstein
43f3b601e2 Merge "Add team property to all modules." into main 2024-01-23 16:00:58 +00:00
Elliott Hughes
45fd5175ff Merge "Greatly reduce build warning spam." into main 2024-01-23 15:43:10 +00:00
Elliott Hughes
2ced4b5c66 Greatly reduce build warning spam.
No-one ever fixes unused-* or deprecated-* warnings in external/ (nor should they!).

-Wno-deprecated-enum-enum-conversion should probably have been added
next to -Wno-deprecated-anon-enum-enum-conversion when it was added,
since it's a major spam contributor, and equally unlikely that anyone
will clean them up.

-Wno-deprecated-dynamic-exception-spec is a weird special case because
it should be irrelevant after our next libc++ update, but in the
meantime -- because libc++ is used everywhere -- this is a massive spam
contributor that no-one on Android cares about because we don't use
exceptions (and the people seeing this can't fix libc++ anyway).

Test: local clean builds
Change-Id: I098202337e9e5026c4c5215dbf5a2abf1fbbdca8
2024-01-22 18:34:10 -08:00
Jihoon Kang
802f2238fb Merge "Rename apiScope.stubsTag" into main am: fbe572b064
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2921389

Change-Id: I65f5e4979d9d5e0d82b70972095b5b8df59be2a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-23 01:58:15 +00:00
Jihoon Kang
fbe572b064 Merge "Rename apiScope.stubsTag" into main 2024-01-23 01:43:55 +00:00
Treehugger Robot
89d094c17e Merge "rustc-1.74.1 Build 11331546" into main am: 7f55a63222
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2920666

Change-Id: I3d3f023b5d712dc7cd57477bd53174f363cfec5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-23 01:35:56 +00:00
Treehugger Robot
7f55a63222 Merge "rustc-1.74.1 Build 11331546" into main 2024-01-23 00:58:11 +00:00
Jihoon Kang
ee11328709 Prepare to generate "runtime" stubs in droidstubs
In order to prepare generating "runtime" stubs in droidstubs, this
change performs some cleanups, which are:

- Modify droidstubs providers methods to take a StubsType enum as an
  input, in order to remove exportable-specific providers. The methods
  are also modifed to return an error when the artifact is not provided
  for the input StubsType.

- Wrap droidstubs artifact to a struct. This removes artifacts common to
  all stubs types from being written out as a individual module property
  (e.g. exportableAnnotationsZip -> exportableArtifacts.annotationsZip)

Test: m nothing --no-skip-soong-tests
Bug: 319162970
Change-Id: I6d6c57c5417ca71eab5ddda7981b71fd84fa6ee1
2024-01-23 00:29:25 +00:00
LaMont Jones
b242ed2eee Merge "Add VisitDirectDepsIgnoreBlueprint" into main am: d19b214fa1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2920271

Change-Id: Ib2b5f317648a76b4f31e832c6c584435998d40a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-22 23:06:42 +00:00
Elliott Hughes
6c93f6953f Really disable auto-vectorization.
The previous patch was insufficient. Craig Topper explains:

  -fno-vectorize only disables the loop vectorizer

  -fno-slp-vectorize only disables the SLP vectorizer

  The backend can also use vector instructions for memcpy/memset or
  combining multiple scalar loads and/or stores. That is independent
  of -fno-vectorize.

  -mllvm -vector-bits-min=0 will disable any use of fixed vectors. And
  will make attribute(vector_size) get scalarized.

  -mno-implicit-float will disable both vectorizers and
  prevent the backend for using vectors for memcpy/memset
  oor multiple scalar loads/stores. It will not affect
  attribute(vector_size). -mno-implicit-float also prevents scalar
  floating point instructions from being used for anything that didn’t
  use float/double/_Float16/etc. type in source, but I don’t think that
  happens on RISC-V today. 32-bit X86 can use a 64-bit x87 FP load as an
  atomic load for uint64_t, for example. Basically -mno-implicit-float
  is supposed to prevent the compiler from using FP or vectors when the
  source doesn’t explicitly use FP or vectors.

So -mno-implicit-float was what we were actually looking for here. I've
done a clean build with this change, and see only the expected
(hand-written assembler) vector code in bionic, and the ART
ClassLinker::LoadClass() issue is gone too. As far as I can tell, the
remaining vector code is all deliberate in that sense.

We may still end up back here again, to change "gcv" to "gc", but that
still requires some code changes just to build, and still makes it less
obvious that this is just a temporary workaround for a qemu bug
(specifically https://gitlab.com/qemu-project/qemu/-/issues/1976).

Bug: http://b/320416684
Test: objdump
Change-Id: Ibd104e4289d6d1aaf441efa0440fedc90e3da29a
2024-01-22 15:00:21 -08:00
LaMont Jones
d19b214fa1 Merge "Add VisitDirectDepsIgnoreBlueprint" into main 2024-01-22 22:21:42 +00:00
Jihoon Kang
b743155a26 Rename apiScope.stubsTag
The different roles of stubs (e.g. dependency to java modules,
hiddenapi, dist to sdk snapshot) are now split to different set of stubs
(everything, exportable and eventually runtime), while a single set of
stubs are responsible for all roles for the prebuilt stubs. Thus, the
stubs from source are depending different stubs tag (e.g.
everythingStubsTag, exportableStubsTag), while the prebuilt stubs
utilize stubsTag. Given that this tag is only used for the prebuilt
stubs, it can be renamed to `stubsTag`.

Test: m nothing --no-skip-soong-tests
Bug: 319162970
Change-Id: Iacdf434fab6a403482fd2f1de24e6f260ad80756
2024-01-22 19:40:08 +00:00
Pirama Arumuga Nainar
9bfb9d3685 [riscv64] disable vectorizer during LTO am: 5376892762
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2920412

Change-Id: I63d26768a93c455173b581ef0c98ed1b1870b02f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-20 04:53:11 +00:00
Pirama Arumuga Nainar
5376892762 [riscv64] disable vectorizer during LTO
With LTO, vectorization needs to be disabled separately in the linker flags as well.

Change-Id: I71d813974a9b7a40954d3dab5b1704baed610fd0
2024-01-19 23:02:01 +00:00
Treehugger Robot
d6e390c604 Merge "Don't set CC and CXX when running go build on mac" into main am: ed0e3cd911
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2920306

Change-Id: I4f900118e77506f2f250797fa9e7afaa02b44f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-19 22:32:56 +00:00
David Pursell
287d753573 Merge "avb_add_hash_footer: fix rollback_index format" into main am: 1fb7d7d5e5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2920276

Change-Id: If478a780927f65dd54ff77ee9f9100391eb89c98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-19 22:32:48 +00:00
Treehugger Robot
ed0e3cd911 Merge "Don't set CC and CXX when running go build on mac" into main 2024-01-19 22:20:04 +00:00
David Pursell
1fb7d7d5e5 Merge "avb_add_hash_footer: fix rollback_index format" into main 2024-01-19 21:58:03 +00:00
Aditya Kumar
a3ce209c19 Merge "Pass jump-is-expensive flag both to compiler and linker" into main am: 4ebab14f2e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2919249

Change-Id: Iab8c348a588f36ee167a32e5bf9d70324039a5d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-19 21:03:54 +00:00
David Pursell
0ebba6132a avb_add_hash_footer: fix rollback_index format
The --rollback_index value is interpreted as base 10 by default; fix the
avb_add_hash_footer rule to print values in base 10 rather than hex.

This doesn't affect any current build targets since all usages have
rollback_index < 10 at the moment so base 10 and hex are identical.

Test: a rollback_index of 12 failed build previously, now succeeds
Change-Id: Ib6cafacca02f8792a0bf3a1e733fc89ee16adebb
2024-01-19 12:55:09 -08:00