Commit Graph

51026 Commits

Author SHA1 Message Date
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
c0fa5fb34e Abstract prebuilt_etc into prebuilt_file am: b81f77ed24
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2002752

Change-Id: Ica34b683a4696e86feabe0a6fd7f0fd0561d906f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 14:55:26 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
9ea047d5e3 DoNotConvert tzdata nor tz_version am: bff2e88a85
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2069572

Change-Id: Ib46e17f36142a262e20463509926a00b32cc89b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 14:55:23 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
bff2e88a85 DoNotConvert tzdata nor tz_version
In using prebuilt_file for prebuilt_{etc,usr_share}, Bazel now sees such
targets translated and doesn't permit a target name to alias e.g. its
`src`. Thus we temporarily disable the conversion of the `tz_version` and
`tzdata` whilst their in-tree sources are updated. Their conversions
will be reenabled afterward.

Bug: 215723302
Test: bp2build.sh
Test: mixed_{libc,droid}.sh
Change-Id: Ie19813ccb0fb93c90b54bfd19c909ed15b826385
2022-04-21 14:37:12 +00:00
Jingwen Chen
423fb97541 Merge "Suffix the build ID to the dirname of APK-in-APEX files." am: 3a5be76dc0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2044863

Change-Id: Ic42c6028c0612e77262fd7a1b48f75f9e92e184e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 09:48:45 +00:00
Jingwen Chen
3a5be76dc0 Merge "Suffix the build ID to the dirname of APK-in-APEX files." 2022-04-21 09:24:22 +00:00
Treehugger Robot
9b6a0a2bdd Merge "Recursively list Android image contents." am: fa8fce5542
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2049928

Change-Id: I4893802128de3e1238ec9b46ce83fe30c2bf4d9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 06:40:19 +00:00
Treehugger Robot
fa8fce5542 Merge "Recursively list Android image contents." 2022-04-21 06:25:10 +00:00
Wei Li
003edb878a Merge "Put provenance_metadata.textproto in dist directory." am: 7023c80e19
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2069478

Change-Id: Id5a6521b0e2fd27863ac5086b583208f243e8624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 04:41:07 +00:00
Wei Li
7023c80e19 Merge "Put provenance_metadata.textproto in dist directory." 2022-04-21 04:04:41 +00:00
Sasha Smundak
fe11851029 Recursively list Android image contents.
Relies on debugfs utility to inspect image contents.
The output looks something like this:
```
./
./app/
./app/Calendar/
./app/Calendar/Calendar.apk
```

Test: manual
Change-Id: Ia05f4e857dfd28ac76ac2b450b08f5cf5577d21f
2022-04-20 20:02:11 -07:00
Wei Li
7cf80a65a8 Put provenance_metadata.textproto in dist directory.
Bug: 217434690
Test: m dist
Change-Id: I2f0d51846b3aad48c923c2f281ed42b6d4fe2a1d
2022-04-21 00:02:09 +00:00
Dan Albert
30cfbf22eb Merge changes from topic "abigail-werror" am: e31a071389
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2065275

Change-Id: I2ad507fb59e2443ba99fc671af35e1e4d2f3e399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 19:53:15 +00:00
Dan Albert
73de4dbcc1 Abort on abitidy errors. am: 604086f988
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1737315

Change-Id: I1833517f786194dd61a2211254f4515bdbc04871
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 19:53:13 +00:00
Dan Albert
e31a071389 Merge changes from topic "abigail-werror"
* changes:
  Disable ABI dumping for hwasan builds.
  Abort on abitidy errors.
2022-04-20 19:19:07 +00:00
Treehugger Robot
0ad2da70c1 Merge "Install .rc files for ramdisk variants" am: 0c9d27c463
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2062874

Change-Id: I73dc1a0fdc9f868215fe24072f8d513fb9b7de3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 18:32:23 +00:00
Treehugger Robot
0c9d27c463 Merge "Install .rc files for ramdisk variants" 2022-04-20 18:07:18 +00:00
Trevor Radcliffe
5d9a85745b Merge "Fix tests for cc_prebuilt_library bp2build" am: 2e7c82ea0b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2068107

Change-Id: Ifddb1c78328b50ebb0b45b2dd81041a8f22b9c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 14:40:14 +00:00
Trevor Radcliffe
2e7c82ea0b Merge "Fix tests for cc_prebuilt_library bp2build" 2022-04-20 14:16:44 +00:00
Treehugger Robot
1789cc41e6 Merge "Remove former roboleaf team members, add new" am: cdbc8a24e6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2060597

Change-Id: Ieef43ec95f249d04f060848a240dd4f78e29d952
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 12:41:01 +00:00
Treehugger Robot
cdbc8a24e6 Merge "Remove former roboleaf team members, add new" 2022-04-20 12:08:32 +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
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
Dan Albert
f71006a962 Disable ABI dumping for hwasan builds.
abidw doesn't currently handle top-byte-ignore correctly. Disable ABI
dumping for those configs while we wait for a fix. We'll still have
ABI checking coverage from non-hwasan builds.

Bug: http://b/190554910
Test: treehugger
Change-Id: I0e29979f8c212c43e0d1beea737abcd7fd0119d7
2022-04-19 22:01: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
Dan Albert
604086f988 Abort on abitidy errors.
Test: m ndk
Bug: http://b/190554910
Change-Id: Ie72b345942fef0d3dd740e50aa655408b790978a
2022-04-19 21:07:42 +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
Trevor Radcliffe
54abd2e128 Fix tests for cc_prebuilt_library bp2build
Also, add the tests to Soong

Bug: 225938765
Test: ran tests
Change-Id: Ia26e46d89b8a408eb4b09f93a7ed4f0aa2e37809
2022-04-19 14:54:00 +00:00
Jingwen Chen
8ce1efc5af Suffix the build ID to the dirname of APK-in-APEX files.
This fixes an issue with package manager's cache invalidation.

Test: CI

Bug: 226559955
Bug: 224589412
Change-Id: I8af49d51ff99cf8184d0e4d1136fff1cdb29c23e
Merged-In: I8af49d51ff99cf8184d0e4d1136fff1cdb29c23e
2022-04-19 13:57:01 +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
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