Matthew Maurer
5584fd7393
Merge "rust: addr3prf: Support COPYING files" am: a2fff95476
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2182815
Change-Id: I45d9882d7382e13ec7d6838b7b878aed3efa2945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 17:06:42 +00:00
Matthew Maurer
a2fff95476
Merge "rust: addr3prf: Support COPYING files"
2022-08-11 16:52:28 +00:00
Matthew Maurer
51ec016f76
rust: addr3prf: Support COPYING files
...
Previously, we only looked for LICENSE* files. This adds support for
detecting COPYING* files as an alternate representation of the license.
Bug: 234563254
Test: get_rust_pkg.py -add3prf quiche
Change-Id: Ic04ef42f349879be18a4307bd863288dfa81b5fc
2022-08-10 15:29:24 -07:00
Inseob Kim
99b62ffe4e
Merge "Add multitree sample build script" am: ea3c580c00
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2179374
Change-Id: Id12670ebc9c220d5cb78e9b33fd348fe5e618982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-10 06:34:40 +00:00
Inseob Kim
ea3c580c00
Merge "Add multitree sample build script"
2022-08-10 06:14:39 +00:00
Inseob Kim
2a458f6d14
Add multitree sample build script
...
Bug: 233327677
Test: manual
Change-Id: Ia83982911606a8cd8fb43d3bce211d5450d2997b
2022-08-10 11:33:26 +09:00
Treehugger Robot
fc8e1abc67
Merge "Fix the incorrect prebuilts-info in aosp-master-boot" am: 9428c27824
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2168326
Change-Id: Ida5e332f83e60d6f3c427e4c85718a031f2b76b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-02 08:08:07 +00:00
Treehugger Robot
9428c27824
Merge "Fix the incorrect prebuilts-info in aosp-master-boot"
2022-08-02 07:44:25 +00:00
Howard Chen
8013679744
Fix the incorrect prebuilts-info in aosp-master-boot
...
Bug: 241050793
Test: \
development/gsi/build_with_kernel/repack_kernels.sh aarch64 \
development/gsi/build_with_kernel/update_kernel_prebuilts_510_arm64.sh \
development/gsi/build_with_kernel/update_kernel_prebuilts_515_arm64.sh \
build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=gki_arm64 TARGET_BUILD_VARIANT=user DIST_DIR=%dist_dir% droid dist \
development/gsi/build_with_kernel/kernel_info_to_dist.sh aarch64
Change-Id: I6ee2e6a5dfbc4e3105bfcdf7191dd306edb59b4c
2022-08-02 14:28:18 +08:00
Treehugger Robot
3d35ced879
Merge "Fix license_collector" am: e32fd5baaa
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2168323
Change-Id: I93e1094c97f7f8fc278be876d2b35a68660e9dee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-29 07:46:24 +00:00
Treehugger Robot
e32fd5baaa
Merge "Fix license_collector"
2022-07-29 07:21:46 +00:00
Justin Yun
1bd0e29bc8
Fix license_collector
...
This fixes a bug for the VNDK license collector that fails to get the
license kinds when a path is given.
Bug: 192434786
Test: python3 development/vndk/snapshot/gen_buildfiles.py -vv 29
Change-Id: I101b08b97cfc1229f4e0c67fa66341d4b49fa201
2022-07-29 06:33:43 +00:00
Frederick Mayle
941ee91b23
Merge "cargo2android: Fix edge case in --add_workspace feature" am: 4b4779ae81
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2166722
Change-Id: I34dc1145ba925dfedd031755615f6926323a6cc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-28 22:17:30 +00:00
Frederick Mayle
4b4779ae81
Merge "cargo2android: Fix edge case in --add_workspace feature"
2022-07-28 21:54:59 +00:00
Frederick Mayle
71722b10e5
cargo2android: Fix edge case in --add_workspace feature
...
If the last line of a Cargo.toml was a `[*]`, then appending
`[workspace]` without newlines would result in an invalid toml file.
external/crosvm/tracing/Cargo.toml is an example.
Test: ran on crosvm
Change-Id: Ib949e7f92d0205b1bc6433d1e231924832ddb536
2022-07-27 00:13:52 +00:00
Treehugger Robot
5fcc737b41
Merge "Set ALLOW_UNKNOWN_WARNING_OPTION" am: 5a5aa3357a
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2161662
Change-Id: If7f0dd37bed7d027c3aecee9c20fd3426de8b8b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-21 22:29:58 +00:00
Treehugger Robot
5a5aa3357a
Merge "Set ALLOW_UNKNOWN_WARNING_OPTION"
2022-07-21 12:23:28 +00:00
Yi Kong
7549a9f9a6
Set ALLOW_UNKNOWN_WARNING_OPTION
...
header-checker build may use an older version of clang than the platform
version, causing errors for unknown cflags. Setting the env var allows
these errors to be suppressed.
Test: presubmit
Change-Id: Icf08ec5913f5608ffc1e14daf3e6ed71610f733a
2022-07-21 17:45:07 +08:00
Steven Moreland
d3e6c8e283
Merge "Create a module for create_reference_dumps.py" am: ba781b8eac
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2157919
Change-Id: I3032e52c529a9661ff5da8e60a2b9b60b4572839
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-19 16:02:08 +00:00
Steven Moreland
ba781b8eac
Merge "Create a module for create_reference_dumps.py"
2022-07-19 15:43:53 +00:00
Treehugger Robot
eeba035377
Merge "Exclude list may have comment" am: 71caa549f3
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2158136
Change-Id: Ifc39a4719c6c1ea0c5589ec46ae7babf1479f98f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-19 07:01:48 +00:00
Treehugger Robot
71caa549f3
Merge "Exclude list may have comment"
2022-07-19 06:44:43 +00:00
Justin Yun
b2143bf4dc
Exclude list may have comment
...
With this change the exclude list file may have comments that start
with '#'
Test: Run collect_ninja_inputs.py with excluded file list that has
'#' comments
Change-Id: Ic2e3da8a34144426e00ebd45ee09ff9cb3b339bd
2022-07-19 14:31:44 +09:00
Treehugger Robot
cf1bb77660
Merge "repo_pull: Attempt to fetch via ssh first" am: 4a2aacdeed
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2128416
Change-Id: I258f742d4f9cbc209488e343378c74fbb7555fd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-18 10:07:40 +00:00
Treehugger Robot
4a2aacdeed
Merge "repo_pull: Attempt to fetch via ssh first"
2022-07-18 09:48:02 +00:00
Hsin-Yi Chen
f4f89e7224
Create a module for create_reference_dumps.py
...
The module is a host python binary with embedded launcher. It is
independent of the python runtime installed on the OS.
Test: m create_reference_dumps && \
create_reference_dumps -products aosp_x86_64 -libs libc
Bug: 238984913
Change-Id: Ie84ef5c78cec978f83a2bddb370978fb962de4bd
2022-07-18 16:58:10 +08:00
Mu-Le Lee
00e22d110d
Merge changes If1ccc3d9,I198bf3e1,I0d903c16 am: a12115812c
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2152453
Change-Id: I8587548ab48c84f4cd5bd5a6f3eb71f656738a2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 16:47:02 +00:00
Mu-Le Lee
a12115812c
Merge changes If1ccc3d9,I198bf3e1,I0d903c16
...
* changes:
Refactor GetRefDumpDirStem to avoid excessive arguments passing
Generate dumps for non-VNDK into folder that matches Cross-Version ABI Check mechanism
Generate LLNDK ABI dumps to platform/ instead of vndk/
2022-07-15 16:25:59 +00:00
Mu-Le Lee
aee4dbfae4
Refactor GetRefDumpDirStem to avoid excessive arguments passing
...
The arguments required by function get_ref_dump_dir_stem() would be
carried all the way to get_ref_dump_dir_stem(). In this CL, the logic
of get_ref_dump_dir_stem() would be wrapped into a class so that the
other functions can be cleaner.
Test: $ANDROID_BUILD_TOP/development/vndk/tools/header-checker/utils/create_reference_dumps.py --llndk -l libvndksupport -l libbinder_ndk -l libprocinfo
Bug: 238828401
Change-Id: If1ccc3d9de0408c5e1ef252412630df341d38e14
2022-07-15 05:45:22 +00:00
Bob Badour
ff216057d4
Merge "Replace obsolete notice property with licenses" am: b30de650ff
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2154890
Change-Id: I2ee473d8a4db6d1196869c7c51cb7d82343a0589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 03:21:20 +00:00
Bob Badour
b30de650ff
Merge "Replace obsolete notice property with licenses"
2022-07-15 03:00:01 +00:00
Bob Badour
4669788a83
Replace obsolete notice property with licenses
...
Generate `license {}` modules instead of `filegroup {}` modules.
Reference the generated `license {}` modules using the `licenses:`
property.
Bug: 192434786
Test: m droid dist
Change-Id: I894c37bba3edeeb9c6af86bee342a31c334d084c
2022-07-15 11:04:26 +09:00
Treehugger Robot
0709cb8a7b
Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: 4b914d2e0d
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2154415
Change-Id: I833e6c5ad0cce25e0a4f0f9fbe5aae2524ec5f69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 01:01:44 +00:00
Treehugger Robot
4b914d2e0d
Merge "[LSC] Add LOCAL_LICENSE_KINDS to development"
2022-07-15 00:41:57 +00:00
Bob Badour
49a787d725
[LSC] Add LOCAL_LICENSE_KINDS to development
...
Added SPDX-license-identifier-Apache-2.0 to:
apps/OBJViewer/Android.bp
samples/HeavyWeight/Android.bp
samples/MySampleRss/Android.bp
tools/ninja_dependency_analysis/Android.bp
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Change-Id: Ic4627f424a3ecfbe65145268242a37f373c05a01
2022-07-14 11:08:07 -07:00
Mu-Le Lee
ec18592802
Generate dumps for non-VNDK into folder that matches Cross-Version ABI Check mechanism
...
The dumps of non-VNDK was generated to PLATFORM_SDK_VERSION. To enable
the Cross-Version ABI Check, before finalization (when
PLATFORM_VERSION_CODENAME is not REL), dumps should be generate to
current/ no matter what PLATFORM_SDK_VERSION is; After finalization,
dumps should be generate to PLATFORM_SDK_VERSION/.
Test: $ANDROID_BUILD_TOP/development/vndk/tools/header-checker/utils/create_reference_dumps.py \
--llndk -l libvndksupport -l libbinder_ndk -l libprocinfo
Bug: 238573414
Change-Id: I198bf3e1fb1382a9378dcde16deb9262f0eb9f64
2022-07-14 09:46:38 +00:00
Luca Stefani
396466344b
repo_pull: Attempt to fetch via ssh first
...
This is usually preferred if supported by the server
Change-Id: Ie15df0231a679d55ba1adfd7e7d86f4999828e27
2022-07-12 13:02:59 +00:00
Isaac Chen
bbd4d7988f
Merge "Update Android 13 GKI KMI symbol files and test" am: 125a88be13
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2150894
Change-Id: I63fc62b7a53c79fb6aa38747bac3ee4d54e25cae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 09:04:11 +00:00
Isaac Chen
125a88be13
Merge "Update Android 13 GKI KMI symbol files and test"
2022-07-12 08:45:16 +00:00
Isaac Chen
146bf2790d
Update Android 13 GKI KMI symbol files and test
...
This change removes Android 12 GKI 5.4 and 5.10 kernel symbol files,
and adds kernel symbol files for the first public release of
Android 13 GKI 5.10 and 5.15, against which the future kernel symbol
files can be cheked to make sure GKI KMI compatibility.
Bug: 238597473
Test: $ lunch aosp_arm64-userdebug
$ m a13_kmi_compatibility_test
Change-Id: I3b0eb7af36dd4a4174d4031735428a089278565a
2022-07-12 14:59:15 +08:00
Mu-Le Lee
1a4fb95440
Generate LLNDK ABI dumps to platform/ instead of vndk/
...
Since vndk libraries don't need to maintain Cross-Version abi
compatibility. The newly proposed Cross-Version ABi checking mechanism
is applied to only ndk/ and platform/. The dumps of LLNDK libraries
should be generated to platform/ to be benefited from this checking
mechanism.
Test: $ANDROID_BUILD_TOP/development/vndk/tools/header-checker/utils/create_reference_dumps.py \
--llndk -l libvndksupport
Bug: 238383972
Change-Id: I0d903c16eecfd57001a539c14bd4d6945c148e3c
2022-07-09 06:13:33 +00:00
Treehugger Robot
af31f40f98
Merge "Ninja dependency analysis tool" am: 58776972a8
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2146699
Change-Id: Iadd71e7ed10730884ee410729bc07c2b3c6359dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-08 06:21:40 +00:00
Treehugger Robot
58776972a8
Merge "Ninja dependency analysis tool"
2022-07-08 06:00:41 +00:00
Jeongik Cha
1408cdc5e6
Ninja dependency analysis tool
...
The tool collects every input file for target except exempted_files.
And also, it counts input files per each project.
Bug: 238156000
Test: collect_ninja_inputs \
-n prebuilts/build-tools/linux-x86/bin/ninja \
-f out/combined-aosp_cf_x86_64_phone.ninja \
-t vendorimage \
-e exempted_files \
-r .repo/project.list
Change-Id: I19b8b3462a1f1766babe4d437fe71bd7eb4bc7d2
2022-07-08 01:28:37 +00:00
Hsin-Yi Chen
ae48bf1087
Merge "Remove MIPS data from ABI unit tests" am: cd2a609c4e
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2147663
Change-Id: Ic054d06952f07ad9d5de4129f665a998f23566c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-07 09:35:30 +00:00
Hsin-Yi Chen
cd2a609c4e
Merge "Remove MIPS data from ABI unit tests"
2022-07-07 09:11:48 +00:00
Jeffrey Vander Stoep
a0ff5279d6
Merge "Revert "c2a: add option to use Cargo.toml.orig"" am: 3a293c7bba
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2146900
Change-Id: Iaee11cd935a712fe5acec4de29aad42c7b76f8ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-07 08:46:48 +00:00
Jeffrey Vander Stoep
3a293c7bba
Merge "Revert "c2a: add option to use Cargo.toml.orig""
2022-07-07 08:24:42 +00:00
Hsin-Yi Chen
a923b62fe5
Remove MIPS data from ABI unit tests
...
Test: PATH=$PATH:$ANDROID_BUILD_TOP/out/soong/dist/bin \
development/vndk/tools/header-checker/tests/test.py
Bug: 237966264
Change-Id: If6c7e0fe297f384a703f0a45727618518062363e
2022-07-07 11:01:42 +08:00
Hsin-Yi Chen
232ac91360
Merge "Generate only the necessary data for ABI unit tests" am: bd1460dca5
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2145588
Change-Id: I43695a24b948c096112f22a059af897937feaa83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-07 02:55:48 +00:00