Commit Graph

9832 Commits

Author SHA1 Message Date
Treehugger Robot
802de330d3 Merge "add csv output to format_benchmarks" into main 2024-05-22 16:49:27 +00:00
Treehugger Robot
cc3b6e00b6 Merge "check-flagged-apis: make interfaces inherit from java/lang/Object" into main am: fe822ece0d am: 52d1393edb
Original change: https://android-review.googlesource.com/c/platform/build/+/3094244

Change-Id: Iff14822695a55d1121da80391f211477e7c6d242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 15:07:47 +00:00
Mårten Kongstad
aa41dac8d8 check-flagged-apis: make interfaces inherit from java/lang/Object
When parsing API signature files, check-flagged-apis relies on
ClassItem.superClass to get the parent class of a class or interface.
That method always returns null for interfaces.

When generating api-versions.xml, metalava marks interface classes as
inheriting from java/lang/Object:

  <class name="android/os/Parcelable" since="1">
    <extends name="java/lang/Object"/>
    [...]
  </class>

This confuses check-flagged-apis when comparing data parsed from both
sources, as the symbol signatures will be identical, but the superclass
entries differ. Work around this by explicitly marking all interfaces
as inheriting from java/lang/Object when parsing API signature files.

Bug: 334870672
Test: atest --host check-flagged-apis-test
Change-Id: Icbb8f7d4c3d4232a083289a778b347e33a0856ab
2024-05-22 15:13:54 +02:00
Mårten Kongstad
3ada31ed55 finalization: set FINAL_STATE to 'rel'
VIC is set to REL. Accordingly, set FINAL_STATE to 'rel' to prevent the
finalization scripts from running steps that have already been merged.

Bug: 335304236
Test: treehugger (main-fina-2-release succeed)
Ignore-AOSP-FIRST: arrives in aosp with ap3a
Change-Id: Id42c3ae2ffead62ac6019690f0586d8db8d22ef8
2024-05-22 08:30:29 +02:00
Hsin-Yi Chen
112c677541 Merge "Create APEX ABI dumps with next release configuration" into main 2024-05-22 04:46:17 +00:00
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
bce2f11b44 Merge "The lunch benchmarks don't have targets, so don't fail." into main am: 7963591826 am: 0a9d2548ae
Original change: https://android-review.googlesource.com/c/platform/build/+/3093718

Change-Id: I7afc8d40c03b07a9bc61a3cc240cef299219df47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-20 15:58:46 +00:00
Joe Onorato
7963591826 Merge "The lunch benchmarks don't have targets, so don't fail." into main 2024-05-20 15:07:04 +00: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
Daniel Zheng
99c5a182c0 Merge changes Ibbed6cf9,I31b36b42 into main am: 7a61f499be am: 8e97607666
Original change: https://android-review.googlesource.com/c/platform/build/+/3089653

Change-Id: Ic9762bce7446383dfacd3fc3ba4a6e60f6adfa11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-16 20:23:48 +00:00
Daniel Zheng
7a61f499be Merge changes Ibbed6cf9,I31b36b42 into main
* changes:
  ota_from_target_files: allow cow version override
  Add build configs for wearable tunables
2024-05-16 19:34:11 +00:00
Daniel Zheng
60922a45ef ota_from_target_files: allow cow version override
With our version compatibility check, overriding our cow version no
longer works. Updating this check to only apply if a command line
vabc_cow_version is not specified.

NOTE: the ota may not successfully apply, depending on device if we
override the cow version

Test: th
Change-Id: Ibbed6cf94cc2e91597d0c249dc8ade314b8341a2
2024-05-16 10:22:03 -07:00
Joe Onorato
ee0bbf3429 Merge changes from topic "joeo_envsetup" into main am: 5c9f86dcd8 am: 9e0d9d962f
Original change: https://android-review.googlesource.com/c/platform/build/+/3086689

Change-Id: I074a08d74224a86605ff1efc325b76496f0a94dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-15 19:21:48 +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
59198ca2d2 Merge "Add filter by container to aflags" into main am: f52e8788a2 am: 09fbb10fc4
Original change: https://android-review.googlesource.com/c/platform/build/+/3087903

Change-Id: Ief4f1bd2e94e07496400d3f0b7f7b60ed242b732
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-15 18:11:25 +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
Hsin-Yi Chen
a2440a3e4a Create APEX ABI dumps with next release configuration
Next release configuration maps the codename to the finalized API
level, but fina_2 doesn't.

Ignore-AOSP-First: Finalization scripts are not on AOSP
Test: build/make/tools/finalization/finalize-sdk-rel.sh
Bug: 340507697
Change-Id: I00e55bf350ff5b5f5b10f9e74ceff38b0660dde3
2024-05-15 08:32:27 +00:00
Treehugger Robot
c6cf9ac793 Merge "Add a nano proto version of aconfig protos" into main am: 4a2c1b5ca3 am: fd1ca8b6ff
Original change: https://android-review.googlesource.com/c/platform/build/+/3087843

Change-Id: Ic336fdb1a79fd10e38124fe860c6a77babbe8173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-15 07:54:02 +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
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
Treehugger Robot
8674bb045b Merge "Fix bug in device path proto reading" into main am: b63973dfc2 am: 21978761b8
Original change: https://android-review.googlesource.com/c/platform/build/+/3085527

Change-Id: Ia8fd6c199b1394c41bf1cc76aaf8864fe6366318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-14 21:52: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
Dennis Shen
96dee8805b Merge "aconfig: simply proto" into main am: db0c8d7986 am: 91e478d07b
Original change: https://android-review.googlesource.com/c/platform/build/+/3081125

Change-Id: Ic9a84b5e3cd0e62b11a0e544cef6f9b3babc5c42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-13 15:58:36 +00:00
Dennis Shen
db0c8d7986 Merge "aconfig: simply proto" into main 2024-05-13 15:26:26 +00:00
Treehugger Robot
c829858532 Merge "check-flagged-apis: handle nested flags" into main am: 7c71d88e0b am: e1802f1f2a
Original change: https://android-review.googlesource.com/c/platform/build/+/3079003

Change-Id: Ie7f88d55f40c76e9028e1d848c30fc884738e179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-13 08:30:55 +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
Treehugger Robot
942eb2034e Merge "Replace impl ToString with impl Display" into main am: 8211cb24a5 am: d9f34e441d
Original change: https://android-review.googlesource.com/c/platform/build/+/3081923

Change-Id: I204c7156ef2eed664c414ac0a827feff17663c2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-10 19:20:32 +00:00
Treehugger Robot
8211cb24a5 Merge "Replace impl ToString with impl Display" into main 2024-05-10 18:32:41 +00: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
Dennis Shen
ff38350139 Merge "aconfig: add list_flag api cxx interlop" into main am: 9d21525b85 am: 341557f56c
Original change: https://android-review.googlesource.com/c/platform/build/+/3079587

Change-Id: If731976287515a794e6867dd0823c35d884a72fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-09 21:52:22 +00:00
Dennis Shen
9d21525b85 Merge "aconfig: add list_flag api cxx interlop" into main 2024-05-09 21:13:17 +00:00
Treehugger Robot
9168dbb0be Merge "Reland "Fix retrofit OTA generation failures"" into main am: 67c90ed1e9 am: 197f41f23d
Original change: https://android-review.googlesource.com/c/platform/build/+/3080633

Change-Id: I4d534c0b20e170cf138271b0d46317ea3fd0253c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-09 17:56:33 +00: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
91c40ed17d Merge "Add a Java lib to read on-device proto paths" into main am: c0c2e5f278 am: 39937913e1
Original change: https://android-review.googlesource.com/c/platform/build/+/3077343

Change-Id: I53fc186f8a27071ebce6eafeb38f1660dcb67446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-09 15:52: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
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
Kelvin Zhang
c0ad9c98bd Merge "Revert "Fix retrofit OTA generation failures"" into main am: e41c75cb83 am: 094641230e
Original change: https://android-review.googlesource.com/c/platform/build/+/3079786

Change-Id: I68fe99bf478f81f4d085e330c8e74fdc95380324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 21:15:19 +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
7ef182e7a3 Merge "aconfig: make MutableMappedStorageFiles inherit MappedStoargeFiles" into main am: 015de62d7a am: 3807c32bff
Original change: https://android-review.googlesource.com/c/platform/build/+/3077003

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

Change-Id: Ic93586ef7fb3b507d5697c634bd527e960824fca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 18:24:46 +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
Treehugger Robot
1a7a53388b Merge "Add the step to generate LLNDK ABI dumps" into main 2024-05-08 06:20:44 +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