Commit Graph

43649 Commits

Author SHA1 Message Date
Orion Hodson
ce3f20e5c2 Merge "Update dex_preopt related OWNERS" am: 4eb3d6599f am: f6ef94cc37
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1739057

Change-Id: Ib2e961cc7cabd2c0bd90d2faa3384bb961a52e61
2021-06-25 09:30:44 +00:00
Orion Hodson
f6ef94cc37 Merge "Update dex_preopt related OWNERS" am: 4eb3d6599f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1739057

Change-Id: I56f0b00adb5b9cae7370931dbdc5eacf10fd17a3
2021-06-25 09:10:11 +00:00
Orion Hodson
4eb3d6599f Merge "Update dex_preopt related OWNERS" 2021-06-25 08:52:09 +00:00
TreeHugger Robot
ff7fcd05e6 [automerger skipped] Merge "Switch to clang-r416183b1" into sc-dev am: 0e4f95a656 -s ours
am skip reason: Merged-In Iff1064df8361163a6828b01256d5a7950f618652 with SHA-1 3e54508a3a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15099681

Change-Id: I4c2876feaa3f16545063e99a15232d34e36be86c
2021-06-25 03:28:17 +00:00
TreeHugger Robot
0e4f95a656 Merge "Switch to clang-r416183b1" into sc-dev 2021-06-25 03:15:49 +00:00
TreeHugger Robot
a2432c24f9 [automerger skipped] Merge "Make prebuilt properties customizable" into sc-dev am: 85b5529c54 -s ours
am skip reason: Merged-In Icaa1fe811a5f5fc4aa5fc9fa0ec0b90debe3d537 with SHA-1 69d6413dd0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15095733

Change-Id: Ie3360bb994a58b2e0effd24c78a7ff755bf9a0b0
2021-06-25 00:51:56 +00:00
TreeHugger Robot
85b5529c54 Merge "Make prebuilt properties customizable" into sc-dev 2021-06-25 00:41:44 +00:00
TreeHugger Robot
2af30b1d66 [automerger skipped] Merge "Expose imageLocationsOnDevice as well as imageLocationsOnHost" into sc-dev am: 5cb87bdf3f -s ours
am skip reason: Merged-In Idb2de398871ff114245393a9dd92b5a1b5c942e7 with SHA-1 e3165c8de3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15089863

Change-Id: If305fc26c07fce3458d87645daa6cdea270b85e3
2021-06-25 00:12:36 +00:00
TreeHugger Robot
5cb87bdf3f Merge "Expose imageLocationsOnDevice as well as imageLocationsOnHost" into sc-dev 2021-06-24 23:59:05 +00:00
Inseob Kim
8467ab848a [automerger skipped] Merge changes from topic "init_first_stage_soong" into sc-dev am: a66e2b2cba -s ours
am skip reason: Merged-In I33164a7e7c64a23f2cc1860acb24a2584f4dffad with SHA-1 5219c0e4bf is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15067022

Change-Id: I8d20e2be04ce8d9271c81d5db36f6920807625d0
2021-06-24 23:39:59 +00:00
Jiyong Park
cab76384aa Merge changes from topic "stub_from_rust" into sc-dev-plus-aosp
* changes:
  Add platform_apis property to APEX module type
  Rust module in APEX uses stub libraries across APEX boundaries
2021-06-24 23:35:46 +00:00
Inseob Kim
a66e2b2cba Merge changes from topic "init_first_stage_soong" into sc-dev
* changes:
  Fix ndk and aml arch order
  Add ramdisk_available to sysprop_library
  Add install_in_root to cc_binary
2021-06-24 23:21:02 +00:00
Pirama Arumuga Nainar
088205a050 Switch to clang-r416183b1
Bug: http://b/189328402

This contains a fix to AArch64 __clear_cache.

Test: TH + Manual verification by emulator team.
Change-Id: Iff1064df8361163a6828b01256d5a7950f618652
Merged-In: Iff1064df8361163a6828b01256d5a7950f618652
(cherry picked from commit 3e54508a3a)
2021-06-24 16:18:26 -07:00
Liz Kammer
b12c1404cd Make prebuilt properties customizable
Previously whether prebuilt properties were customizable was dependent
on the order of calling various inits.

Test: go test soong tests
Bug: 191975220
Change-Id: Icaa1fe811a5f5fc4aa5fc9fa0ec0b90debe3d537
Merged-In: Icaa1fe811a5f5fc4aa5fc9fa0ec0b90debe3d537
(cherry picked from commit 69d6413dd0)
2021-06-24 22:07:54 +00:00
Pirama Arumuga Nainar
835a77b0eb Merge "Switch to clang-r416183b1" am: 68ecdef42d am: bcefbe89b0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1745455

Change-Id: I287e1b08c8434f48a128066904662f48b10fb6b8
2021-06-24 22:02:33 +00:00
Caroline Tice
7b52fe7137 Merge "Make DWARF v5 the default debug information format." am: 04f8d2d407 am: 7a2425cde0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683375

Change-Id: I7a3b11d797bf351f862b34f49f4213caf6564432
2021-06-24 22:02:18 +00:00
Pirama Arumuga Nainar
bcefbe89b0 Merge "Switch to clang-r416183b1" am: 68ecdef42d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1745455

Change-Id: I078988725a361336c9d77e4532ad9303310bbdaa
2021-06-24 21:41:42 +00:00
Caroline Tice
7a2425cde0 Merge "Make DWARF v5 the default debug information format." am: 04f8d2d407
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683375

Change-Id: If6c61ea17f1936919b9db8751ea3139f12afb7b5
2021-06-24 21:40:29 +00:00
Pirama Arumuga Nainar
68ecdef42d Merge "Switch to clang-r416183b1" 2021-06-24 21:36:40 +00:00
Caroline Tice
04f8d2d407 Merge "Make DWARF v5 the default debug information format." 2021-06-24 21:24:22 +00:00
Treehugger Robot
e3448d6cd9 Merge "Make prebuilt properties customizable" am: c1b6cfbd4c am: ae60388052
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1746776

Change-Id: I6dede429a3a73798818e6839cb24bf5f22000481
2021-06-24 20:48:23 +00:00
Treehugger Robot
ae60388052 Merge "Make prebuilt properties customizable" am: c1b6cfbd4c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1746776

Change-Id: Ibafa194cc520db344c058b397cd00b1f74c1acdc
2021-06-24 20:34:46 +00:00
Treehugger Robot
c1b6cfbd4c Merge "Make prebuilt properties customizable" 2021-06-24 20:18:08 +00:00
Liz Kammer
69d6413dd0 Make prebuilt properties customizable
Previously whether prebuilt properties were customizable was dependent
on the order of calling various inits.

Test: go test soong tests
Bug: 191975220
Change-Id: Icaa1fe811a5f5fc4aa5fc9fa0ec0b90debe3d537
2021-06-24 13:34:18 -04:00
Paul Duffin
2d44b91e47 Merge "Ensure consistent APEX variation for java_sdk_library and java_sdk_library_import" am: 770193da6c am: 6376a132a7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1746296

Change-Id: Ifa5c52220eb38b3f8be980c2ff866e5862340a93
2021-06-24 15:17:46 +00:00
Paul Duffin
6376a132a7 Merge "Ensure consistent APEX variation for java_sdk_library and java_sdk_library_import" am: 770193da6c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1746296

Change-Id: Icbcf358221976c02545631ae189f8a28b457b379
2021-06-24 15:01:49 +00:00
Paul Duffin
770193da6c Merge "Ensure consistent APEX variation for java_sdk_library and java_sdk_library_import" 2021-06-24 14:46:34 +00:00
Jeongik Cha
ec9c82da9f Expose imageLocationsOnDevice as well as imageLocationsOnHost
Bug: 158843648
Test: check if dexpreopt.config for the module defined in mk file has
DexPreoptImageLocationsOnDevice field

Change-Id: Idb2de398871ff114245393a9dd92b5a1b5c942e7
Merged-In: Idb2de398871ff114245393a9dd92b5a1b5c942e7
(cherry picked from commit e3165c8de3)
2021-06-24 13:14:29 +00:00
Paul Duffin
ea8f808580 Ensure consistent APEX variation for java_sdk_library and java_sdk_library_import
Previously, a java_sdk_library with shared_library = true would create
a variation per APEX because it depends on an sdkLibraryXml module
which generates a file containing the APEX name. However, a shared
java_sdk_library_import would create a merged APEX variation. The
inconsistent variations caused failures in sdkDepsReplaceMutator.

This change ensures that both java_sdk_library and
java_sdk_library_import create an APEX specific variation when their
shared_library property is true.

Bug: 190499958
Test: m nothing
      - ran the above command after modifying the test to reproduce the
        problem and then after fixing to verify that it fixed the problem.
Change-Id: Iee81776a8569db3e871c40cbde14d248dfeb56e4
2021-06-24 13:33:01 +01:00
Jiyong Park
1bc8412d37 Add platform_apis property to APEX module type
The property is used to allow non-updatable APEXes to use platform APIs
(e.g. symbols marked as "# platform-only").

Bug: 191637950
Test: m com.android.virt com.android.compos
Merged-In: Id2410b4e38a78ec2146a42298840954381a7c472
Change-Id: Id2410b4e38a78ec2146a42298840954381a7c472
(cherry picked from commit fb63625a7f)
2021-06-24 19:50:32 +09:00
Jiyong Park
105dc321ce Rust module in APEX uses stub libraries across APEX boundaries
This change fixes a bug that rust module in APEX has access to private
symbols of a native library even when the native library is outside of
the APEX.

To fix this, the stub selection logic in the cc package is exctacted as
a function ChooseStubOrImpl and is used also in the rust package.

Bug: 190767845
Test: m
Merged-In: I5c4cbdd5d27f257ab329d9dadbcd87d41a87f46a
Change-Id: I5c4cbdd5d27f257ab329d9dadbcd87d41a87f46a
(cherry picked from commit 3b5f88e091)
2021-06-24 19:50:06 +09:00
Jingwen Chen
5942bb3537 Fix SOONG_DUMP_JSON_MODULE_GRAPH on a fresh checkout. am: dd9725c177 am: 2421f7075e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1744535

Change-Id: I143e2d7c67f5a32369dd96fab2265fbedc3560da
2021-06-24 10:25:10 +00:00
Jingwen Chen
2421f7075e Fix SOONG_DUMP_JSON_MODULE_GRAPH on a fresh checkout. am: dd9725c177
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1744535

Change-Id: I036b056aa6e97022193732b7f355b09e554160da
2021-06-24 10:04:08 +00:00
Jingwen Chen
dd9725c177 Fix SOONG_DUMP_JSON_MODULE_GRAPH on a fresh checkout.
This CL adds generateJsonModuleGraph bazelBuildMode and ensures that it
returns Soong early, before Kati and Soong metrics collection begin
(which causes errors, since they're looking for files that Soong in json
dump mode did not write).

Test: TH
Test: rm -rf out && SOONG_DUMP_JSON_MODULE_GRAPH=/tmp/soong.json m nothing

Change-Id: I264eadb3b3b0cd6b6e7a65adc7b39bb1c01ca136
2021-06-24 08:41:19 +00:00
Pirama Arumuga Nainar
3e54508a3a Switch to clang-r416183b1
Bug: http://b/189328402

This contains a fix to AArch64 __clear_cache.

Test: TH + Manual verification by emulator team.
Change-Id: Iff1064df8361163a6828b01256d5a7950f618652
2021-06-23 22:39:37 -07:00
Treehugger Robot
e2ef6d1b3e [automerger skipped] Merge "Remove duplicate component from sdk snapshot" am: a8de9fb2ae am: b821cd656a -s ours
am skip reason: Merged-In I515f235fe21755b5275af12366e96c24c94c0273 with SHA-1 a1aa7387f7 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1742162

Change-Id: I3b1fceb6ba7ffe90f4f7224d076099b30411aa33
2021-06-24 00:29:31 +00:00
Jeongik Cha
2c9391aace Merge "Expose imageLocationsOnDevice as well as imageLocationsOnHost" am: c1218f395c am: e40749a1b6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1744553

Change-Id: I532648d21cd60b95fa7e6d868ecc2244e04299f4
2021-06-24 00:29:20 +00:00
TreeHugger Robot
89f175d8c7 Merge "Propagated srcs from cc_defaults to cc_prebuilt_library_shared." into sc-dev am: ffc9ae993a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15084348

Change-Id: Ib6f3da05acf25c7af0bc1f4d0b36ca15759c8367
2021-06-24 00:27:51 +00:00
Treehugger Robot
b821cd656a Merge "Remove duplicate component from sdk snapshot" am: a8de9fb2ae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1742162

Change-Id: Ifec24716d0ac230e1042e1e01c7907ed6231c585
2021-06-24 00:19:21 +00:00
TreeHugger Robot
ffc9ae993a Merge "Propagated srcs from cc_defaults to cc_prebuilt_library_shared." into sc-dev 2021-06-24 00:18:56 +00:00
Jeongik Cha
e40749a1b6 Merge "Expose imageLocationsOnDevice as well as imageLocationsOnHost" am: c1218f395c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1744553

Change-Id: I97744f93f9becea296affa1d2a29a2146075ec8b
2021-06-24 00:18:09 +00:00
Treehugger Robot
a8de9fb2ae Merge "Remove duplicate component from sdk snapshot" 2021-06-24 00:04:42 +00:00
Jeongik Cha
c1218f395c Merge "Expose imageLocationsOnDevice as well as imageLocationsOnHost" 2021-06-23 23:59:07 +00:00
Evgenii Stepanov
76263a2114 [automerger skipped] Disable ubsan diagnostics under HWASan. am: e57ca4ccc3 -s ours
am skip reason: Merged-In Ide7436bbc564413cb2f29355ada5286976607205 with SHA-1 b15a564869 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15083917

Change-Id: I51a0162ac513ab17d36f06bf46d686cc8c573da3
2021-06-23 23:47:00 +00:00
Yu-Chi Cheng
24b2b0fd0c Propagated srcs from cc_defaults to cc_prebuilt_library_shared.
Bug: 191185522
Test: verified on local P21 devices.
Change-Id: I3bab7144213934f6832000793ee6cbc49abd3beb
2021-06-23 15:56:39 -07:00
Treehugger Robot
46f4457c61 Merge "Disable ubsan diagnostics under HWASan." am: 31b66c76c8 am: 15102f14d9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1744757

Change-Id: Ieb7602c1b61edc09e4a83bf22375d4ae5584ee52
2021-06-23 22:07:41 +00:00
Evgenii Stepanov
e57ca4ccc3 Disable ubsan diagnostics under HWASan.
This is a workaround for a compiler bug that makes this combination
extremely slow to build.

Bug: 191808836
Test: m net_test_btm_iso with SANITIZE_TARGET=hwaddress
Merged-In: Ide7436bbc564413cb2f29355ada5286976607205
Change-Id: Ide7436bbc564413cb2f29355ada5286976607205
(cherry picked from commit b15a564869)
2021-06-23 15:06:00 -07:00
Treehugger Robot
15102f14d9 Merge "Disable ubsan diagnostics under HWASan." am: 31b66c76c8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1744757

Change-Id: Ib8aaeeb8cb5c77e5eebeeef11bbd1885076f8e71
2021-06-23 21:52:16 +00:00
Treehugger Robot
31b66c76c8 Merge "Disable ubsan diagnostics under HWASan." 2021-06-23 21:30:46 +00:00
Paul Duffin
b97b1579d3 Remove duplicate component from sdk snapshot
Previously, an sdk snapshot could contain the following:
* A java_sdk_library_import module, e.g. "foo" which creates component
  modules "foo.stubs", etc.
* A corresponding versioned module, e.g. "sdk_foo@current" which
  created component modules "sdk_foo@current.stubs", etc.
* An internal (to the sdk snapshot) java_import for one of "foo"'s
  components, e.g. "sdk_foo.stubs"
* A corresponding versioned module, e.g. "sdk_foo.stubs@current".

That causes a few problems:
1. The "foo.stubs" is duplicated.
2. The names of the components created by the versioned
   java_sdk_library_import are invalid, as they append the component's
   suffix to the version and not the name before the version.

The latter causes problems when building against prebuilts and fixing
that causes the generated snapshot to be invalid because it contains
duplicate definitions of the "sdk_foo.stubs@current" module. One
explicitly in the Android.bp file and one created by the
"sdk_foo@current" module.

Removing the duplicates from the snapshot causes errors as the name
generated by the snapshot for the component module, i.e.
"sdk_foo.stubs@current" does not match the name generated by the
"sdk_foo@current", i.e. "sdk_foo@current.stubs".

This change fixes them together.

Bug: 179354495
Test: m nothing
Merged-In: I515f235fe21755b5275af12366e96c24c94c0273
Change-Id: I515f235fe21755b5275af12366e96c24c94c0273
(cherry picked from commit a1aa7387f7)
2021-06-23 21:38:14 +01:00