Commit graph

96898 commits

Author SHA1 Message Date
Joe Onorato
b9ff8e4205 add csv output to format_benchmarks
Test: format_benchmarks --csv
Bug: 316189534
Change-Id: I9a19861ed1ca6249c6e6ddbed0fcf9574f871d93
2024-05-20 14:23:00 -07:00
Joe Onorato
143f9e0b72 Make side of converting refreshmod to a shell script
Bug: 340648588
Test: refreshmod
Change-Id: Iedbdd31f9a58cb609a826dfe8066c9eff8aa5904
2024-05-20 14:22:20 -07:00
Joe Onorato
1b9ab2903c Clean cruft out of envsetup.sh
Most if it moved to build/soong/bin as standalone scripts

Bug: 340648588
Test: ran the scripts
Change-Id: I69bff94a2293e2563d58d29b12f7926a9229f9d4
2024-05-20 14:22:20 -07:00
Joe Onorato
159cc8c594 The lunch benchmarks don't have targets, so don't fail.
Bug: 316189534
Test: format_benchmarks
Change-Id: I5b37a99624801a9c8d5f43ded788c8f0721b45f8
2024-05-18 07:58:24 -07:00
Wei Li
850b65edc9 Merge "Add license metadata declarations which are moved from hardware/google/camera/Android.mk." into main 2024-05-15 21:04:56 +00:00
Joe Onorato
5c9f86dcd8 Merge changes from topic "joeo_envsetup" into main
* changes:
  Clean cruft out of envsetup.sh.
  Provide a function in envsetup.sh to get the host arch directly
2024-05-15 18:40:12 +00:00
Ted Bauer
f52e8788a2 Merge "Add filter by container to aflags" into main 2024-05-15 17:36:11 +00:00
Ted Bauer
aeb96092af Add filter by container to aflags
Test: m -j120 && acloud create --local-image && adb shell aflags list --c system
Test: cargo t
Bug: 340840507
Change-Id: I5db7f204673accdbd3c4ad62e88b213028a8d5ab
2024-05-15 10:06:25 -04:00
Treehugger Robot
4a2c1b5ca3 Merge "Add a nano proto version of aconfig protos" into main 2024-05-15 07:20:45 +00:00
Treehugger Robot
3e94ffd0ed Merge "Remove build/make/METADATA which is not needed for the directory." into main 2024-05-15 06:26:04 +00:00
Mark Punzalan
5529e36e88 Add a nano proto version of aconfig protos
Framework already has nano protos, and reusing them won't
introduce extra dependencies for the apps
This is setting up the resources flagging in the framework

Bug: 297373084
Test: Built with related changes
Change-Id: I518bd56f56c42e0adef0002e95f8948e0904fb43
2024-05-15 06:18:23 +00:00
Wei Li
ef14fb257b Remove build/make/METADATA which is not needed for the directory.
Bug: 340738699
Test: CIs
Change-Id: Ic32d4863e47be65b2821d94b941562c00246b6ad
2024-05-14 22:19:18 -07:00
Joe Onorato
2312475f66 Clean cruft out of envsetup.sh.
aninja and overrideflags moved to build/soong/bin

Bug: 340648588
Test: manual
Change-Id: I1d426b628f15674e142df4152661d3f4b9b56320
2024-05-14 15:12:53 -07:00
Joe Onorato
32b2aa33c5 Provide a function in envsetup.sh to get the host arch directly
It's very simple logic, and running get_build_var to do it is slow
and has side effects (like needing a lunch target, creating an out
directory, etc.)

Test: source envsetup.sh
Change-Id: If260efd21713874fba7c15dbc0fd23442d776f8a
Merged-In: If260efd21713874fba7c15dbc0fd23442d776f8a
2024-05-14 15:12:16 -07:00
Treehugger Robot
b63973dfc2 Merge "Fix bug in device path proto reading" into main 2024-05-14 21:01:21 +00:00
Ted Bauer
1f9d55d2ab Fix bug in device path proto reading
aconfig_device_paths uses `include_str!` to include a text file
containing comma-separated strings with each partition aconfig file.
The lib does not handle the escaped newlines and quotation marks.
Adds proper handling.

Test: cargo t  && m -j120 && acloud create --local-image && adb shell aflags list
Bug: 340514768
Change-Id: I75214bf02dd962d8291f1654ade8cbce1cda9fde
2024-05-14 15:49:14 -04:00
Treehugger Robot
a4b1e92ee0 Merge "Only consider EXTRA_INSTALL_ZIPS relevant by their primary file" into main 2024-05-13 22:56:46 +00:00
Dennis Shen
db0c8d7986 Merge "aconfig: simply proto" into main 2024-05-13 15:26:26 +00:00
Treehugger Robot
7c71d88e0b Merge "check-flagged-apis: handle nested flags" into main 2024-05-13 07:32:16 +00:00
Dennis Shen
a2fb60b822 aconfig: simply proto
Bug: b/339514174, b/312444587
Test: atest -c
Change-Id: I5511efd04af9f57b22e4c89bd2db65496aaf4398
2024-05-11 15:51:14 +00:00
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
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