Commit Graph

57140 Commits

Author SHA1 Message Date
Muhammad Haseeb Ahmad
35ca6bc67f Merge "Make IsSanitizerEnabledForJni return false" am: 53a129db89 am: e353655540
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2105764

Change-Id: Icb9a49ce6817fe2f7fa6a6d35b6b2345cd07035c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 06:59:42 +00:00
Muhammad Haseeb Ahmad
e353655540 Merge "Make IsSanitizerEnabledForJni return false" am: 53a129db89
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2105764

Change-Id: Ibb3a1ff7d96fe50584aa576f4c0fb9ea626b5144
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 06:40:20 +00:00
Muhammad Haseeb Ahmad
53a129db89 Merge "Make IsSanitizerEnabledForJni return false" 2022-05-25 06:18:18 +00:00
Muhammad Haseeb Ahmad
e6567fe56b Make IsSanitizerEnabledForJni return false
Change-Id: I5e1722bc32b63649fc9973d11e9fd5bdea72ddbe
Test: m
2022-05-25 00:13:08 +00:00
Chris Parsons
010e249311 Add extraNinjaDeps to mixed builds depfile am: 027881cf35 am: ae0a66f4de
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2105247

Change-Id: I961fb9127174bce0170df84ab0ee466455517f1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 22:44:54 +00:00
Chris Parsons
ae0a66f4de Add extraNinjaDeps to mixed builds depfile am: 027881cf35
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2105247

Change-Id: Iee2c50ed09dd30ec2cba716ef3681b143f425e4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 22:23:45 +00:00
Chris Parsons
027881cf35 Add extraNinjaDeps to mixed builds depfile
This was accidentally removed in aosp/2094705. Among other possible
issues, this caused the "used environment variable" file to be omitted
from the depfile of soong_build during mixed builds, which would result
in soong_build not being subsequently retriggered during env var
changes.

Sendng this out as a quickfix, regression test to follow.

Bug: 233774464
Test: Manual `m nothing && USE_BAZEL_ANALYSIS=1 m nothing && m nothing`,
verifying that a rebuild was retriggered in each invocation.

Change-Id: I1d9dbd1bc4696df760ebb9be262bc165c161bb21
2022-05-24 19:41:17 +00:00
Paul Duffin
89809090fc [automerge] java_sdk_library_import: Delegate OutputFiles to impl library if needed 2p: e89f3e22e5 am: 7b885d7ab1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18579281

Change-Id: I63c7e2cb52eeb0175b8ebea0605b3d9d27eef3b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 17:29:57 +00:00
Sorin Basca
ec9d37f146 Merge "Add experimental option to target Java 17" am: 78ce8c23de am: a571b7d389
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2104326

Change-Id: Iac56194ce46c845e0498e0fb794f4eb29895d78e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 16:10:38 +00:00
Sorin Basca
a571b7d389 Merge "Add experimental option to target Java 17" am: 78ce8c23de
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2104326

Change-Id: I2657bd024f5d0eabd609ff4df5d1a088b8dbd1f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 15:36:26 +00:00
Sorin Basca
78ce8c23de Merge "Add experimental option to target Java 17" 2022-05-24 15:12:14 +00:00
Liz Kammer
3d704c2826 Merge "Handle multiple linkages in sdk snapshots" am: 91f10eccc6 am: 1446249224
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2097793

Change-Id: I5f428f85d998cde7a90d3cf361480a66363ae3db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 14:55:28 +00:00
Liz Kammer
1446249224 Merge "Handle multiple linkages in sdk snapshots" am: 91f10eccc6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2097793

Change-Id: Iff4cf0e39c3cfa956bc07dd5bea2558a001ea575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 14:29:01 +00:00
Liz Kammer
91f10eccc6 Merge "Handle multiple linkages in sdk snapshots" 2022-05-24 14:13:19 +00:00
Paul Duffin
7b885d7ab1 [automerge] java_sdk_library_import: Delegate OutputFiles to impl library if needed 2p: e89f3e22e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18579281

Bug: 230846030
Change-Id: I1360401084333107d1834eed7d230782c0e50708
2022-05-24 13:29:21 +00:00
Paul Duffin
e89f3e22e5 java_sdk_library_import: Delegate OutputFiles to impl library if needed
(cherry picked from commit 1e940d5b44)

Bug: 230846030
Test: m nothing
      # Cherry pick into build with prebuilts enabled to verify.
Change-Id: I5ac9b1cdd2fc61efbc988e84556202ff6cd57146
2022-05-24 13:28:43 +00:00
Sorin Basca
ce720c3663 Add experimental option to target Java 17
Bug: 233029164
Test: EXPERIMENTAL_TARGET_JAVA_VERSION_17=true \
      EXPERIMENTAL_USE_OPENJDK17_TOOLCHAIN=true m
Change-Id: I80a9ba9eb356a460c1036e711e793c2ca6620f53
2022-05-24 13:05:17 +01:00
Wei Li
607978227e Convert the property "manifest" properly for override_apex. am: 40f9873612 am: e577ddd482
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2100361

Change-Id: I6baaa602a3d591974b68ac3d9362f8adc0529470
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 05:34:22 +00:00
Wei Li
e577ddd482 Convert the property "manifest" properly for override_apex. am: 40f9873612
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2100361

Change-Id: I959b5a4473c85666283f90a8a015d4b5632129c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 05:12:26 +00:00
Wei Li
40f9873612 Convert the property "manifest" properly for override_apex.
1) When it is not set in base apex, default file name should be set explicitly in bp2build converter of apex
2) The manifest file path should be used as-is when base apex and override_apex is in the same Android.bp
3) The manifest file path should be prepended with package of base apex when base apex and override_apex is in different Android.bp

Bug: 216442475
Test: m nothing
Change-Id: Icd3523ebc31d885f67bea02aec05dbfc77671e87
2022-05-23 17:22:35 -07:00
Oriol Prieto Gascó
a6502cef87 [automerger skipped] Merge "Revert "Append APEX version instead of build ID for APK-in-APEX ..."" into tm-dev am: c17b70053d -s ours
am skip reason: Merged-In I9cef1418c3fc7e0970d96995b8398f5e82f479e0 with SHA-1 6cb124b8d9 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I794253afa2d3b174b649a0852970f66074ade1b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 20:21:15 +00:00
Oriol Prieto Gascó
4e40ecc34d [automerger skipped] Revert "Append APEX version instead of build ID for APK-in-APEX ..." am: a70425fb2f -s ours
am skip reason: Merged-In I9cef1418c3fc7e0970d96995b8398f5e82f479e0 with SHA-1 6cb124b8d9 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I32651c69d63dbf5245ac20cd2dd00bdb722f8395
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 20:21:14 +00:00
Liz Kammer
a99444cf9d Merge "Remove library decorator for extracting headers" am: 707f65d3d5 am: f5e9440e45
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2097186

Change-Id: Id8724a1650f87ab39809ebf5abdeb9b4034ca3dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 20:02:54 +00:00
Cole Faust
89953a9c35 Merge "Add imports property to py_library rules" am: bd4c14a7f9 am: a243af2a77
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2100587

Change-Id: I3b78103ca178c4fcf873e334bb5193073e6012cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 20:02:42 +00:00
Treehugger Robot
b18711b500 Merge "Add blockers of cc mainline modules to allowlist" am: 52edad230a am: 9130804d06
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2095405

Change-Id: Id486563c06c6ddc3da2999e1b508b03a46da7f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 20:02:29 +00:00
Christopher Parsons
424baa8f24 Merge "cc bazel handlers: use better interface checking" am: b002f87d2e am: 6be00cbfac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2098663

Change-Id: I500bf1f35121d0ae51c56703928d05e4df04a53f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 20:02:00 +00:00
Oriol Prieto Gascó
c17b70053d Merge "Revert "Append APEX version instead of build ID for APK-in-APEX ..."" into tm-dev 2022-05-23 19:49:32 +00:00
Liz Kammer
f5e9440e45 Merge "Remove library decorator for extracting headers" am: 707f65d3d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2097186

Change-Id: I770f96513f8942208f62708482395fcd2e2f1b17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 19:42:25 +00:00
Liz Kammer
707f65d3d5 Merge "Remove library decorator for extracting headers" 2022-05-23 19:36:57 +00:00
Cole Faust
a243af2a77 Merge "Add imports property to py_library rules" am: bd4c14a7f9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2100587

Change-Id: I5f7694e23d843d36c655b6ac0c252e4ec2551e13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 19:30:30 +00:00
Treehugger Robot
9130804d06 Merge "Add blockers of cc mainline modules to allowlist" am: 52edad230a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2095405

Change-Id: Ib2323e43a8188df20a42fff74f1ae7818f0611a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 19:30:12 +00:00
Christopher Parsons
6be00cbfac Merge "cc bazel handlers: use better interface checking" am: b002f87d2e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2098663

Change-Id: I4b76d5925f96c0b2d17b1d19e51f77c90266bffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 19:30:01 +00:00
Cole Faust
bd4c14a7f9 Merge "Add imports property to py_library rules" 2022-05-23 18:55:51 +00:00
Treehugger Robot
52edad230a Merge "Add blockers of cc mainline modules to allowlist" 2022-05-23 18:55:01 +00:00
Christopher Parsons
b002f87d2e Merge "cc bazel handlers: use better interface checking" 2022-05-23 18:54:50 +00:00
Treehugger Robot
a2a665b40e Merge "Clean up some bp2build technical debt" am: 5bec8d41ea am: d5c19f1eb9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2075729

Change-Id: Ia782f52cc1dfb7a43cef80f8fd374160b0208526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 18:53:44 +00:00
Treehugger Robot
d5c19f1eb9 Merge "Clean up some bp2build technical debt" am: 5bec8d41ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2075729

Change-Id: I29733bcd49c36590c134862013a1efe5264a9d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 18:25:33 +00:00
Treehugger Robot
5bec8d41ea Merge "Clean up some bp2build technical debt" 2022-05-23 18:01:04 +00:00
Yi-yo Chiang
b421d787b2 Merge "Add android.hardware.gnss-V2-ndk to VndkMustUseVendorVariantList" into tm-dev am: 6fc324a9e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18473525

Change-Id: I10dfdeec83a8bd75fd744d9de9cf4590553794fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 16:43:38 +00:00
Yi-yo Chiang
6fc324a9e0 Merge "Add android.hardware.gnss-V2-ndk to VndkMustUseVendorVariantList" into tm-dev 2022-05-23 16:18:10 +00:00
Liz Kammer
96320dfff8 Handle multiple linkages in sdk snapshots
Currently, if the same library is specified for multiple of native_libs,
native_shared_libs, and native_static_libs for different arch/oses,
there can be a few errors:

1. specifying a .so file as `srcs` within a cc_prebuilt_library rather
than being specified only for shared
2. the final type of prebuilt library is dependent on the arch/os

This change introduces:
* an ability for a member type to override the type for specified
  properties
  * checks for a library being used with incompatible member types
  * basing linkage nesting on the member type in addition to variants

  This will ensure that the correct library type is used, regardless of
  the order of iteration over oses/arches, and support nesting linkages
  where necessary but only one linkage variant exists.

Test: soong tests
Test: CI
Change-Id: I81dee013b09b99c34ca6c18f9cfcc12ee56d33d1
2022-05-23 10:51:22 -04:00
Jingwen Chen
3fc041effe queryview: don't generate 'for' attributes am: d9d096ec7c am: 69acc3f7b8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2098619

Change-Id: Ie51aa6240b1af6c82164e5a9799f6bba00d8ee87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 12:29:59 +00:00
Jingwen Chen
69acc3f7b8 queryview: don't generate 'for' attributes am: d9d096ec7c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2098619

Change-Id: I3c43fcee824613a504ebfb5a4f21a44e297f4e60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 12:12:50 +00:00
Jingwen Chen
d9d096ec7c queryview: don't generate 'for' attributes
'for' is a reserved keyword

Test: CI
Fixes: b/233579439
Change-Id: I7b94250574465353bbd6bfb82a7ea37ce9ae17a3
2022-05-23 09:38:39 +00:00
Treehugger Robot
d4899ce231 Merge "Revert "Use D8 by default for android_test"" am: 14b500daba am: 1e2e5fcb73
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2100965

Change-Id: I263ec410fc4a118374989d16e0fadee30d9ddf63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 06:20:25 +00:00
Treehugger Robot
1e2e5fcb73 Merge "Revert "Use D8 by default for android_test"" am: 14b500daba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2100965

Change-Id: Ic241b9f002c1e48378fc25254890822495f0ef40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 06:02:47 +00:00
Treehugger Robot
14b500daba Merge "Revert "Use D8 by default for android_test"" 2022-05-23 05:49:40 +00:00
Jared Duke
4e445be558 Revert "Use D8 by default for android_test"
This reverts commit 02edc10047.

Reason for revert: Breaks test_suites_x86_64_coverage

Bug: 233421462
Change-Id: I7b04d3fd7802be0f271ea3c29ef25e3d08ab1389
2022-05-23 04:00:44 +00:00
Bob Badour
763da0fe98 gen_module visibility tests. am: 0507921dcf am: 433f098306
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2098695

Change-Id: I899dddd1a4d18b6ed430140447acfbc75253ab89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 03:22:48 +00:00
Bob Badour
efdf8ab4cc Fix bug: allow multiple gen_notice modules. am: a5ea2479d3 am: d9771dedbb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2098696

Change-Id: I921b541c513779e4a73a70876a9ffff23e4361f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 03:22:39 +00:00