LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,003 Commits 2 Branches 0 Tags
ff216057d438d386adf2d20aecf300c6cf024f7b
Commit Graph

33003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Hsin-Yi Chen
bd1460dca5 Merge "Generate only the necessary data for ABI unit tests" 2022-07-07 02:41:36 +00:00
Jeffrey Vander Stoep
6529bcaf6a Revert "c2a: add option to use Cargo.toml.orig" 
This reverts commit 2adbd7ed89.

Reason for revert: This doesn't work in all cases. For now I'll
instead use local patches for Cargo.toml :(

Change-Id: I0621796e694e2654a01fe9a38a307fd0a4ab8b15
 2022-07-06 12:34:37 +00:00
Hsin-Yi Chen
c1965c3600 Generate only the necessary data for ABI unit tests 
This commit configures "has_reference_dump" for the modules in ABI unit
tests. gen_all.py refers to the flag to creates reference dumps.

Test: PATH=$PATH:$ANDROID_BUILD_TOP/out/soong/dist/bin \
      development/vndk/tools/header-checker/tests/gen_all.py
Test: PATH=$PATH:$ANDROID_BUILD_TOP/out/soong/dist/bin \
      development/vndk/tools/header-checker/tests/test.py
Bug: 237966264
Change-Id: I35d5c43a20533cc71470b02919258dd883b40241
 2022-07-05 18:34:24 +08:00
Hsin-Yi Chen
32b7f690af Merge "Remove -suppress-errors from header-abi-dumper" am: 871a22ffae 
Original change: https://android-review.googlesource.com/c/platform/development/+/2145581

Change-Id: Ia0344d169b8c67350658784e1bfbfd4c0cdba835
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 08:35:09 +00:00
Hsin-Yi Chen
871a22ffae Merge "Remove -suppress-errors from header-abi-dumper" 2022-07-05 08:11:35 +00:00
Hsin-Yi Chen
93be04bf1f Remove -suppress-errors from header-abi-dumper 
The purpose of the option was to parse individual header files. It's not
an effective solution to the headers that are not self-contained.

Test: PATH=$PATH:$ANDROID_BUILD_TOP/out/soong/dist/bin \
      development/vndk/tools/header-checker/tests/test.py
Bug: 237966264
Change-Id: Id7321d7feb0bb28f6e0da39bc9d6a4348e038149
 2022-07-05 11:33:38 +08:00
Mu-Le Lee
cff9bcf5ae Merge "Create a cli option to build only the specified target rather than the whole package." am: 59b0ddfffd 
Original change: https://android-review.googlesource.com/c/platform/development/+/2136832

Change-Id: I3db3e75ee1620e5cbf539966b0cddef35c7838cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-01 05:04:11 +00:00
Mu-Le Lee
59b0ddfffd Merge "Create a cli option to build only the specified target rather than the whole package." 2022-07-01 04:36:57 +00:00
Mu-Le Lee
83c7085316 Create a cli option to build only the specified target rather than the whole package. 
Test: OUT_DIR=out development/vndk/tools/header-checker/android/build-prebuilts.sh \
      header-abi-dumper header-abi-linker
Bug: 237229904
Change-Id: I2f52ac39201a50f081c8393528ad9dc8e953a556
 2022-07-01 02:43:24 +00:00
Xin Li
33c6138be7 Merge tm-dev-plus-aosp-without-vendor@8763363 
Bug: 236760014
Merged-In: I794bcb9e9c922c642c3fbf0808fb60de4445ab65
Change-Id: Id292c36692b0020d772dc61b863f9cd3b39fe0c5
 2022-06-27 23:37:25 +00:00
Mu-Le Lee
54447f3246 Merge "Remove location information of unnamed elements in dumps to avoid automerge conflict." am: aa22b20007 
Original change: https://android-review.googlesource.com/c/platform/development/+/2136214

Change-Id: I84fe081ed2177c8ad2c05c742083c8f5f2133d6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 06:06:01 +00:00
Mu-Le Lee
aa22b20007 Merge "Remove location information of unnamed elements in dumps to avoid automerge conflict." 2022-06-27 05:25:47 +00:00
Mu-Le Lee
b55856ae03 Remove location information of unnamed elements in dumps to avoid automerge conflict. 
Test: ANDROID_BUILD_TOP=`realpath .` \
      PATH=$PATH:`realpath out/soong/dist/bin`:`realpath out/soong/host/linux-x86/bin` \
      development/vndk/tools/header-checker/tests/test.py
Bug: 236800109
Change-Id: I811d9508166f11f7e69ccbc554bcac8b1f122be6
 2022-06-27 03:48:03 +00:00
Treehugger Robot
8a02c886f1 Merge "c2a: add option to use Cargo.toml.orig" am: 1da99cc99e 
Original change: https://android-review.googlesource.com/c/platform/development/+/2135133

Change-Id: Id4db0018932c7a2ac9784df08b2c15e4098dcb79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 19:15:53 +00:00
Anton Hansson
3a18655006 Merge "Dist merged system annotation zip" am: 6c8cfa3386 
Original change: https://android-review.googlesource.com/c/platform/development/+/2135132

Change-Id: Id5feedb84b5be4969f11aa734c82f6b310dc0791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 19:13:47 +00:00
Treehugger Robot
1da99cc99e Merge "c2a: add option to use Cargo.toml.orig" 2022-06-23 15:34:41 +00:00
Anton Hansson
6c8cfa3386 Merge "Dist merged system annotation zip" 2022-06-23 15:07:10 +00:00
Jeff Vander Stoep
2adbd7ed89 c2a: add option to use Cargo.toml.orig 
`Cargo --publish` strips dev-dependencies from Cargo.toml, an issue
that won't be fixed until [1] is resolved, which doesn't seem
likely as it has been open for ~5 years now.

cargo2android needs dev-dependencies listed in Cargo.toml in order
to generate the rust_test in Android.bp, add an option that tells
cargo2android to use the cargo.toml.orig instead of the cargo.toml.

With this change there are now two options that temporarily
update Cargo.toml, so I've pulled these out into a separate class
to clean up the code a bit.

[1] https://github.com/rust-lang/cargo/issues/4242

Test: run against projects with --add_workspace and
--orig-cargo-toml

Change-Id: I3b8633a807c9734981ebde0bef9b73868acf6774
 2022-06-23 16:38:08 +02:00
Anton Hansson
8e63be9278 Dist merged system annotation zip 
The system-data/annotations.zip was previously generated
by the monolithic system sdk rule. Migrate it over to the
newly introduced modularized/merged target.

Bug: 235140934
Test: m sdk dist && ls out/dist/system-data | grep annotations
Change-Id: I1afc4ef7fdf87555adecdb11296bc07d25193ca2
 2022-06-23 10:14:39 +00:00
Treehugger Robot
3db273523f Merge "c2a: Automatically make crates APEX available" am: d0e21e93fb am: b30e1dae5b 
Original change: https://android-review.googlesource.com/c/platform/development/+/2128853

Change-Id: Ifcc25702cfb515b26d9c1b51761d0d14d5933aa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 20:00:51 +00:00
Treehugger Robot
b30e1dae5b Merge "c2a: Automatically make crates APEX available" am: d0e21e93fb 
Original change: https://android-review.googlesource.com/c/platform/development/+/2128853

Change-Id: Id74b1089aaf900cd193327e6714ceaf4125dc90e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 19:42:18 +00:00
Treehugger Robot
d0e21e93fb Merge "c2a: Automatically make crates APEX available" 2022-06-22 19:25:58 +00:00
Treehugger Robot
ea6cc3fbbb Merge "Update tests due to clang variable and struct naming changes." am: 8b3339921b am: 972cbb2a83 
Original change: https://android-review.googlesource.com/c/platform/development/+/2133256

Change-Id: Id38abf46ca6ddc06eca2dc4a69adb262486e12b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 08:45:52 +00:00
Treehugger Robot
972cbb2a83 Merge "Update tests due to clang variable and struct naming changes." am: 8b3339921b 
Original change: https://android-review.googlesource.com/c/platform/development/+/2133256

Change-Id: Id5ed56ed3d7f4431457d776499f010c53ed4daf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 08:29:09 +00:00
Treehugger Robot
8b3339921b Merge "Update tests due to clang variable and struct naming changes." 2022-06-22 07:58:27 +00:00
Mu-Le Lee
e5f137adf2 Update tests due to clang variable and struct naming changes. 
Test: ANDROID_BUILD_TOP=`realpath .` \
      PATH=$PATH:`realpath out/soong/dist/bin`:`realpath out/soong/host/linux-x86/bin` \
      development/vndk/tools/header-checker/tests/test.py
Bug: 236780777
Change-Id: I794bcb9e9c922c642c3fbf0808fb60de4445ab65
 2022-06-22 04:10:43 +00:00
Raju Kulkarni
d27810a4a1 Bump SDK revision number to ship an update with Beta 4 am: d16b8ab5ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/19014235

Change-Id: I062380a2ab0acbb661507df0b48ab50948c0334a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 20:59:02 +00:00
Raju Kulkarni
d16b8ab5ba Bump SDK revision number to ship an update with Beta 4 
Bug: 236727709
Change-Id: I89f73dab0430435ee5afd7bf64e80f55b6420630
Test: N/A
 2022-06-21 18:32:25 +00:00
Matthew Maurer
a9fb65d155 c2a: Automatically make crates APEX available 
The bulk of Rust packages in external/ are OS agnostic and do not care
about individual platform features. This change is intended to reduce
the churn of repeatedly adding new `apex_available` attributes to crates
by defaulting to availability. When landing a new crate which is either
platform revision specific or has an unstable file format, prefer to
set `apex_available: ["//apex_available:platform"]` until you have
thought things through.

Bug: 174862583
Test: Regenerate with no apex_available, see universal availability
Test: Regenerate with apex_available: [], see []
Test: Regenerate with apex_available: [foo], see [foo]
Change-Id: I958597789bfc966caec043d051996284dab7a927
 2022-06-16 13:07:12 -07:00
Elliott Hughes
9b084add6d [automerger skipped] Work around an lldb bug with "localhost". am: bc119c2898 -s ours 
am skip reason: Merged-In I3414201712ffe0f808899e2a2f206e813bb609a7 with SHA-1 fc6da790d9 is already in history

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

Change-Id: Ie2136abb47348b88d2d3f0be6841903d14f93fe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 00:06:32 +00:00
Elliott Hughes
bc119c2898 Work around an lldb bug with "localhost". 
Bug: http://b/234034124
Test: reputed to work
Change-Id: I3414201712ffe0f808899e2a2f206e813bb609a7
(cherry picked from commit fc6da790d9)
Merged-In: I3414201712ffe0f808899e2a2f206e813bb609a7
 2022-06-15 15:20:48 +00:00
Elliott Hughes
1f33349fdd Merge "Work around an lldb bug with "localhost"." am: d70c7045c1 am: 7497000703 
Original change: https://android-review.googlesource.com/c/platform/development/+/2125714

Change-Id: I471f1a99640521b57197fae35fae1dc98b9c1173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 15:11:14 +00:00