Commit Graph

89423 Commits

Author SHA1 Message Date
Cole Faust
ab7ddf8f20 Merge "Clean staging dirs in build_image.py" into main am: 548775d247
Original change: https://android-review.googlesource.com/c/platform/build/+/2746998

Change-Id: I6f1b97ba49fe1bb083ec9d520b5955bbd8580efe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:07:50 +00:00
Cole Faust
548775d247 Merge "Clean staging dirs in build_image.py" into main 2023-09-11 17:25:19 +00:00
Gurpreet Singh
7f5607474c Merge "Add OWNERS for sdk extensions version updates" into main am: a2d9728449
Original change: https://android-review.googlesource.com/c/platform/build/+/2743417

Change-Id: Ie6516b5212459c52090dba9b88c1989644585bec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 14:53:59 +00:00
Mårten Kongstad
6644d9fbe7 Merge "Revert "Revert "aconfig: @hide generated Java code""" into main am: 72c3b38a1d
Original change: https://android-review.googlesource.com/c/platform/build/+/2745644

Change-Id: I8af4c28f0388bafa543112a406a2082b6a0b9814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 14:53:43 +00:00
Gurpreet Singh
a2d9728449 Merge "Add OWNERS for sdk extensions version updates" into main 2023-09-11 14:30:11 +00:00
Mårten Kongstad
72c3b38a1d Merge "Revert "Revert "aconfig: @hide generated Java code""" into main 2023-09-11 14:08:55 +00:00
Treehugger Robot
bd427b16e4 Merge "aconfig: remove unnecessary clones" into main am: 1ee8f4d232
Original change: https://android-review.googlesource.com/c/platform/build/+/2745641

Change-Id: I56c58fc168543e844c723d0bbcd29f6b15fa4d51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 13:17:34 +00:00
Treehugger Robot
1ee8f4d232 Merge "aconfig: remove unnecessary clones" into main 2023-09-11 12:51:17 +00:00
Mårten Kongstad
65efa27f71 Revert "Revert "aconfig: @hide generated Java code""
This reverts commit c0e8ffea41.

Reason for revert: The detected build breakage was unrelated to the aconfig change. Details in b/297881670#comment11.

Change-Id: Ia32bc2e796ed3de7fa049c2c2db340f4325a2853
2023-09-11 12:17:25 +00:00
Mårten Kongstad
fa7b2ec189 Merge "Revert "aconfig: @hide generated Java code"" into main am: 4afc5d7b2b
Original change: https://android-review.googlesource.com/c/platform/build/+/2745642

Change-Id: Ib64656b57b1d7118a4718c41f46857b9c694db33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 11:45:00 +00:00
Mårten Kongstad
e1b7b7a500 Merge "aconfig: @hide generated Java code" into main am: fd6cd13947
Original change: https://android-review.googlesource.com/c/platform/build/+/2745699

Change-Id: Ie4496b863a6452365847d814284c31de18d56d84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 11:44:41 +00:00
Mårten Kongstad
4afc5d7b2b Merge "Revert "aconfig: @hide generated Java code"" into main 2023-09-11 11:06:14 +00:00
Mårten Kongstad
c0e8ffea41 Revert "aconfig: @hide generated Java code"
This reverts commit 379e09d157.

Reason for revert: Seems to have broken the build. Reverting while investigating.

Change-Id: I37c9a065853ef07b1f1c18355205a2f49dd816c4
2023-09-11 11:00:42 +00:00
Mårten Kongstad
fd6cd13947 Merge "aconfig: @hide generated Java code" into main 2023-09-11 10:44:23 +00:00
Mårten Kongstad
b5133f6ad4 aconfig: remove unnecessary clones
Improve performance slightly: remove unnecessary clone operations, or
use references where a new object is not needed.

Bug: 283910447
Test: atest aconfig.test
Change-Id: I75205ffa1723dd2654039baac882c225d2653c86
2023-09-11 11:10:21 +02:00
Mårten Kongstad
379e09d157 aconfig: @hide generated Java code
Flagged APIs are annotated using `@FlaggedApi(Flags.FLAG_NAME)`, where
Flags.FLAG_NAME was auto-generated by aconfig.

When metalava generates an API signature file, it can either

  a) insert the value of the constant ("com.foo.bar.flag_name"), or
  b) insert the name of the constant (FLAG.NAME)

In the case of @FlaggedApi, we want a). This requires that

  x) metlava has access to the definition of the constant while generating the API signature file, and
  y) the constant is not part of the API surface of the API signature file

x) is handled by the build system, y) is handled by the aconfig code
generation.

This CL @hide:s all generated Java code, to make sure it is accessible
within the platform, but never part of any API surface.

Bug: 297881670
Test: atest aconfig.test aconfig.test.java
Change-Id: I328ed1a652a4e5e293f2f4b11f916d29fc2fbcbd
2023-09-11 10:31:46 +02:00
Cole Faust
152cdfab7c Clean staging dirs in build_image.py
build_image.py now accepts a --input-directory-filter-file argument
that contains a list of files to consider from the input directory.
A new, temporary input directory will be created, and only the
considered files will be copied to it.

This removes most of the need for `m installclean`, as old files or
files built manually will no longer end up on the partition.

Bug: 205632228
Test: Presubmits
Change-Id: I07e0bf8e840abf0b51a2fdf67b758905fb3c5b5b
2023-09-08 16:24:26 -07:00
Treehugger Robot
7677eb46cd Merge "Add per partition timestamp to 16K boot OTA" into main am: 6f0db025d0
Original change: https://android-review.googlesource.com/c/platform/build/+/2744293

Change-Id: I96a6db27c937060b3c374802921590598693ecf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 22:54:42 +00:00
Treehugger Robot
6f0db025d0 Merge "Add per partition timestamp to 16K boot OTA" into main 2023-09-08 22:25:29 +00:00
Treehugger Robot
237fb6585b Merge "Add a build-time flag for LLPVM Changes in AVF" into main am: 79955070f3
Original change: https://android-review.googlesource.com/c/platform/build/+/2745401

Change-Id: I7b82c0f78658cc059e27332c5f100f493b09c94d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 17:18:30 +00:00
Treehugger Robot
79955070f3 Merge "Add a build-time flag for LLPVM Changes in AVF" into main 2023-09-08 16:32:53 +00:00
Shikha Panwar
32bd6bdd1a Add a build-time flag for LLPVM Changes in AVF
Bug: 278067832
Test: Builds
Change-Id: I25560797e3a0c71a263135ade0d8689ec92cb177
2023-09-08 14:29:00 +00:00
Gurpreet Singh
3b3e686d8b Add OWNERS for sdk extensions version updates
Our team performs the mainline sdk releases and has to update the sdk
extensions version on every release.

Adding people who are involved in the sdk ext release process so that
changes related to sdk extensions version updates can be approved by
our team.

We will only be approving changes which updates sdk extensions version.

Bug: N/A
Test: N/A
Change-Id: I42755dbae7054161f56e789b57e064084eebc7c7
2023-09-08 13:30:10 +00:00
Alan Stokes
fab1d5bf4e Merge "Add a build-time flag for DICE Changes in AVF" into main am: 7d63a84642
Original change: https://android-review.googlesource.com/c/platform/build/+/2744058

Change-Id: I58f4994a4d5ff901b998a9cc9376c25e523b1e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 12:31:27 +00:00
Alan Stokes
7d63a84642 Merge "Add a build-time flag for DICE Changes in AVF" into main 2023-09-08 12:21:41 +00:00
Firman Prayoga
e4a3296f1d Merge "Revert "Clean staging dirs in build_image.py"" into main am: 44d86b138b
Original change: https://android-review.googlesource.com/c/platform/build/+/2746515

Change-Id: Ibe31fc87779099b74bb20625ce1ee931907d0708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 04:31:46 +00:00
Firman Prayoga
44d86b138b Merge "Revert "Clean staging dirs in build_image.py"" into main 2023-09-08 04:06:57 +00:00
Firman Prayoga
df21706765 Revert "Clean staging dirs in build_image.py"
Revert submission 2736954-proper_installclean

Reason for revert: Potential culprit for build breakage b/299545346

Reverted changes: /q/submissionid:2736954-proper_installclean

Change-Id: I2b0671bd40b7a74ef02923a777ec899401691454
2023-09-08 01:24:45 +00:00
Cole Faust
686b624b0c Merge changes I1cfdc6f4,I22c91c79 into main am: 420f6978ca
Original change: https://android-review.googlesource.com/c/platform/build/+/2708830

Change-Id: I9c41a2ada49e96571b4b74cce68efd28d877cf29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 21:19:53 +00:00
Cole Faust
420f6978ca Merge changes I1cfdc6f4,I22c91c79 into main
* changes:
  Validate release config with a schema
  Make release_config.bzl match internal
2023-09-07 20:43:04 +00:00
Treehugger Robot
cb4bb177bd Merge "[zip] Set all entry times before 1980 to 1980-01-01" into main am: 05a03698b7
Original change: https://android-review.googlesource.com/c/platform/build/+/2744613

Change-Id: I5435006901820b183b2530d4c178d864ded77296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 19:52:10 +00:00
Cole Faust
8a7efafe50 Validate release config with a schema
To more thouroughly check that it's valid.

Test: m nothing
Change-Id: I1cfdc6f4d20e826eb870f5e1e71d0386c589bc9a
2023-09-07 12:32:39 -07:00
Cole Faust
0c869edcd1 Make release_config.bzl match internal
To avoid merge conflicts. These are buildifier errors that will be
fixed in a followup cl.

Test: presubmits
Change-Id: I22c91c796aee16ef16f05471c2ff5221fa41d7b3
2023-09-07 12:29:21 -07:00
Treehugger Robot
05a03698b7 Merge "[zip] Set all entry times before 1980 to 1980-01-01" into main 2023-09-07 18:54:47 +00:00
Cole Faust
8af587010b Merge "Clean staging dirs in build_image.py" into main am: c383825953
Original change: https://android-review.googlesource.com/c/platform/build/+/2736954

Change-Id: I8731127af428888c1be3035c0e9f3244964ab7e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 17:18:12 +00:00
Alan Stokes
95cfb629d1 Add a build-time flag for DICE Changes in AVF
Bug: 299472719
Test: Builds
Change-Id: I1c9f4085781681e0070a0b9abade5e940a8d6ed6
2023-09-07 17:42:17 +01:00
Cole Faust
c383825953 Merge "Clean staging dirs in build_image.py" into main 2023-09-07 16:41:45 +00:00
Treehugger Robot
8093f24233 Merge "Fix $(PROGUARD_DICT_ZIP) builds" into main am: f49b9a3371
Original change: https://android-review.googlesource.com/c/platform/build/+/2744295

Change-Id: Ib917435e416aa4a0bda916212f1f3218eed4d061
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 02:50:29 +00:00
Treehugger Robot
f49b9a3371 Merge "Fix $(PROGUARD_DICT_ZIP) builds" into main 2023-09-07 02:27:36 +00:00
Cole Faust
206971459d Fix $(PROGUARD_DICT_ZIP) builds
Previously, when building the proguard dict zip, we got a lot of
warnings like these, and the files were always rebuilt:

```
[ 39% 9/23] Copy symbols with mapping: out/target/common/obj/APPS/HTMLViewer_intermediates/proguard_dictionary
ninja: Missing `restat`? An output file is older than the most recent input:
 output: out/target/common/obj/APPS/HTMLViewer_intermediates/proguard_dictionary.textproto
  input: out/soong/.intermediates/packages/apps/HTMLViewer/HTMLViewer/android_common/e10894d3da5db41239526c9048962355/proguard_dictionary
```

For some reason kati wasn't adding `restat=true` on these ninja rules.
Adding $(4) to KATI_RESTAT fixes it for some reason.

Test: m dist repeatedly doesn't give the restat warnings
Change-Id: Ie02526b3ab127f42bdc2db350d2dc468e7888fe2
2023-09-06 18:13:27 -07:00
Mark Punzalan
0d7190b413 [zip] Set all entry times before 1980 to 1980-01-01
Before this change, entry times before 1980 had the year changed to 1980
but the month/day/hour/minutes/seconds were all kept as-is.

Bug: 277978832
Test: atest zipalign_tests
Change-Id: I9f87e98a6b985002578490b87c654fee86c65d62
2023-09-06 21:44:40 +00:00
Kelvin Zhang
b5661d6ef5 Add per partition timestamp to 16K boot OTA
update_engine requiers per partition timestamp if this partition's build
prop includes build.date.utc.

Test: th
Bug: 293313353
Change-Id: I6bf3de8e855f0830b26bdbe2cbdc78ba891662a7
2023-09-06 13:02:19 -07:00
Treehugger Robot
8b0299785e Merge "Use localtime_r() on Windows too." into main am: 2462269f1f
Original change: https://android-review.googlesource.com/c/platform/build/+/2741081

Change-Id: I69aaad5de1db6ebfc204a41a29034a8dc4f6779b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 18:57:56 +00:00
Cole Faust
48b81e7386 Clean staging dirs in build_image.py
build_image.py now accepts a --input-directory-filter-file argument
that contains a list of files to consider from the input directory.
A new, temporary input directory will be created, and only the
considered files will be copied to it.

This removes most of the need for `m installclean`, as old files or
files built manually will no longer end up on the partition.

Bug: 205632228
Test: Presubmits
Change-Id: I4c82ac7f1ed49a37271755749c8f72afeeb7f295
2023-09-06 11:51:13 -07:00
Treehugger Robot
2462269f1f Merge "Use localtime_r() on Windows too." into main 2023-09-06 18:12:22 +00:00
Zhi Dou
a5b2b5d6a8 Merge "aconfig: flag java lib enable optimization" into main am: 58fd788f51
Original change: https://android-review.googlesource.com/c/platform/build/+/2741013

Change-Id: Ide04bb0809d46e45dcb044b2c05e6d4860e3c4c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 13:30:20 +00:00
Nikita Ioffe
76e1cc3400 Merge "Propagate device assignment related flags to soong" into main am: 9ee5ca6b37
Original change: https://android-review.googlesource.com/c/platform/build/+/2738597

Change-Id: Ib3c8c03ea8055e9deddbf792f168c1921dd3d583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 13:29:44 +00:00
Zhi Dou
58fd788f51 Merge "aconfig: flag java lib enable optimization" into main 2023-09-06 12:56:46 +00:00
Zhi Dou
deafa792eb aconfig: flag java lib enable optimization
This change adds annotation in the generated code. If the flag is read
only, annotations @com.android.aconfig.annotations.AssumeTrueForR8 or
@com.android.aconfig.annotations.AssumeFalseForR8 will be added in to
the corresponding methods in the interface FeatureFlags, and class
Flags.

Test: atest aconfig aconfig.test.java
Bug: 295328116
Change-Id: Ic1b62a86f0945a5e72ae2c4987cce77fe3f172e9
2023-09-06 12:55:09 +00:00
Nikita Ioffe
9ee5ca6b37 Merge "Propagate device assignment related flags to soong" into main 2023-09-06 12:37:24 +00:00