Commit Graph

92736 Commits

Author SHA1 Message Date
Treehugger Robot
22fb71304c Merge "build: add a few proguard rules [1/3]" into main am: 2b46f4d199
Original change: https://android-review.googlesource.com/c/platform/build/+/2815690

Change-Id: Ic78bd0b17a63f62686e70d8726236954a9bffbf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:28:28 +00:00
Treehugger Robot
8a01fbd083 Merge "build: add a few proguard rules [1/3]" into main am: 2b46f4d199
Original change: https://android-review.googlesource.com/c/platform/build/+/2815690

Change-Id: I7a7241c8f4f0390b2fe8f2e892bc0bbb05e2be5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:26:12 +00:00
Treehugger Robot
2b46f4d199 Merge "build: add a few proguard rules [1/3]" into main 2023-11-08 23:06:02 +00:00
Roshan Pius
6af41ca24d Merge "Revert "handheld_system: Replace NFC app with NFC apex"" into main am: 7705138aed am: 9e78df31b6
Original change: https://android-review.googlesource.com/c/platform/build/+/2817948

Change-Id: If0f19121519dde54045bbe1fd0e570c9ccf4333b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:48:40 +00:00
Roshan Pius
614ac8f572 Merge "Revert "handheld_system: Replace NFC app with NFC apex"" into main am: 7705138aed am: 0af51caae3
Original change: https://android-review.googlesource.com/c/platform/build/+/2817948

Change-Id: I8723fae5869ffcc3afb1025611b3923d0fc05528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:46:04 +00:00
Abhishek Nigam
1dfca46094 Revert "Move more non-AB code to separate files"
This reverts commit 513b86e5c2.

Change-Id: I6aae60642772a052404eb1773966b2e637864bbc
2023-11-08 22:29:18 +00:00
Abhishek Nigam
b148ac22f8 Revert "Fix non-AB ota generation failure"
This reverts commit 782b752889.

bug: 308932171
tested: locally generated and applied ota on nonab device
Change-Id: I67b26be01d6240b2cb332e13bc7c7959de128755
2023-11-08 22:29:18 +00:00
Roshan Pius
9e78df31b6 Merge "Revert "handheld_system: Replace NFC app with NFC apex"" into main am: 7705138aed
Original change: https://android-review.googlesource.com/c/platform/build/+/2817948

Change-Id: I1dde8576a2ee0c451e18d1d61a28c84aca1794f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:48:52 +00:00
Roshan Pius
0af51caae3 Merge "Revert "handheld_system: Replace NFC app with NFC apex"" into main am: 7705138aed
Original change: https://android-review.googlesource.com/c/platform/build/+/2817948

Change-Id: If180df2e70a026d1ac25bc7577611518eff62dcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:45:25 +00:00
Roshan Pius
7705138aed Merge "Revert "handheld_system: Replace NFC app with NFC apex"" into main 2023-11-08 21:16:19 +00:00
Dennis Shen
96506f4349 aconfig: Cache flag values for c/c++ codegen
Bug: b/307336730
Test: atest aconfig.test
Change-Id: Id604cf154d09a48f657277af6d799f0e17bc4e93
2023-11-08 19:19:35 +00:00
Greg Kaiser
24366c842b Require TARGET_RELEASE for builds
Rather than use an unsupported flag setting that the user likely
doesn't even realize is being used, we immediately stop the build.

This error message is more verbose, mentioning 'lunch', because
it's anticipated a lot more users will hit this issue when first
switching to trunk stable, and more details will hopefully help
them out.

We have some complication in that some internal commands set
TARGET_RELEASE to an empty string.  We put in logic to allow
that path.

Since $(error) immediately stops the build, we also get rid of
some 'else' logic and indentation, to hopefully offset some of
the complication we've added.

Bug: 307946156
Test: 'lunch' (still) works; A build attempt without `TARGET_RELEASE` set (now) fails
Change-Id: I2f667668c6688e501a3536981b7bae5fdbf962a0
2023-11-08 11:20:28 -07:00
Cole Faust
9a106f3ebb Remove release_config.bzl
The internal usages have been switched to release_config.scl.

Bug: 309686282
Test: Presubmits
Change-Id: If8e5a5b94a47474f5e76cf189c41980402f31085
2023-11-08 10:11:03 -08:00
Cole Faust
3dd1ab0886 Merge "Remove release_config.bzl load" into main am: bcaac55c35 am: 323bd875e3
Original change: https://android-review.googlesource.com/c/platform/build/+/2820879

Change-Id: Ic56ce492a337233595f887ab14c59a05fd007fcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 08:56:27 +00:00
Cole Faust
634daf978d Merge "Remove release_config.bzl load" into main am: bcaac55c35 am: 7fee697f64
Original change: https://android-review.googlesource.com/c/platform/build/+/2820879

Change-Id: I2cab60d08c7f43bb2ac6bc933582feddb74482a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 08:53:19 +00:00
Cole Faust
323bd875e3 Merge "Remove release_config.bzl load" into main am: bcaac55c35
Original change: https://android-review.googlesource.com/c/platform/build/+/2820879

Change-Id: Id7e5c7ff11cf1f035b7001f660fbd7c1198f64b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 08:24:04 +00:00
Cole Faust
7fee697f64 Merge "Remove release_config.bzl load" into main am: bcaac55c35
Original change: https://android-review.googlesource.com/c/platform/build/+/2820879

Change-Id: If1d86c096ae87e4a02d48520529bc31fecfe1c5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 08:21:11 +00:00
Cole Faust
bcaac55c35 Merge "Remove release_config.bzl load" into main 2023-11-08 07:46:54 +00:00
Cole Faust
6291522c70 Remove release_config.bzl load
This was mistakenly copy/pasted.

Test: Presubmits
Change-Id: I01dcf65464428d56c2246cf70f6e769e842f28b1
2023-11-07 21:05:37 -08:00
Treehugger Robot
6089fd0915 Merge "add product sepolicy into monitor list" into main am: 8a5b9e4aa2 am: a439e22103
Original change: https://android-review.googlesource.com/c/platform/build/+/2821017

Change-Id: I9b6817a9e386aad9c314af08dfbfffc72d0e0b37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 04:47:22 +00:00
Treehugger Robot
bd2ff930df Merge "add product sepolicy into monitor list" into main am: 8a5b9e4aa2 am: f9a5c42b65
Original change: https://android-review.googlesource.com/c/platform/build/+/2821017

Change-Id: Id7f045a39a8d0ec779d049344eb1018aa06132de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 04:40:55 +00:00
Treehugger Robot
f9a5c42b65 Merge "add product sepolicy into monitor list" into main am: 8a5b9e4aa2
Original change: https://android-review.googlesource.com/c/platform/build/+/2821017

Change-Id: Ibaa672b0e5908e74a8da47eb1aa92d992585799e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 04:10:56 +00:00
Treehugger Robot
a439e22103 Merge "add product sepolicy into monitor list" into main am: 8a5b9e4aa2
Original change: https://android-review.googlesource.com/c/platform/build/+/2821017

Change-Id: I07ae63e55ce18fc9d8a45b545afc90f0d5597f3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 04:08:29 +00:00
Treehugger Robot
8a5b9e4aa2 Merge "add product sepolicy into monitor list" into main 2023-11-08 03:28:35 +00:00
Cole Faust
2bec54b7cc Merge "Rename bzl files to scl" into main am: 9af1856e91 am: 1ea2bb1eb4
Original change: https://android-review.googlesource.com/c/platform/build/+/2819902

Change-Id: I2f36cdbc2f6d0484f4c7f557edf2d81aca80d8de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 02:49:50 +00:00
Cole Faust
15ac88ffd7 Merge "Rename bzl files to scl" into main am: 9af1856e91 am: 9b8bc9717f
Original change: https://android-review.googlesource.com/c/platform/build/+/2819902

Change-Id: Ia875756288652ab99fed6938f22b181be9d017f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 02:20:00 +00:00
Cole Faust
9b8bc9717f Merge "Rename bzl files to scl" into main am: 9af1856e91
Original change: https://android-review.googlesource.com/c/platform/build/+/2819902

Change-Id: I7cf7810870f6e7af16375071e70b0502a8094956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 01:10:19 +00:00
Cole Faust
1ea2bb1eb4 Merge "Rename bzl files to scl" into main am: 9af1856e91
Original change: https://android-review.googlesource.com/c/platform/build/+/2819902

Change-Id: Ie63ca66a819920251ab99e39ac6251b078195fe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 01:07:29 +00:00
Treehugger Robot
3913d54d78 Merge "Generate incremental OTAs for 16K/4K boot option" into main am: bf25b080d6 am: 8a627f0a15
Original change: https://android-review.googlesource.com/c/platform/build/+/2768738

Change-Id: I5ba5f513734908b7c1e8f416052ceab557507971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 01:05:01 +00:00
Treehugger Robot
986d9d184c Merge "Generate incremental OTAs for 16K/4K boot option" into main am: bf25b080d6 am: 2718d6a4f3
Original change: https://android-review.googlesource.com/c/platform/build/+/2768738

Change-Id: Iae47a846c2430868e0484d9bb88500b11fcfaadc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 01:02:52 +00:00
Adam Shih
894cf688a9 add product sepolicy into monitor list
Bug: 256065208
Test: lunch raven-next-userdebug
Change-Id: I016f0340aecdc15af485c9fd51d6c0120ee8908f
2023-11-08 00:51:04 +00:00
Cole Faust
9af1856e91 Merge "Rename bzl files to scl" into main 2023-11-08 00:49:34 +00:00
Treehugger Robot
8a627f0a15 Merge "Generate incremental OTAs for 16K/4K boot option" into main am: bf25b080d6
Original change: https://android-review.googlesource.com/c/platform/build/+/2768738

Change-Id: Ie3e20d0de73e1cc8a5fc39a512ae0aaa394810b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 00:35:43 +00:00
Treehugger Robot
2718d6a4f3 Merge "Generate incremental OTAs for 16K/4K boot option" into main am: bf25b080d6
Original change: https://android-review.googlesource.com/c/platform/build/+/2768738

Change-Id: I7631a823ad6174c13325367ec4ffad71ba25c665
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 00:32:52 +00:00
Treehugger Robot
bf25b080d6 Merge "Generate incremental OTAs for 16K/4K boot option" into main 2023-11-08 00:11:41 +00:00
Cole Faust
a44c7bd1ca Rename bzl files to scl
These files don't have anything to do with bazel, they just use starlark as a configuration
language. Bazel recently introduced the scl file extension to use for this format, which doesn't
have any bazel-specific symbols. Use that extension for our pure starlark files as well.

Bug: 309686282
Test: Presubmits
Change-Id: I7b08f342e7fb94405a52af0918ae6a7d542f3282
2023-11-07 15:30:39 -08:00
Cole Faust
a93dbae471 Merge "Only allow .scl files to load other .scl files" into main am: 7c8607715d am: f85e863d75
Original change: https://android-review.googlesource.com/c/platform/build/+/2820037

Change-Id: I5da2a5e977e8a46fada134d061fd909728a67250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 22:40:58 +00:00
Cole Faust
086f868816 Merge "Only allow .scl files to load other .scl files" into main am: 7c8607715d am: 40ae127032
Original change: https://android-review.googlesource.com/c/platform/build/+/2820037

Change-Id: I34a488e3ec680e036cf2699ede86aa425437a01e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 22:38:17 +00:00
Yifei Zhang
e6d996479b build: add a few proguard rules [1/3]
- Introduce a new directory for some specific proguard rules.

kotlin.flags:
- Remove DebugMetadata
- Don't warn about missing non-runtime annotations

Test: build AOSP & test on internal
Bug: 309023911
Change-Id: Iee740b61a2afeba3482ff4e1f8213bd4cf46174a
2023-11-07 14:36:01 -08:00
Cole Faust
f85e863d75 Merge "Only allow .scl files to load other .scl files" into main am: 7c8607715d
Original change: https://android-review.googlesource.com/c/platform/build/+/2820037

Change-Id: I99375cb484df1a96d34fccbddcd25a1df10f3138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 22:10:27 +00:00
Cole Faust
40ae127032 Merge "Only allow .scl files to load other .scl files" into main am: 7c8607715d
Original change: https://android-review.googlesource.com/c/platform/build/+/2820037

Change-Id: Id6e4070155b608d2845db563275057cbfdcf1d58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 22:08:04 +00:00
Cole Faust
7c8607715d Merge "Only allow .scl files to load other .scl files" into main 2023-11-07 21:41:37 +00:00
LaMont Jones
430258a75b Merge changes from topic "product-flags2" into main am: bae67b9994 am: 865c4ef49e
Original change: https://android-review.googlesource.com/c/platform/build/+/2816075

Change-Id: I70e73ab1507de5bbc3fb70e6e69afddff579e3bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 20:51:37 +00:00
LaMont Jones
21dfc8e2bf Reapply "Add support for product-specific build flags" am: 38b195ea7e am: 18bc5ccc98
Original change: https://android-review.googlesource.com/c/platform/build/+/2816074

Change-Id: I0c58bfc798809dc56b06605bca0d49ca2853f2d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 20:51:32 +00:00
LaMont Jones
38b02b3a53 Merge changes from topic "product-flags2" into main am: bae67b9994 am: 119292b4b6
Original change: https://android-review.googlesource.com/c/platform/build/+/2816075

Change-Id: I0e3066335354900b855e443b9b94c3e7450659e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 20:48:15 +00:00
LaMont Jones
d9e894e891 Reapply "Add support for product-specific build flags" am: 38b195ea7e am: c8ebe4c2ea
Original change: https://android-review.googlesource.com/c/platform/build/+/2816074

Change-Id: I9169d68e45df499126929e57b999242fb99339a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 20:48:10 +00:00
LaMont Jones
865c4ef49e Merge changes from topic "product-flags2" into main am: bae67b9994
Original change: https://android-review.googlesource.com/c/platform/build/+/2816075

Change-Id: I5dfeea7d7c8e4f44947728fb9ec45206fdba34d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 20:20:58 +00:00
LaMont Jones
18bc5ccc98 Reapply "Add support for product-specific build flags" am: 38b195ea7e
Original change: https://android-review.googlesource.com/c/platform/build/+/2816074

Change-Id: I4587ac35f3a24c36d875fdada7303f5846cac66a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 20:20:55 +00:00
LaMont Jones
119292b4b6 Merge changes from topic "product-flags2" into main am: bae67b9994
Original change: https://android-review.googlesource.com/c/platform/build/+/2816075

Change-Id: Ib57f23f9e743db8fb10806a3e4ab81c86aacc330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 20:18:29 +00:00
LaMont Jones
c8ebe4c2ea Reapply "Add support for product-specific build flags" am: 38b195ea7e
Original change: https://android-review.googlesource.com/c/platform/build/+/2816074

Change-Id: Ida0d96a53c78a874a479a57129f0e137e569e781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 20:18:25 +00:00