Commit graph

97030 commits

Author SHA1 Message Date
Cole Faust
5cba391313 Only consider EXTRA_INSTALL_ZIPS relevant by their primary file
Sometimes android_app_bundles exist in the tree but are not added
to PRODUCT_PACKAGES, in that case, they shouldn't be added to
file_list.txt.

We can tell if they're in PRODUCT_PACKAGES by if their primary file
is present in the list of files to install.

Bug: 337869220
Test: m out/target/product/emu64x/obj/PACKAGING/system_intermediates/file_list.txt and checking it for the extra NetworkStackGoogle apks, with a local NetworkStackGoogle android_app_set added into the tree
Change-Id: I22bcd9e972e1c9d5c7ddca788b9c6edc72f0a9dd
2024-05-10 12:41:10 -07:00
Treehugger Robot
8211cb24a5 Merge "Replace impl ToString with impl Display" into main 2024-05-10 18:32:41 +00:00
Jooyung Han
925f41a9f3 Add vintf for EDI collectors
EDI collectors like VintfDeviceInfo and VendorApexDeviceInfo need to
access to VINTF information. Instead of directly accessing related
files, we expose processed VINTF via /system/bin/vintf.

Bug: 336577802
Test: /system/bin/vintf
Change-Id: Id2b2e9b905bcb168638c60c2dc92ca550ed1558f
2024-05-10 16:07:43 +09:00
Treehugger Robot
db3606ddd8 Merge "Move sysprop assignments to separate mk file" into main 2024-05-10 01:26:40 +00:00
Cole Faust
441d1db5f9 Merge "Record contents of EXTRA_INSTALL_ZIPS files in file_list.txt" into main 2024-05-10 00:11:16 +00:00
Treehugger Robot
00732c7981 Merge "Avoid re-running kati unnecessarily." into main 2024-05-09 23:38:41 +00:00
LaMont Jones
3f0eba2bdc Avoid re-running kati unnecessarily.
Bug: 339707888
Test: manual
Change-Id: I0447a127aee7e5ef34d7ae81a3b8bead7c7bc95b
2024-05-09 15:33:01 -07:00
Chris Wailes
e6bb2e951d Replace impl ToString with impl Display
If the Display interface is implemented the compiler will automatically
derive an implementation of ToString.

Test: m aflags
Bug: 333887339
Change-Id: I861a3065edbef0da1684a6ea28cc374acd0d774a
2024-05-09 15:14:22 -07:00
Wei Li
a255e914d8 Add license metadata declarations which are moved from hardware/google/camera/Android.mk.
Bug: 339706722
Test: CIs
Change-Id: I67199d9603e4e398b624ec46de164d24491c48a8
2024-05-09 15:13:26 -07:00
Dennis Shen
9d21525b85 Merge "aconfig: add list_flag api cxx interlop" into main 2024-05-09 21:13:17 +00:00
Cole Faust
9feef379ff Record contents of EXTRA_INSTALL_ZIPS files in file_list.txt
The partitions will not include anything that's not in file_list.txt.

Zip files in EXTRA_INSTALL_ZIPS are extracted into the staging
directories when other files are installed. Their contents need to
be added to the file_list.txt so that their extracted files are not
ignored.

EXTRA_INSTALL_ZIPS is only used by android_app_set, which is only used
by partners, so this bug went unnoticed for a long time.

Bug: 337869220
Test: m droid and checked the contents of file_list.txt when adding an android_app_set locally
Change-Id: Ifa2f7168dbeedbb2308a481c0c78f28e874b0aef
2024-05-09 11:04:23 -07:00
Dennis Shen
e1949a6563 aconfig: add list_flag api cxx interlop
Bug: 312444587
Test: atest -c
Change-Id: I3e3bc511c370fbcdfa6dcf7942377dd9b544c647
2024-05-09 17:37:36 +00:00
Treehugger Robot
67c90ed1e9 Merge "Reland "Fix retrofit OTA generation failures"" into main 2024-05-09 16:54:09 +00:00
Treehugger Robot
5e32d41441 Merge "Exclude mcts tests from cts based on the env config" into main 2024-05-09 16:37:28 +00:00
Treehugger Robot
c0c2e5f278 Merge "Add a Java lib to read on-device proto paths" into main 2024-05-09 15:05:28 +00:00
Inseob Kim
85b83a90e1 Move sysprop assignments to separate mk file
core/sysprop_config.mk is added to separate code setting
ADDITIONAL_*_PROPERTIES variables. This should be a no-op for now but it
will help migrate build.prop generation to Soong.

Bug: 322090587
Test: compare build.prop files before and after
Change-Id: I57a1ae899865027bcadddc2071fcd2afcf2703bc
2024-05-09 17:38:46 +09:00
Yihan Dong
efb72f14b7 Exclude mcts tests from cts based on the env config
Test: make cts EXCLUDE_MCTS=true
Bug: 339554071
Change-Id: Ia81eab597993064f5edc722be6af70bcb143dcab
2024-05-09 13:09:47 +08:00
Kelvin Zhang
13f0b68a8f Reland "Fix retrofit OTA generation failures"
This reverts commit 681597df18.

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: Id9bb1cddcf992556923a17fd3f9b5e41eac7ca96
2024-05-08 18:14:41 -07:00
Treehugger Robot
a2357e90d7 Merge "Remove obsolete java compilation artifacts" into main 2024-05-08 22:28:05 +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
Ted Bauer
3cf7c0a2c0 Add a Java lib to read on-device proto paths
Bug: 337911453
Test: m aconfig_on_device_protos_java
Change-Id: Iac8d671acee070ed041927028ec80c7aa371bd61

Change-Id: I19e0e52d8de71207c9858305e6248b6251a20989
2024-05-08 16:05:00 -04:00
Dennis Shen
015de62d7a Merge "aconfig: make MutableMappedStorageFiles inherit MappedStoargeFiles" into main 2024-05-08 18:55:00 +00:00
Jihoon Kang
b09bead297 Remove obsolete java compilation artifacts
Please note that this is an addition on top of  https://r.android.com/3078030.

Test: TH
Bug: 332785297
Change-Id: I1ee21398c72d8ee152e569626868eea3716af1bd
2024-05-08 17:52:52 +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
Mårten Kongstad
0d44e721ed check-flagged-apis: handle nested flags
Consider

  @FlaggedApi(FLAG_OUTER) Clazz {
      @FlaggedApi(FLAG_INNER) method();
  }

If FLAG_OUTER is disabled, any class members are ignored. Teach
check-flagged-apis to recognize this and stop reporting false positives.

Bug: 339183637
Test: atest --host check-flagged-apis-test
Change-Id: Ie6799e952dc33874c1239231f841d7dfd947c7ce
2024-05-08 13:30:58 +02: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
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
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
cf7dd64339 Merge "Building mainline modules from source is now the default" into main 2024-05-07 22:25:02 +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
64dac049a6 Merge "check-flagged-apis: consider superclasses when looking up symbol" into main 2024-05-07 14:18:20 +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
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
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