Commit Graph

50999 Commits

Author SHA1 Message Date
Wei Li
462c366825 Merge "Add provenance_metadata as dependency of droidcore so the provenance metadata will be built by default." am: c81924a75b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2067413

Change-Id: I54a4640b088d193c9e48d9c3b219a0c262bbc291
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 04:30:47 +00:00
Wei Li
c81924a75b Merge "Add provenance_metadata as dependency of droidcore so the provenance metadata will be built by default." 2022-04-20 03:58:15 +00:00
Wei Li
cc4a259daa Add provenance_metadata as dependency of droidcore so the provenance metadata will be built by default.
Bug: 217434690
Test: m
Change-Id: I8f69f5bcd60c03971108b9ac91681535062bc0e8
2022-04-19 17:29:16 -07:00
Colin Cross
e0aec36cbe Merge "Only install to $OUT/apex for installable apexes" am: e3db7f6d38
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2065677

Change-Id: I734343b2d0fc528dd76ad1ea578aa412323751f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 00:22:06 +00:00
Colin Cross
25a43ee488 Merge "Copy prebuilt objects to the intermediates directory" am: 8d0e466f19
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2065278

Change-Id: If8205e1f4499d3dbb387419be42a6c1904cc7991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 00:21:34 +00:00
Colin Cross
e3db7f6d38 Merge "Only install to $OUT/apex for installable apexes" 2022-04-19 23:30:22 +00:00
Colin Cross
8d0e466f19 Merge "Copy prebuilt objects to the intermediates directory" 2022-04-19 23:29:17 +00:00
Treehugger Robot
02bea04bf0 Merge "If invoked 'go list' command fails, show its stderr." am: e212bcdcf5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2064827

Change-Id: I6d4ad605374dae0f7896373d75edc49bc664625c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 21:56:19 +00:00
Treehugger Robot
e212bcdcf5 Merge "If invoked 'go list' command fails, show its stderr." 2022-04-19 21:38:57 +00:00
Sasha Smundak
d5fc469dd8 If invoked 'go list' command fails, show its stderr.
Test: manual
Change-Id: I776b71f8b6c6c3d46d60e790d944282efd6d55d7
2022-04-19 11:32:28 -07:00
Treehugger Robot
01a98d9de9 Merge "Expose Clang wrapper's dump usage stats option" am: 77b99b097b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2063669

Change-Id: Ied1c63212d2b9f082c96a4bc53752eff12e36ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 05:20:59 +00:00
Treehugger Robot
77b99b097b Merge "Expose Clang wrapper's dump usage stats option" 2022-04-19 04:58:34 +00:00
TreeHugger Robot
45efd40ef2 Merge "Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047" into stage-aosp-master 2022-04-19 03:38:46 +00:00
Colin Cross
02730b93b2 Only install to $OUT/apex for installable apexes
When coverage is enabled there are two variants of the apex, one
installable and one not installable.  Don't try to install files
files to $OUT/apex for the non-installable variant.

Bug: 217453046
Test: m NATIVE_COVERAGE_PATHS="*" NATIVE_COVERAGE_EXCLUDE_PATHS="art bionic/libc device" CLANG_COVERAGE=true USE_HOST_MUSL=true com.android.runtime
Change-Id: I23e58c811ff943b9d5dec025fa619c8db835b29c
2022-04-19 00:45:07 +00:00
Vinh Tran
58d8a1e993 Merge "Update doc for Platform_apis field in DeviceProperties" am: ef4a5a3028
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2065673

Change-Id: Ic4aff5d745f5718501976c2b2e2e1f7f7879ec4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:42:56 +00:00
Vinh Tran
ef4a5a3028 Merge "Update doc for Platform_apis field in DeviceProperties" 2022-04-19 00:14:16 +00:00
Xin Li
f329e95694 Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047
Bug: 226662282
Merged-In: I595722ca59686d450ff522987a15ce283d3607e0
Change-Id: I076c0db719e7d2b09d305ac835ea0960d1fb2991
2022-04-18 20:43:14 +00:00
Vinh Tran
d91939ee84 Update doc for Platform_apis field in DeviceProperties
The doc for Platform_apis is outdated. The property is used by not only android_app, but also android_test and android_test_helper_app

https://cs.android.com/android/platform/superproject/+/master:build/soong/java/app.go;l=382;bpv=1

Next steps:
1. Clean up existing misuse of Platform_apis and Sdk_version in android_test and android_test_helper_app.

2. Add validation check to ensure proper use of Platform_apis and Sdk_version moving forward android_test and android_test_helper_app.
Currently, android_app already has validation in place. https://cs.android.com/android/platform/superproject/+/master:build/soong/java/app.go;l=275;bpv=1;bpt=1
WIP: https://android-review.googlesource.com/c/platform/build/soong/+/2065270

Test: N/A
Change-Id: I934860cdc8b23268d70e205089118c6451d4cf8a
2022-04-18 19:51:34 +00:00
Yu Liu
fcb1eeb60e Merge "Support use_version_lib in cc_binary." am: d683fc45a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2036969

Change-Id: I10d54f70d10d820b8a73f072e6a364397adaf431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 19:25:06 +00:00
Ivan Lozano
b6289c9bbe Merge "rust: Allow rustlibs to fallback to rlibs." am: 3736abfa01
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2058050

Change-Id: I030954d9c1dc7dd661db2aa17844117dd9e75a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 19:24:27 +00:00
Yu Liu
d683fc45a3 Merge "Support use_version_lib in cc_binary." 2022-04-18 19:10:42 +00:00
Ivan Lozano
3736abfa01 Merge "rust: Allow rustlibs to fallback to rlibs." 2022-04-18 18:53:58 +00:00
Trevor Radcliffe
1be93569b4 Merge "bp2build support for cc_prebuilt_library" am: e273af2165
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2059893

Change-Id: Ifc47f9a42abdcbfe4c7d1ff08a402735e2ff4a89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 17:37:47 +00:00
Trevor Radcliffe
e273af2165 Merge "bp2build support for cc_prebuilt_library" 2022-04-18 17:16:39 +00:00
Yike Zhang
51d0f34e93 Merge "Export Java library dependency information" am: 29f5068a1c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2063668

Change-Id: I93ab90767d1274966f9837a87e93fabf1c8eba95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 05:16:27 +00:00
Yike Zhang
29f5068a1c Merge "Export Java library dependency information" 2022-04-18 04:58:47 +00:00
Yike
f628202aab Export Java library dependency information
Write `static_libs` and `libs` of Java library and Android app modules to module_bp_java_deps.json. This enables downstream tools to correctly set up the runtime environment. Note that while static libraries don't need to be on the Java classpath these modules could have non-static library dependencies that do need to be present.

Test: m out/soong/module_bp_java_deps.json
Bug: 227538646
Change-Id: I7c4aecb2fb03c890f0d2aaae80e619f6176809ef
2022-04-18 10:23:28 +08:00
Yi Kong
6adf2585a1 Expose Clang wrapper's dump usage stats option
This allows us to track how much time is spent in Clang.

Test: TOOLCHAIN_RUSAGE_OUTPUT=/tmp/rusage.txt m
Change-Id: Ib2961904f363bc59bd9d928bb055a96740cb9f17
2022-04-17 15:01:06 +08:00
Yi Kong
071ee7f912 Update to clang-r450784c am: 6840b8959c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2063319

Change-Id: Ic94f17f400c967275047e51a78827ff7fecb8d89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-16 04:52:45 +00:00
Yu Liu
a79c946fb0 Support use_version_lib in cc_binary.
Bug: 208481704
Test: Add unit test
Change-Id: I7cf299dd6b3287974067234687b3b2495a85d31e
2022-04-15 15:45:06 -07:00
Colin Cross
ee02aed756 Copy prebuilt objects to the intermediates directory
Copy prebuilt objects to the intermediate directory so that their
output file name matches the module name.  This simplifies using
the clang crt objects, whose input names vary by architecture,
in the musl sysroot genrule.

Bug: 216192129
Test: m checkbuild
Change-Id: I467d699f718e2cc5c6bf0a5c35820dedd51c5930
2022-04-15 15:16:02 -07:00
Yi Kong
6840b8959c Update to clang-r450784c
Test: presubmit
Bug: 219872481
Change-Id: I33ede295283e121ef3628cd982bcd84b96e54b8c
2022-04-16 04:14:06 +08:00
Trevor Radcliffe
58ea451750 bp2build support for cc_prebuilt_library
while cc_prebuilt_library_(shared|static) were already supported,
the raw cc_prebuilt_library module type was not supported by
bp2build. This CL provides that functionality.

Also did a little bit of refactoring and cleaning.

Bug: 225938765
Test: Confirm output BUILD.bazel files look as expected. Confirm
      that build succeeds.
Change-Id: Ic004f88febc0e5b527f2ef420dbd96ecc55d2e09
2022-04-15 16:29:28 +00:00
Treehugger Robot
f7daa06e3a Merge "Remove linux_glibc musl hack" am: d5aa2e0da3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2049205

Change-Id: Ifcd7b2439d62e20dbcef1fc7780003c9a0cce91d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 00:11:28 +00:00
Treehugger Robot
d5aa2e0da3 Merge "Remove linux_glibc musl hack" 2022-04-15 00:04:41 +00:00
Vinh Tran
cfbb243ff2 Merge "Update doc for DeviceProperties's Sdk_version field" am: 62a2fd93de
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2065271

Change-Id: I6583f76d9dc3ea0a65eab88f7177ae10a7843100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 00:02:54 +00:00
Vinh Tran
62a2fd93de Merge "Update doc for DeviceProperties's Sdk_version field" 2022-04-14 23:42:51 +00:00
Treehugger Robot
207a44b0bf Merge "Export listshare and checkshare to Soong and Make" am: 7e7abd116d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2063507

Change-Id: I17d723d689e7232f438f457a5b30ce81dd8411d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 22:26:32 +00:00
Treehugger Robot
7e7abd116d Merge "Export listshare and checkshare to Soong and Make" 2022-04-14 22:09:15 +00:00
Vinh Tran
a9c8f7db27 Update doc for DeviceProperties's Sdk_version field
Test: N/A
Change-Id: I7848ce27a5dcecaf24b0129908f6673dd1fdb63f
2022-04-14 21:02:16 +00:00
Vinh Tran
a5580107d0 Merge "Document AARImportProperties fields" am: 08e0f96841
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2063168

Change-Id: I00aac5a7d55641b2be6135cfd95839519a405617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 20:51:43 +00:00
Vinh Tran
08e0f96841 Merge "Document AARImportProperties fields" 2022-04-14 20:25:11 +00:00
Cole Faust
34ce0f3ba9 Merge "Move variable assignment handling to generation context" am: 7cd255fa8d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2057162

Change-Id: I0dcd663160c05817d322010203eb9bf0efefae5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 17:39:33 +00:00
Cole Faust
993e600682 Merge "Add handle to enforce_product_packages_exist" am: 76fff5dd86
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2064467

Change-Id: I6f1a0a9f9ad55b3ba034b64048d90fb3ba4469d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 17:38:44 +00:00
Cole Faust
7cd255fa8d Merge "Move variable assignment handling to generation context" 2022-04-14 16:59:10 +00:00
Cole Faust
76fff5dd86 Merge "Add handle to enforce_product_packages_exist" 2022-04-14 16:56:28 +00:00
Vinh Tran
6d7f6c7442 Merge "Fix documentation for android_app_import" am: fc5b47e5d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2062873

Change-Id: I74ce746d5bca5f4b9a51b2442b2946edfdfa1964
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 16:49:59 +00:00
Vinh Tran
fc5b47e5d4 Merge "Fix documentation for android_app_import" 2022-04-14 16:27:18 +00:00
Sam Delmerico
d09556a687 add unit test for bp2build allowlist am: cc51843e52
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2047750

Change-Id: I4b5ef2be27f80ba8930ecc3d7d1e9ed0b2ac7165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 16:13:12 +00:00
Sam Delmerico
a9ffab0be2 refactor bp2build module allowlists into struct am: 24c5603815
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2047749

Change-Id: I77f64526b7a1600a5e2727e045812c091e243c7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 16:13:09 +00:00