Commit Graph

33129 Commits

Author SHA1 Message Date
Treehugger Robot
eb009ffec1 Merge "Fix the incorrect prebuilts-info in aosp-master-boot" am: 9428c27824 am: fc8e1abc67 am: 94092b5c2a
Original change: https://android-review.googlesource.com/c/platform/development/+/2168326

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

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

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

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

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

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

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

Change-Id: Ibccf5cf7003b0a6a4b43ee68ef56ad179bfcd324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 17:35:21 +00: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
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
fff65eb610 Merge "Replace obsolete notice property with licenses" am: b30de650ff am: ff216057d4 am: ef43cfaadc
Original change: https://android-review.googlesource.com/c/platform/development/+/2154890

Change-Id: I3b505eb29921ac7e43937dfd3339ae07e5f9b224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 03:57:23 +00:00
Bob Badour
ef43cfaadc Merge "Replace obsolete notice property with licenses" am: b30de650ff am: ff216057d4
Original change: https://android-review.googlesource.com/c/platform/development/+/2154890

Change-Id: Iff0f32fce8a978ed1eaf5aee131021848d78dc4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 03:39:25 +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
0cdcbb640f Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: 4b914d2e0d am: 0709cb8a7b am: 4d0d1a8058
Original change: https://android-review.googlesource.com/c/platform/development/+/2154415

Change-Id: Ife7b41eb2c9a57b204af0feb46ca891769f894a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 01:57:09 +00:00
Treehugger Robot
4d0d1a8058 Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: 4b914d2e0d am: 0709cb8a7b
Original change: https://android-review.googlesource.com/c/platform/development/+/2154415

Change-Id: I7fee8afa5c86cd727624221ecdbbcd3713bd6b2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 01:20:50 +00: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