Commit Graph

33072 Commits

Author SHA1 Message Date
Xin Li
1f110f2cf3 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours am: 7f7c44d6ca -s ours
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2186582

Change-Id: I6dccdba8809fa18c842ed89e1dbec9865b021e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:00:20 +00:00
Xin Li
c01cc4e72e [automerger skipped] DO NOT MERGE - Merge Android 13 am: aa167d631e -s ours am: f2ea94b3a9 -s ours
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2186582

Change-Id: If81c8b32b8ee865e8f6276e15d5aa91d0ecc66c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:59:49 +00:00
Xin Li
7f7c44d6ca [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2186582

Change-Id: Iae99cc2ad02a8eaf997200f93de1f4525afa2d44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:37:51 +00:00
Xin Li
f2ea94b3a9 [automerger skipped] DO NOT MERGE - Merge Android 13 am: aa167d631e -s ours
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2186582

Change-Id: I2725c3ee80866631a44553f9859e484509d34033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:37:20 +00:00
Xin Li
4ce806fe1b Merge "DO NOT MERGE - Merge Android 13" 2022-08-16 19:08:16 +00:00
Treehugger Robot
ae366e4eb9 Merge "Bumping package version number for T. Test: treehugger Bug: 242625850" am: ddbf515da8 am: 39d748b0ae
Original change: https://android-review.googlesource.com/c/platform/development/+/2186580

Change-Id: I11174122c13ac60b2c031d1b13fccda2b0450c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 05:50:20 +00:00
Treehugger Robot
39d748b0ae Merge "Bumping package version number for T. Test: treehugger Bug: 242625850" am: ddbf515da8
Original change: https://android-review.googlesource.com/c/platform/development/+/2186580

Change-Id: I4fc8a98e2ca40e081cbdd77e43631ce5ea7fe9ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 05:04:00 +00:00
Xin Li
aa167d631e DO NOT MERGE - Merge Android 13
Bug: 242648940
Merged-In: Ib270c83d4f18dc7e301667733df8952f83581116
Change-Id: I196fa21c8487e0f57ab3d8a4761e149fe407f083
2022-08-15 21:59:27 -07:00
Treehugger Robot
ddbf515da8 Merge "Bumping package version number for T. Test: treehugger Bug: 242625850" 2022-08-16 04:36:55 +00:00
Shaju Mathew
6e77cfb32b Bumping package version number for T.
Test: treehugger
Bug: 242625850

Signed-off-by: Shaju Mathew <shaju@google.com>
Change-Id: I5f52e907afdbfed6943f97e11c612e1efbd244d1
2022-08-16 02:57:18 +00:00
Inseob Kim
7da36aa8a4 Merge "Export vendor.img and ninja analysis results" am: de0317677b am: 34f24fd47e
Original change: https://android-review.googlesource.com/c/platform/development/+/2183577

Change-Id: Id769354e5e50f2ed938414ed5e884342bdba2011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 05:24:08 +00:00
Inseob Kim
34f24fd47e Merge "Export vendor.img and ninja analysis results" am: de0317677b
Original change: https://android-review.googlesource.com/c/platform/development/+/2183577

Change-Id: I4434820f626afe78b56a15d678d16d7bc1c5486f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 05:03:53 +00:00
Inseob Kim
de0317677b Merge "Export vendor.img and ninja analysis results" 2022-08-12 04:35:18 +00:00
Inseob Kim
28092bd22e Export vendor.img and ninja analysis results
Test: manual
Change-Id: Ib270c83d4f18dc7e301667733df8952f83581116
2022-08-12 10:56:51 +09:00
Matthew Maurer
9d224221ac Merge "rust: addr3prf: Support COPYING files" am: a2fff95476 am: 5584fd7393
Original change: https://android-review.googlesource.com/c/platform/development/+/2182815

Change-Id: I650241724545ea11134a88239691e89f306650bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 17:32:41 +00:00
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
d2c7c791b3 Merge "Add multitree sample build script" am: ea3c580c00 am: 99b62ffe4e
Original change: https://android-review.googlesource.com/c/platform/development/+/2179374

Change-Id: I5ecd9ca7059936d9eff95da6d0839d5ee3ab9ef4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 07:14:16 +00: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
94092b5c2a Merge "Fix the incorrect prebuilts-info in aosp-master-boot" am: 9428c27824 am: fc8e1abc67
Original change: https://android-review.googlesource.com/c/platform/development/+/2168326

Change-Id: Ibba4c0028ffe5732b2f038f891fcee9c038e4745
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 08:27:53 +00: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
7012f00472 Merge "Fix license_collector" am: e32fd5baaa am: 3d35ced879
Original change: https://android-review.googlesource.com/c/platform/development/+/2168323

Change-Id: I0e5677ed10b3f855284f6e25278a26951b0d4968
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 08:42:40 +00: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
7aecb879d9 Merge "cargo2android: Fix edge case in --add_workspace feature" am: 4b4779ae81 am: 941ee91b23
Original change: https://android-review.googlesource.com/c/platform/development/+/2166722

Change-Id: I94b339eaa0477a4fb2e45a5b1cd5d907dee671b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 22:44:58 +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
91dd2e97b3 Merge "Set ALLOW_UNKNOWN_WARNING_OPTION" am: 5a5aa3357a am: 5fcc737b41
Original change: https://android-review.googlesource.com/c/platform/development/+/2161662

Change-Id: Id9e696ee18172f72b8bac57837c683fdcb548b15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 23:00:36 +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
42c106c5a0 Merge "Create a module for create_reference_dumps.py" am: ba781b8eac am: d3e6c8e283
Original change: https://android-review.googlesource.com/c/platform/development/+/2157919

Change-Id: I28356f4679625721f28afc46944daa3de5b19064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 16:28:08 +00: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
daa7ed2846 Merge "Exclude list may have comment" am: 71caa549f3 am: eeba035377
Original change: https://android-review.googlesource.com/c/platform/development/+/2158136

Change-Id: Ifcaabd6a1741d8d1324e60beada2f219ba334924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 07:27:40 +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
0fb346cb84 Merge "repo_pull: Attempt to fetch via ssh first" am: 4a2aacdeed am: cf1bb77660
Original change: https://android-review.googlesource.com/c/platform/development/+/2128416

Change-Id: I4631dc39a7094d7b761f06f7cc134e67809c68d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-18 10:33:37 +00: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
10827f8a1d Merge changes If1ccc3d9,I198bf3e1,I0d903c16 am: a12115812c am: 00e22d110d
Original change: https://android-review.googlesource.com/c/platform/development/+/2152453

Change-Id: I9bb847ae5ccd95c14cd92f24eac7b130805abe77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 17:12:52 +00:00