Commit Graph

97137 Commits

Author SHA1 Message Date
Kelvin Zhang
094641230e Merge "Revert "Fix retrofit OTA generation failures"" into main am: e41c75cb83
Original change: https://android-review.googlesource.com/c/platform/build/+/3079786

Change-Id: I4412735014ebb52f7bee6a10c3f29a9a153d1ac3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 21:00:30 +00:00
Kelvin Zhang
e41c75cb83 Merge "Revert "Fix retrofit OTA generation failures"" into main 2024-05-08 20:37:41 +00:00
Kelvin Zhang
681597df18 Revert "Fix retrofit OTA generation failures"
This reverts commit 7af14aa7da.

Reason for revert: b/339483257

Change-Id: I86cf6c0baed8697ace888135b3d66b4785d22aa5
2024-05-08 20:10:22 +00:00
Dennis Shen
3807c32bff Merge "aconfig: make MutableMappedStorageFiles inherit MappedStoargeFiles" into main am: 015de62d7a
Original change: https://android-review.googlesource.com/c/platform/build/+/3077003

Change-Id: I1061ef4129c236572f51b89e3596f805e86ea3de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 19:23:02 +00:00
Dennis Shen
015de62d7a Merge "aconfig: make MutableMappedStorageFiles inherit MappedStoargeFiles" into main 2024-05-08 18:55:00 +00:00
Treehugger Robot
0ea0bb5249 Merge "Fix retrofit OTA generation failures" into main am: 9a78be4d42
Original change: https://android-review.googlesource.com/c/platform/build/+/3079783

Change-Id: I5696ce46f677bad2a9b1a5c182a7e84d2f814d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 17:59:09 +00:00
Treehugger Robot
9a78be4d42 Merge "Fix retrofit OTA generation failures" into main 2024-05-08 17:35:43 +00:00
Kelvin Zhang
7af14aa7da Fix retrofit OTA generation failures
retrofit OTA generation relies on files in OTA/* , include these
files when copying target_files dir to tmp location.

Test: th
Bug: 337043530
Fixes: 337043530
Change-Id: I8fd7729bc1b2d2797f7e76f594b06fd9675fa104
2024-05-08 09:28:40 -07:00
Wei Li
25974b6f62 Merge "Add license metadata declarations which are moved from device/google/redfin/Android.mk." into main am: 32b652fd68
Original change: https://android-review.googlesource.com/c/platform/build/+/3078028

Change-Id: I296682f020d5c8c8d547cff694060f9af48ca5aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 04:11:45 +00:00
Wei Li
32b652fd68 Merge "Add license metadata declarations which are moved from device/google/redfin/Android.mk." into main 2024-05-08 03:55:58 +00:00
Treehugger Robot
6e3350dbd7 Merge "Revert^2 "Remove obsolete java compilation artifacts"" into main am: 291bcf4f37
Original change: https://android-review.googlesource.com/c/platform/build/+/3078030

Change-Id: Ifd11e0bfeeae4a407747275b9e73a615e50a003f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 03:15:30 +00:00
Treehugger Robot
291bcf4f37 Merge "Revert^2 "Remove obsolete java compilation artifacts"" into main 2024-05-08 02:41:09 +00:00
Jihoon Kang
d01ea714e2 Revert^2 "Remove obsolete java compilation artifacts"
This reverts commit 132fceec4c.

Reason for revert: CleanSpec.mk files are not meant to be reverted.

Change-Id: I72ad8d1b610f67525c905634f77b4d12849dbe30
2024-05-08 01:01:12 +00:00
Treehugger Robot
e0b7bb7ebb Merge "Update BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE documentation" into main am: 5b99bc00a0
Original change: https://android-review.googlesource.com/c/platform/build/+/3077369

Change-Id: I71434fab1ddf3ef96cec70c36fb1af646f80bcc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 00:20:04 +00:00
Treehugger Robot
e20a49ff62 Merge "Remove the ANDROID_ENABLE_TOOL_LOGGING environment variable" into main am: 2bab653d64
Original change: https://android-review.googlesource.com/c/platform/build/+/3078026

Change-Id: I647369e4115f9828c10c5bb77250b628ac2492e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 00:19:25 +00:00
Treehugger Robot
5b99bc00a0 Merge "Update BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE documentation" into main 2024-05-08 00:03:03 +00:00
Treehugger Robot
2bab653d64 Merge "Remove the ANDROID_ENABLE_TOOL_LOGGING environment variable" into main 2024-05-07 23:55:42 +00:00
Wei Li
93e946dfae Add license metadata declarations which are moved from device/google/redfin/Android.mk.
Bug: 311544087
Test: CIs
Change-Id: I3d98e813e998e35177e16c12ff5a5298f79a7fcc
2024-05-07 16:38:26 -07:00
Spandan Das
e4a3e9ee5a Update BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE documentation
With trunk stable, we no longer have multiple development branches, and
this flag is no longer in use.

Test: N/A (documentation change)
Bug: 308188056
Change-Id: Icdaddde9d107de9a453106cae35645b7e6cc21e9
2024-05-07 22:56:45 +00:00
Zhuoyao Zhang
ef1c03f997 Remove the ANDROID_ENABLE_TOOL_LOGGING environment variable
Reduce the number of variables required to toggle logging. This simplifies configuration and usage.

Test: atest run_tool_with_logging_test
Bug: 331638854
Change-Id: I6f2a820b59a0d1f45aba9ffb3e33e7ace601e9c6
2024-05-07 22:51:51 +00:00
Treehugger Robot
77968e3779 Merge "Building mainline modules from source is now the default" into main am: cf7dd64339
Original change: https://android-review.googlesource.com/c/platform/build/+/3073489

Change-Id: I92a18ef6c8a719e0760cdf50133b5c1d7c160fc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 22:43:42 +00:00
Treehugger Robot
cf7dd64339 Merge "Building mainline modules from source is now the default" into main 2024-05-07 22:25:02 +00:00
Steven Moreland
b3e3c3d26c Merge "16k: Enable 16k ELF alignment on all mainline modules" into main am: 43b6834425
Original change: https://android-review.googlesource.com/c/platform/build/+/3075963

Change-Id: I0a6011cc34c556aa61b94ada3b0af43d6212f037
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 21:42:53 +00:00
Steven Moreland
43b6834425 Merge "16k: Enable 16k ELF alignment on all mainline modules" into main 2024-05-07 21:17:27 +00:00
Dennis Shen
d772eb3edc aconfig: make MutableMappedStorageFiles inherit MappedStoargeFiles
Bug: b/321077378
Test: atest -c
Change-Id: Ib052df74bf79b5bc2a0f8c793701e3ff18f4aa30
2024-05-07 15:28:09 +00:00
Treehugger Robot
4b7f6e5c87 Merge "check-flagged-apis: consider superclasses when looking up symbol" into main am: 64dac049a6
Original change: https://android-review.googlesource.com/c/platform/build/+/3075497

Change-Id: Ie153f49524170ee92663080cfe3d003624ec5072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 14:21:17 +00:00
Treehugger Robot
64dac049a6 Merge "check-flagged-apis: consider superclasses when looking up symbol" into main 2024-05-07 14:18:20 +00:00
Dennis Shen
d557389eb1 Merge "aconfig: update storage file mapping api" into main am: 260663ddfc
Original change: https://android-review.googlesource.com/c/platform/build/+/3075404

Change-Id: I387e6348f22e8b66295cda36882bd90aeda743c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 14:14:33 +00:00
Dennis Shen
260663ddfc Merge "aconfig: update storage file mapping api" into main 2024-05-07 14:10:47 +00:00
Mårten Kongstad
a7ddcf32bc Merge "check-flagged-apis: record super class when parsing classes" into main am: 5413a1e55d
Original change: https://android-review.googlesource.com/c/platform/build/+/3075496

Change-Id: I7cec1f5e1c4f04ae395b3f05ee9efeaf89f46cc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 14:03:56 +00:00
Treehugger Robot
1947cceae4 Merge changes Ia6dfcfa8,I8d93c230,I4db7ff47,I003535c7,I8c0619fa into main am: 4925954a79
Original change: https://android-review.googlesource.com/c/platform/build/+/3075227

Change-Id: Ib6047a8e66cd9c868755c387fd8de3d146eff7fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 14:03:38 +00:00
Mårten Kongstad
5413a1e55d Merge "check-flagged-apis: record super class when parsing classes" into main 2024-05-07 13:52:21 +00:00
Treehugger Robot
4925954a79 Merge changes Ia6dfcfa8,I8d93c230,I4db7ff47,I003535c7,I8c0619fa into main
* changes:
  check-flagged-apis: consider interfaces when looking up symbol
  check-flagged-apis: skip self-referential interfaces
  check-flagged-apis: record interfaces when parsing classes
  check-flagged-apis: add more details to Symbol class
  check-flagged-apis: api-versions.xml: correctly parse nested class ctor
2024-05-07 13:42:25 +00:00
Mårten Kongstad
e812039036 check-flagged-apis: consider superclasses when looking up symbol
If a symbol can't be found in a class, (recursively) check the class'
superclass before reporting the symbol as missing.

Bug: 334870672
Test: atest --host check-flagged-apis-test
Change-Id: I8ef1fbfcc51e0c5ba00959536c087213d688fe39
2024-05-07 13:28:54 +02:00
Mårten Kongstad
c3f05a6d92 check-flagged-apis: record super class when parsing classes
Extend ClassSymbol with a nullable reference to the class' superclass.

Bug: 334870672
Test: atest --host check-flagged-apis-test
Change-Id: Ia2741a4d7fb5de908a03ef640f5fcd38d0ce0e28
2024-05-07 13:28:53 +02:00
Mårten Kongstad
d2c707613e check-flagged-apis: consider interfaces when looking up symbol
When searching for potential errors, if a symbol can't be found in the
api-verions.xml data, check if it is present in any of the class'
interfaces.

A follow-up CL will add similar logic to handle super classes.

Bug: 334870672
Test: atest --host check-flagged-apis-test
Change-Id: Ia6dfcfa8495b89465db60f6a4eb77d304112046b
2024-05-07 13:28:53 +02:00
Mårten Kongstad
04d8b46c37 check-flagged-apis: skip self-referential interfaces
The return value of ClassItem.allInterfaces will sometimes include the
interface itself (e.g.
android.accessibilityservice.BrailleDisplayController). It is unclear
when this happens; it doesn't happen for the unit test.

Update the logic to record the interfaces for a class to filter out
interfaces named the same as the class.

Bug: 334870672
Test: atest --host check-flagged-apis-test
Test: croot && ./build/tools/check-flagged-apis/check-flagged-apis.sh
Change-Id: I8d93c230dfedde30e8d43fefd560a47944085d3a
2024-05-07 13:16:13 +02:00
Mårten Kongstad
7c3571fe8b check-flagged-apis: record interfaces when parsing classes
Extend ClassSymbol with a list of the interfaces that class implements.
This will be used in a follow-up CL to improve the logic that checks if
a class member exists in the api-versions.xml data.

Bug: 334870672
Test: atest --host check-flagged-apis-test
Change-Id: I4db7ff47c3ce40ca892cb872810dd559426dfcb8
2024-05-07 13:16:13 +02:00
Mårten Kongstad
a1fe37137e check-flagged-apis: add more details to Symbol class
Change Symbol from a wrapper around a String to a more fleshed out data
class; symbols now encode if they represent a class, or a class member
(including a reference to the containing class).

Bug: 334870672
Test: atest --host check-flagged-apis-test
Test: croot && ./build/tools/check-flagged-apis/check-flagged-apis.sh # with and without this CL; the output should be the same
Change-Id: I003535c721c45d559d00fb3e008325e1db0e18c0
2024-05-07 13:16:13 +02:00
Mårten Kongstad
02525a88de check-flagged-apis: api-versions.xml: correctly parse nested class ctor
The constructor of a nested class is represented as follows in
api-versions.xml:

  <class name="android/Clazz$Foo$Bar" since="1">
    <method name="&lt;init>()V"/>
  </class>

The nested dollar signs are not replaced by forward slashes before the
parsing logic uses `split("/")` to find the name of the inner-most
class, incorrectly resulting in `Class$Foo$Bar` instead of `Bar`. Fix
this by immediately replacing dollar signs with forward slashes after
extracting the package and class.

Also clean up the following call of `Symbol.create`.

Bug: 334870672
Test: atest --host check-flagged-apis-test
Change-Id: I8c0619faae90ded7eb14dcc20ecb94a086a1c764
2024-05-07 13:16:13 +02:00
Wei Li
fa4f83ea9f Merge "Add license metadata declarations which are moved from device/google/barbet/Android.mk." into main am: f9ce18b5c8
Original change: https://android-review.googlesource.com/c/platform/build/+/3073447

Change-Id: If3b2b0569265513df94cc90e211d7b38be53f3f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 08:44:34 +00:00
Wei Li
f9ce18b5c8 Merge "Add license metadata declarations which are moved from device/google/barbet/Android.mk." into main 2024-05-07 08:26:35 +00:00
Jiyong Park
2811a2bb5c Merge "Move fs_config_[files|dirs]_<partition> to soong" into main am: 0a5b852656
Original change: https://android-review.googlesource.com/c/platform/build/+/3074045

Change-Id: I5112027e0303b0a564e87817a729bee445346490
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 02:43:28 +00:00
Jiyong Park
0a5b852656 Merge "Move fs_config_[files|dirs]_<partition> to soong" into main 2024-05-07 02:17:23 +00:00
Jooyung Han
362fe02d26 Merge "Remove unused testdata" into main am: 5548c31901
Original change: https://android-review.googlesource.com/c/platform/build/+/3074044

Change-Id: I8c2262daad4dde71d13cf49c660785ea376ff091
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 01:56:20 +00:00
Jooyung Han
5548c31901 Merge "Remove unused testdata" into main 2024-05-07 01:37:05 +00:00
Jihoon Kang
73b0456af9 Merge "Revert "Remove obsolete java compilation artifacts"" into main am: 14a9a7038f
Original change: https://android-review.googlesource.com/c/platform/build/+/3074637

Change-Id: Ib55056a615b0e751d0cc3e599bcdb6d4461636a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 00:24:51 +00:00
Jihoon Kang
14a9a7038f Merge "Revert "Remove obsolete java compilation artifacts"" into main 2024-05-07 00:03:05 +00:00
Jiyong Park
8d6481b92c Move fs_config_[files|dirs]_<partition> to soong
Note that not all partitions are moved to Soong. Soong doesn't yet
support *_dlkm partitions and the oem partition.

This change also removes dead code for support VNDK snapshot.

Finally, as a minor clean up, the leading '_' is dropped from the module
names _fs_config_*. There's no need to hide the module names.

Bug: 337993745
Test: m
Change-Id: I5beec5c6734291b9361f870fc1a8dba19def062e
2024-05-07 08:50:10 +09:00
Jihoon Kang
132fceec4c Revert "Remove obsolete java compilation artifacts"
Revert submission 3070882-sdk_lib_remove_compilation

Reason for revert: Potential culprit for build breakage of barbet-ap2a-userdebug in git_main

Reverted changes: /q/submissionid:3070882-sdk_lib_remove_compilation

Change-Id: I53b229137a8ba45e32209dbe69ab0cf698084377
2024-05-06 22:40:24 +00:00