Commit Graph

33184 Commits

Author SHA1 Message Date
Neha Jain
bb64ec9b77 Update build tools version for b/237714065 am: 591d513a8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/19954018

Change-Id: Ib078f8319347272e35bcc2da78e0eb2d45ccce13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 21:59:29 +00:00
Treehugger Robot
d612b2820b Merge "Revert "Revert "Add license metadata to non-module targets.""" am: 01cd913312 am: b69a8ac2ea
Original change: https://android-review.googlesource.com/c/platform/development/+/2215211

Change-Id: I618d5f00e344c01c69ff7e5c4a2d8d93fd21d130
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 19:51:28 +00:00
Treehugger Robot
b69a8ac2ea Merge "Revert "Revert "Add license metadata to non-module targets.""" am: 01cd913312
Original change: https://android-review.googlesource.com/c/platform/development/+/2215211

Change-Id: I0e8b71fc1a4ffa10a447c8db0e47d741654a384c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 19:19:37 +00:00
Treehugger Robot
01cd913312 Merge "Revert "Revert "Add license metadata to non-module targets.""" 2022-09-14 18:48:30 +00:00
Neha Jain
591d513a8e Update build tools version for b/237714065
Bug: 237714065
Change-Id: I79bbc0a18d17ecebcaa328f306c30099acd455d4
2022-09-14 17:53:22 +00:00
Matthew Maurer
466c695cba Merge changes I78bc86ad,Ieeab8376 am: 16ed4a3cc3 am: d0d91303e2
Original change: https://android-review.googlesource.com/c/platform/development/+/2215842

Change-Id: I0ce16444be8dd310903dca9acae6d6122f99a7aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 15:37:25 +00:00
Matthew Maurer
d0d91303e2 Merge changes I78bc86ad,Ieeab8376 am: 16ed4a3cc3
Original change: https://android-review.googlesource.com/c/platform/development/+/2215842

Change-Id: I5b7bee417d614ecf6994b0eafd84934ac919891d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 15:08:07 +00:00
Matthew Maurer
16ed4a3cc3 Merge changes I78bc86ad,Ieeab8376
* changes:
  c2a: Legacy cleanup
  c2a: Parse new cargo output
2022-09-14 14:41:30 +00:00
Treehugger Robot
c390a2fab2 Merge "add u option(unbundled build) in build_vendor.sh" am: 43ee75e845 am: ca55840d51
Original change: https://android-review.googlesource.com/c/platform/development/+/2216242

Change-Id: I3be32dfcb559d5fae36bfe195443e45a841634f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 07:17:25 +00:00
Treehugger Robot
ca55840d51 Merge "add u option(unbundled build) in build_vendor.sh" am: 43ee75e845
Original change: https://android-review.googlesource.com/c/platform/development/+/2216242

Change-Id: Ia39807c63b5a78300e7ac3db021481ad2fb2c17b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 06:45:54 +00:00
Treehugger Robot
43ee75e845 Merge "add u option(unbundled build) in build_vendor.sh" 2022-09-13 06:18:53 +00:00
Jeongik Cha
1b1068f52a add u option(unbundled build) in build_vendor.sh
if u option is set, turn on TARGET_BUILD_UNBUNDLED_IMAGE

Bug: 237350883
Test: build_vendor.sh with -u
Change-Id: I9a3ceb22181eb68715f8da597ca4e5e752487c1f
2022-09-13 13:48:26 +09:00
Treehugger Robot
ef0ca87692 Merge "Add comments to ninja_metrics.proto" am: 511583f2b3 am: 05a56ece6d
Original change: https://android-review.googlesource.com/c/platform/development/+/2216241

Change-Id: Ie3f4ab1f87e12a69e57ca289ea4e5adecd5eeffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 03:29:22 +00:00
Treehugger Robot
05a56ece6d Merge "Add comments to ninja_metrics.proto" am: 511583f2b3
Original change: https://android-review.googlesource.com/c/platform/development/+/2216241

Change-Id: I85cb5832401620a284dc1559038a368deece69c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 02:57:07 +00:00
Bob Badour
4964db9772 Revert "Revert "Add license metadata to non-module targets.""
This reverts commit 696b533ad7.

Bug: 240149934

Test: m droid dist

Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo

Change-Id: I1902bac43ab3a8337b344983df7b72f5f6c7ec76
2022-09-12 19:51:45 -07:00
Treehugger Robot
511583f2b3 Merge "Add comments to ninja_metrics.proto" 2022-09-13 02:31:32 +00:00
Bob Badour
24017a26eb Merge "Revert "Add license metadata to non-module targets."" am: e541ed3b16 am: 536a874c36
Original change: https://android-review.googlesource.com/c/platform/development/+/2215207

Change-Id: Iea881b64503d4efd83c132b473b67bab9d9d6f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 01:48:16 +00:00
Bob Badour
536a874c36 Merge "Revert "Add license metadata to non-module targets."" am: e541ed3b16
Original change: https://android-review.googlesource.com/c/platform/development/+/2215207

Change-Id: Ic854753d21b3e97590a410abe8c2d770d1dc53b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 01:18:21 +00:00
Justin Yun
8e0560c601 Add comments to ninja_metrics.proto
Bug: 241033491
Test: na
Change-Id: I421189fbcdd05f5d7b7e20e1a772c23abfd37f1e
2022-09-13 09:57:04 +09:00
Bob Badour
e541ed3b16 Merge "Revert "Add license metadata to non-module targets."" 2022-09-13 00:54:30 +00:00
Bob Badour
696b533ad7 Revert "Add license metadata to non-module targets."
This reverts commit 846c5acd90.

Reason for revert: breaks sdk target on aosp-master

Change-Id: Iea8f2c676533e61a5bea06d17719fea630340b20
2022-09-13 00:52:29 +00:00
Thiébaud Weksteen
bdc4212346 Merge "Remove e2fsdroid and sload_f2fs from platform sdk" am: 0c211bf161 am: 95e5241179
Original change: https://android-review.googlesource.com/c/platform/development/+/2183576

Change-Id: I976ec3530179b40db249f006559392a7bb479c06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 00:50:28 +00:00
Thiébaud Weksteen
95e5241179 Merge "Remove e2fsdroid and sload_f2fs from platform sdk" am: 0c211bf161
Original change: https://android-review.googlesource.com/c/platform/development/+/2183576

Change-Id: Ife9b5e52f3fc08ca64f393531f9877e6d00734d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 00:18:07 +00:00
Thiébaud Weksteen
0c211bf161 Merge "Remove e2fsdroid and sload_f2fs from platform sdk" 2022-09-12 23:51:31 +00:00
Treehugger Robot
66d4e1ed78 Merge "Add license metadata to non-module targets." am: e63705e7ca am: bc464d0f0a
Original change: https://android-review.googlesource.com/c/platform/development/+/2212824

Change-Id: I367f2ecf5604e4b9c669535d13fd4a1ad61485ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 21:57:53 +00:00
Treehugger Robot
dde4634a96 Merge "Remove py2 usages" am: d3d1bd6bc2 am: 288ccae0a5
Original change: https://android-review.googlesource.com/c/platform/development/+/2214966

Change-Id: Iceaba202d82a9f3978cb685549e25a2cab2c1467
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 21:57:34 +00:00
Treehugger Robot
bc464d0f0a Merge "Add license metadata to non-module targets." am: e63705e7ca
Original change: https://android-review.googlesource.com/c/platform/development/+/2212824

Change-Id: I186f6f3236c61be79b7d45ee8ed6c718031c4eec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 21:26:11 +00:00
Treehugger Robot
288ccae0a5 Merge "Remove py2 usages" am: d3d1bd6bc2
Original change: https://android-review.googlesource.com/c/platform/development/+/2214966

Change-Id: Id424d2e65d904411225b860c146bd59fe6ccf195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 21:25:30 +00:00
Treehugger Robot
e63705e7ca Merge "Add license metadata to non-module targets." 2022-09-12 21:07:31 +00:00
Treehugger Robot
d3d1bd6bc2 Merge "Remove py2 usages" 2022-09-12 20:57:30 +00:00
Matthew Maurer
b59698e2e9 c2a: Legacy cleanup
* Removed import of print function - we only support py3 now
* Switched from set() to a set literal

Bug: None
Test: Regenerated argh_derive
Change-Id: I78bc86ad22c747c5f6ad88e2caa5e707e1ffc381
2022-09-12 13:03:32 -07:00
Matthew Maurer
ae5da710b3 c2a: Parse new cargo output
Cargo now outputs
'unittests src/lib.rs'
where before it output
'unittests'.

Bug: 246384761
Test: Add "test": true to argh_derive, regenerate, observe same bp file
Change-Id: Ieeab83761f5fe7cff88af1ce8293818736a6bb9b
2022-09-12 12:55:47 -07:00
Cole Faust
d7b3122a24 Remove py2 usages
Bug: 203436762
Test: m nothing
Change-Id: I1ab26c5cfc28032700cb9d5454cbee1b7fd8cbd7
2022-09-12 12:32:22 -07:00
Bob Badour
846c5acd90 Add license metadata to non-module targets.
Bug: 240149934

Test: m droid dist

Change-Id: I2228a9e3b347eb5db97ab776098a563567a5ac2c
2022-09-09 16:54:13 -07:00
Mu-Le Lee
444b8495c4 Merge "Update README in header checker for option ignored_linker_set_keys" am: 3ccbbe8717 am: 2480451865
Original change: https://android-review.googlesource.com/c/platform/development/+/2200156

Change-Id: I633f9d280a199ff53ba06f962bfd525ae94e943b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 08:50:43 +00:00
Mu-Le Lee
3adceac986 Merge "Add option to ignore some specific LinkerSetKeys in header-abi-diff" am: a008152637 am: 2db1c829d5
Original change: https://android-review.googlesource.com/c/platform/development/+/2198080

Change-Id: I3752b0118f5dcbe1f5d94fa78ff520070ad99184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 08:50:34 +00:00
Mu-Le Lee
2480451865 Merge "Update README in header checker for option ignored_linker_set_keys" am: 3ccbbe8717
Original change: https://android-review.googlesource.com/c/platform/development/+/2200156

Change-Id: I34581fbecd9bfc42510851d8b7d6c5221c30ec72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 08:21:48 +00:00
Mu-Le Lee
2db1c829d5 Merge "Add option to ignore some specific LinkerSetKeys in header-abi-diff" am: a008152637
Original change: https://android-review.googlesource.com/c/platform/development/+/2198080

Change-Id: I0a76f2b71524a4752ecc41a55b990604861f2c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 08:21:38 +00:00
Mu-Le Lee
3ccbbe8717 Merge "Update README in header checker for option ignored_linker_set_keys" 2022-09-05 08:13:48 +00:00
Mu-Le Lee
a008152637 Merge "Add option to ignore some specific LinkerSetKeys in header-abi-diff" 2022-09-05 07:37:06 +00:00
Treehugger Robot
f1f50ba37a Merge "Build dist to get build metrics" am: 9382092804 am: 8975672d19
Original change: https://android-review.googlesource.com/c/platform/development/+/2206555

Change-Id: Id27ef0a07459f429203afe789f69de3c45defff9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 05:40:55 +00:00
Treehugger Robot
8975672d19 Merge "Build dist to get build metrics" am: 9382092804
Original change: https://android-review.googlesource.com/c/platform/development/+/2206555

Change-Id: Ibb8a51856d9f8bd50e86d1161a95758940a7bbc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 04:56:49 +00:00
Treehugger Robot
9382092804 Merge "Build dist to get build metrics" 2022-09-05 04:24:12 +00:00
Justin Yun
367944f1c5 Build dist to get build metrics
Include dist target to build the build metrics for the vendor inner
tree build.

Bug: 241033491
Test: development/multitree/build_vendor.sh -d vsoc_x86_64 \
      -p cf_x86_64_phone -r out/dist -i %bid%
Change-Id: I7230fe2ee70eefad5e71cec7d5dc710f74f8c503
2022-09-05 12:10:25 +09:00
Treehugger Robot
c246d9a55b Merge "Fix module-file name collisions" am: 8e3e3530e8 am: b86f65e55c
Original change: https://android-review.googlesource.com/c/platform/development/+/2203455

Change-Id: I335ad855b2973dfa0d6639eae1b31c8d8d4c9003
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 00:54:52 +00:00
Treehugger Robot
b86f65e55c Merge "Fix module-file name collisions" am: 8e3e3530e8
Original change: https://android-review.googlesource.com/c/platform/development/+/2203455

Change-Id: Ic02d9e5b3dfa6f5c75296c95d31c488cf3100ff5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 00:05:15 +00:00
Treehugger Robot
8e3e3530e8 Merge "Fix module-file name collisions" 2022-09-01 23:36:01 +00:00
Cole Faust
7bc42679aa Fix module-file name collisions
Bazel doesn't allow a module and file with the same name.

Bug: 198619163
Test: Presubmits
Change-Id: I8f143ad512f0d6372e3c75d363ee73f339849a3e
2022-09-01 15:13:34 -07:00
Mu-Le Lee
d93d4de71f Add option to ignore some specific LinkerSetKeys in header-abi-diff
Sometimes developers may want to ignore some incompatible changes in ABI
because it is safe for some reason. An option should be added to
header-abi-diff so it ignores these LinkerSetKeys passed from cli or
config file.

Test: perform abi diff on libz with abi-dump version 33 with the LinkerSetKey _ZTI14internal_stat is specified.
Bug: 243903630
Change-Id: Iccc79d648ae17634a987faac32a2a7cbaa784e5c
2022-09-01 08:08:13 +00:00
Mu-Le Lee
173a9dd208 Update README in header checker for option ignored_linker_set_keys
NDK and platform Libraries are required to ensure the compatibility
across SDK version. However, some changes of a library that break its
ABI compatibility are necessary. Thus a ignored_linker_set_keys option
is added to let developers to skip some symobls.

Test: no need
Bug: 243903630
Change-Id: If6ca665189fdeec7c3e735a0f691dffd180ddc63
2022-08-31 09:08:44 +00:00