Commit Graph

56475 Commits

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

Change-Id: I17cefaf03b55cb5604b5ad10d1b60010806881f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:20:49 +00:00
Colin Cross
b77e80015a Merge "Only install to $OUT/apex for installable apexes" am: e3db7f6d38 am: e0aec36cbe am: 112817c169
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2065677

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

Change-Id: I05f934f07bc88f426b9d4d5124c04bd0e28cf259
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:13:12 +00:00
Treehugger Robot
90af63a895 Merge "If invoked 'go list' command fails, show its stderr." am: e212bcdcf5 am: 02bea04bf0 am: d0a658c848
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2064827

Change-Id: Id65423a4dd62ebb7f9802057cadb38c8f5c6a538
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:09:19 +00:00
Treehugger Robot
024b451770 Merge "Expose Clang wrapper's dump usage stats option" am: 77b99b097b am: 01a98d9de9 am: 87d0205d12
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2063669

Change-Id: Ief74b6d364d44077afca16e720547ae1def3ef27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:02:12 +00:00
TreeHugger Robot
23572a8f0b [automerger skipped] Merge "Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047" into stage-aosp-master am: 45efd40ef2 -s ours am: 4de9cd207d -s ours
am skip reason: Merged-In I595722ca59686d450ff522987a15ce283d3607e0 with SHA-1 24da73c032 is already in history

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

Change-Id: Ic4871e041008d4775eb58d306c80015c553c0e73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 05:57:06 +00:00
Xin Li
61eeea6709 [automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: f329e95694 -s ours am: d6eef7256e -s ours
am skip reason: Merged-In I595722ca59686d450ff522987a15ce283d3607e0 with SHA-1 24da73c032 is already in history

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

Change-Id: I60a30ce7c23f478615ac7d8c9ae1b4223016ddaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 05:55:47 +00:00
Wei Li
a7e413e707 Merge "Add provenance_metadata as dependency of droidcore so the provenance metadata will be built by default." am: c81924a75b am: 462c366825
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2067413

Change-Id: Ieea7f4eca060cbfe27cc9c424ea470bb94546929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 04:55:24 +00:00
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
Hsin-Yi Chen
d2e803f282 Merge "Disable RBE for header-abi-dumper" into tm-dev 2022-04-20 02:02:30 +00:00
Colin Cross
112817c169 Merge "Only install to $OUT/apex for installable apexes" am: e3db7f6d38 am: e0aec36cbe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2065677

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

Change-Id: Ie69796b890637a4e1353e25853cd37983045b5ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 00:47:25 +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
d0a658c848 Merge "If invoked 'go list' command fails, show its stderr." am: e212bcdcf5 am: 02bea04bf0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2064827

Change-Id: I5c421a5e68ac3f4e13c9e8442312eea7b8741981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 22:18:43 +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
87d0205d12 Merge "Expose Clang wrapper's dump usage stats option" am: 77b99b097b am: 01a98d9de9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2063669

Change-Id: I5edaedc11a007f14843ca7f2cd3de8e20c7d6b09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 05:39:39 +00: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
4de9cd207d [automerger skipped] Merge "Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047" into stage-aosp-master am: 45efd40ef2 -s ours
am skip reason: Merged-In I595722ca59686d450ff522987a15ce283d3607e0 with SHA-1 24da73c032 is already in history

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

Change-Id: I50e22766cd93a628cd7908b5565db7d97b45221a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 04:22:44 +00:00
Xin Li
d6eef7256e [automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: f329e95694 -s ours
am skip reason: Merged-In I595722ca59686d450ff522987a15ce283d3607e0 with SHA-1 24da73c032 is already in history

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

Change-Id: If62483b6dc685728d8831b835eaf27eae905ccda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 04:21:23 +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
Vinh Tran
c4add3f86c Merge "Update doc for Platform_apis field in DeviceProperties" am: ef4a5a3028 am: 58d8a1e993 am: c9d25bd9d8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2065673

Change-Id: I1fe398cc641588e89271fa3547ccc6cf9da33455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 01:36:41 +00:00
Vinh Tran
c9d25bd9d8 Merge "Update doc for Platform_apis field in DeviceProperties" am: ef4a5a3028 am: 58d8a1e993
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2065673

Change-Id: I81222ff83fb68ffc40e4c3039b416243cba1e723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 01:05:44 +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
Yu Liu
b1ad5a19da Merge "Support use_version_lib in cc_binary." am: d683fc45a3 am: fcb1eeb60e am: 06253ff2b4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2036969

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

Change-Id: I7582690ae1a14c4b5b2de364acaf94695845815e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 20:10:45 +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
06253ff2b4 Merge "Support use_version_lib in cc_binary." am: d683fc45a3 am: fcb1eeb60e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2036969

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

Change-Id: Id6f3d23a321bd6be0235ea5ffcab018f054d1a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 19:49:57 +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
638b1e8c9c Merge "bp2build support for cc_prebuilt_library" am: e273af2165 am: 1be93569b4 am: 667b854f8c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2059893

Change-Id: Ib5533fe194744a82c5ad9c90be2010ec72f55e64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:49:58 +00:00
Trevor Radcliffe
667b854f8c Merge "bp2build support for cc_prebuilt_library" am: e273af2165 am: 1be93569b4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2059893

Change-Id: I3219f28c998b294d0396df1be83599235d8612a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:00:10 +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
2b18574ee0 Merge "Export Java library dependency information" am: 29f5068a1c am: 51d0f34e93 am: c3763358db
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2063668

Change-Id: I043e0aac97d79520bd1f4f2140fda5f774e7a206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 06:04:36 +00:00
Hsin-Yi Chen
6580d84f51 Disable RBE for header-abi-dumper
The header-abi-dumper processes do not terminate when
USE_RBE_DUMPER=true. To unblock SDK finalization, the RBE rule is
disabled until the bug is fixed.

Test: make
Bug: 226497964
Change-Id: I3fc2357b71d346fcda431077a68c69757981318b
2022-04-18 05:35:35 +00:00
Yike Zhang
c3763358db Merge "Export Java library dependency information" am: 29f5068a1c am: 51d0f34e93
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2063668

Change-Id: I3ffb5516e41445021bbde32f3d2c102b015f37cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 05:34:11 +00:00