Commit Graph

95630 Commits

Author SHA1 Message Date
Ankur Bakshi
d309a50208 [automerger skipped] RESTRICT AUTOMERGE Update Security String to 2024-02-05 am: e4a65557e4 -s ours
am skip reason: Merged-In I9edc7171d124f0cfa540fea6f0e06ba877910444 with SHA-1 2666d4443b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/25498990

Change-Id: I3e82c1612ea287efed5cead7fbbcb97d9e4b53e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 14:02:53 +00:00
Treehugger Robot
ad76a70bbf Merge "aconfig: consolidate how fully qualified flag name is calculated" into main am: 5f24a2095d am: a57772e2b8 am: 73b007336b
Original change: https://android-review.googlesource.com/c/platform/build/+/2864525

Change-Id: I16fccfc59cc1932f1a9151e8c1c1d5228a29340a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 13:12:15 +00:00
Treehugger Robot
73b007336b Merge "aconfig: consolidate how fully qualified flag name is calculated" into main am: 5f24a2095d am: a57772e2b8
Original change: https://android-review.googlesource.com/c/platform/build/+/2864525

Change-Id: I51daca6eb19147647fc07f8227f0dc4e1d3f6084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 12:39:20 +00:00
Treehugger Robot
a57772e2b8 Merge "aconfig: consolidate how fully qualified flag name is calculated" into main am: 5f24a2095d
Original change: https://android-review.googlesource.com/c/platform/build/+/2864525

Change-Id: I8d4bfa54fada04c011a0d08455a751cf88d1f1ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 12:08:09 +00:00
Jihoon Kang
c063fdbe51 Merge "Add new dump format map in aconfig" into main am: 14a82dab15 am: 3d25718707 am: d449b41164
Original change: https://android-review.googlesource.com/c/platform/build/+/2860210

Change-Id: I7ce7f3f39e7aaea03c71a8b284c6e9ffa34acbba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 11:31:22 +00:00
Treehugger Robot
5f24a2095d Merge "aconfig: consolidate how fully qualified flag name is calculated" into main 2023-12-08 11:22:50 +00:00
Jihoon Kang
d449b41164 Merge "Add new dump format map in aconfig" into main am: 14a82dab15 am: 3d25718707
Original change: https://android-review.googlesource.com/c/platform/build/+/2860210

Change-Id: Ibf2a65821601f867d61b87a453b56d65faddb10d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 10:57:22 +00:00
Jihoon Kang
3d25718707 Merge "Add new dump format map in aconfig" into main am: 14a82dab15
Original change: https://android-review.googlesource.com/c/platform/build/+/2860210

Change-Id: Id5c08096557747bbb0e491f32afbe3cacfd995d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 10:27:20 +00:00
Hansen Kurli
c46e7ab092 Merge "Remove racoon, mtpd, pppd, ip-up-vpn" into main am: f388a25f97 am: 3bdc58adee am: 993989ef94
Original change: https://android-review.googlesource.com/c/platform/build/+/2864095

Change-Id: I5a2c2d192c6d455c661c7b452e1ac5531437cc86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 10:26:03 +00:00
Mårten Kongstad
12e593cd02 aconfig: move codegen into separate module
Consolidate the code generation sources into its own module. This is
done in preparation for when support for the new flag storage will be
added, which should also be placed in a separate module.

Bug: N/A
Test: atest aconfig.test aconfig.test.java
Change-Id: I8246729218ec60f2af4568c460e98329665a89fa
2023-12-08 11:24:54 +01:00
Mårten Kongstad
f3f20efd0c aconfig: consolidate how fully qualified flag name is calculated
Add an extension trait to consolidate how the fully qualified package
name (<package>.<name>) is calculated and use this where possible.

This CL is a semantic change only. The intention of this CL is to reduce
the risk of future bugs.

Bug: N/A
Test: atest aconfig.test
Change-Id: Ibab6641dda3843337fbea02631c31a1fdd8fb4ab
2023-12-08 11:02:32 +01:00
Hansen Kurli
993989ef94 Merge "Remove racoon, mtpd, pppd, ip-up-vpn" into main am: f388a25f97 am: 3bdc58adee
Original change: https://android-review.googlesource.com/c/platform/build/+/2864095

Change-Id: I7a8e4c6910959b165551a59be35cd08aa3573172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 09:53:35 +00:00
Jihoon Kang
14a82dab15 Merge "Add new dump format map in aconfig" into main 2023-12-08 09:48:13 +00:00
Hansen Kurli
3bdc58adee Merge "Remove racoon, mtpd, pppd, ip-up-vpn" into main am: f388a25f97
Original change: https://android-review.googlesource.com/c/platform/build/+/2864095

Change-Id: I9fa434f2b12917677ad298cf4fce071efdb436a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 09:21:57 +00:00
Hansen Kurli
f388a25f97 Merge "Remove racoon, mtpd, pppd, ip-up-vpn" into main 2023-12-08 08:52:16 +00:00
Xin Li
2aa160f43d [automerger skipped] Skip UQ1A.231205.015 am: 3c3bec8910 -s ours am: bb8f6c7f33 -s ours
am skip reason: Merged-In I1236f2a84e1b6fce4bc27d366006d7bbac69ab50 with SHA-1 428953becb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/25586774

Change-Id: I0960189d3cc7b728b6ac706c1781707b36f84fd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:51:04 +00:00
Xin Li
bb8f6c7f33 [automerger skipped] Skip UQ1A.231205.015 am: 3c3bec8910 -s ours
am skip reason: Merged-In I1236f2a84e1b6fce4bc27d366006d7bbac69ab50 with SHA-1 428953becb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/25586774

Change-Id: I7d2cd31a5e5f0a46eaae7caca466073f2e09b1bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:21:16 +00:00
Ankur Bakshi
e4a65557e4 RESTRICT AUTOMERGE Update Security String to 2024-02-05
Bug: 313797924

Change-Id: I6270b75c2a5aff6daa8dc483dedc82b6f93f9161
Ignore-AOSP-First: Internal first as its needed for preparing the release
Merged-In: I9edc7171d124f0cfa540fea6f0e06ba877910444
2023-12-08 04:23:37 +00:00
Xin Li
3c3bec8910 Skip UQ1A.231205.015
Bug: 308969284
Merged-In: I1236f2a84e1b6fce4bc27d366006d7bbac69ab50
Change-Id: I3e16ed3a8f34935aaf377234072b7c174ece7e69
2023-12-07 15:49:24 -08:00
Treehugger Robot
a1fb3bbcc0 Merge "Fix the KNOWN_CODENAMES to include "L"." into main am: d4a39894ca am: 2e7e6efc45 am: c701025ee9
Original change: https://android-review.googlesource.com/c/platform/build/+/2865065

Change-Id: I0763632dab16e4d08166be14c261f5ecd0db8d4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 23:44:47 +00:00
Colin Cross
8a93434b4c Merge "Add --dedup flag to generate-partition-aconfig-flag-file" into main am: 2118e738b2 am: 119341b418 am: 9e254d1910
Original change: https://android-review.googlesource.com/c/platform/build/+/2861369

Change-Id: I4fdc6c7c65209532e6dc10c872eade37723dcf22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 23:44:32 +00:00
Treehugger Robot
253d79d3d4 Merge "Fix the KNOWN_CODENAMES to include "L"." into main am: d4a39894ca am: 428953becb am: db0c9c66a9
Original change: https://android-review.googlesource.com/c/platform/build/+/2865065

Change-Id: I1446b83d0b250cda2bfceed0c94e21b6640e8bc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 23:43:15 +00:00
Colin Cross
c41d03f12c Merge "Add --dedup flag to generate-partition-aconfig-flag-file" into main am: 2118e738b2 am: 6e838663c3 am: df0fa5de98
Original change: https://android-review.googlesource.com/c/platform/build/+/2861369

Change-Id: Ic5ce4b678fb6001a65266bcd0e7127938157a663
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 23:42:56 +00:00
Treehugger Robot
c701025ee9 Merge "Fix the KNOWN_CODENAMES to include "L"." into main am: d4a39894ca am: 2e7e6efc45
Original change: https://android-review.googlesource.com/c/platform/build/+/2865065

Change-Id: I3e6a1fcf2d889dec73cc90c258e29d978da3f585
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 23:10:21 +00:00
Colin Cross
9e254d1910 Merge "Add --dedup flag to generate-partition-aconfig-flag-file" into main am: 2118e738b2 am: 119341b418
Original change: https://android-review.googlesource.com/c/platform/build/+/2861369

Change-Id: I6b89e2c0bd90846eb32f572f6fa999c44f889d31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 23:10:06 +00:00
Treehugger Robot
db0c9c66a9 Merge "Fix the KNOWN_CODENAMES to include "L"." into main am: d4a39894ca am: 428953becb
Original change: https://android-review.googlesource.com/c/platform/build/+/2865065

Change-Id: I9695efea6c32301eeae6d6acdc156a993c136dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 23:08:50 +00:00
Colin Cross
df0fa5de98 Merge "Add --dedup flag to generate-partition-aconfig-flag-file" into main am: 2118e738b2 am: 6e838663c3
Original change: https://android-review.googlesource.com/c/platform/build/+/2861369

Change-Id: I2a093152ca099a9e1433e2f6768182b09c9c685c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 23:08:30 +00:00
Treehugger Robot
428953becb Merge "Fix the KNOWN_CODENAMES to include "L"." into main am: d4a39894ca
Original change: https://android-review.googlesource.com/c/platform/build/+/2865065

Change-Id: I1236f2a84e1b6fce4bc27d366006d7bbac69ab50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 22:54:08 +00:00
Treehugger Robot
2e7e6efc45 Merge "Fix the KNOWN_CODENAMES to include "L"." into main am: d4a39894ca
Original change: https://android-review.googlesource.com/c/platform/build/+/2865065

Change-Id: If6afe25afd247e79d94f8c90d024d06f6e85e8e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 22:52:23 +00:00
Treehugger Robot
d4a39894ca Merge "Fix the KNOWN_CODENAMES to include "L"." into main 2023-12-07 22:47:29 +00:00
Colin Cross
119341b418 Merge "Add --dedup flag to generate-partition-aconfig-flag-file" into main am: 2118e738b2
Original change: https://android-review.googlesource.com/c/platform/build/+/2861369

Change-Id: I447ecbde89937ff242bcd3f2a2a774c1b9f0272c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 22:37:32 +00:00
Colin Cross
6e838663c3 Merge "Add --dedup flag to generate-partition-aconfig-flag-file" into main am: 2118e738b2
Original change: https://android-review.googlesource.com/c/platform/build/+/2861369

Change-Id: Ie532c29ad682051650598340a7452efda10f4e30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 22:37:13 +00:00
Jihoon Kang
a95f2b230c Add new dump format map in aconfig
The `aconfig dump --format map` lists aconfig keys mapped to its boolean
values that represents whether the flag is enabled or not, as seen below:
```
flag.name1=true
flag.name2=false
```

Test: aconfig dump --format map --cache out/soong/.intermediates/build/make/tools/aconfig/aconfig.test.flags/intermediate.pb && inspect output
Bug: 306024510
Change-Id: Ic4990c168f6fa9c87869113ba695c07394adbc67
2023-12-07 22:36:59 +00:00
Colin Cross
2118e738b2 Merge "Add --dedup flag to generate-partition-aconfig-flag-file" into main 2023-12-07 21:56:31 +00:00
Kelvin Zhang
8793a72bfd Support overriding cow version during OTA generation
Added a --vabc_cow_version flag to override cow version.
This enables testing on COW v3 without switching the android platform to
v3.

Test: th
Bug: 313962438
Change-Id: I9ff3ae6b6c7c8ef8c1423af6f25e420f94558d35
2023-12-07 13:20:43 -08:00
Jeff Hamilton
c4517b0fbd Fix the KNOWN_CODENAMES to include "L".
Bug: 307733231
Test: atest CtsOsTestCases:android.os.cts.BuildTest
Change-Id: Ie648f241d3d2deb5de2b937916df7ce3d7d15014
2023-12-07 19:44:17 +00:00
Micha Schwab
19a73dbbae Merge "Add metadata to aconfig" into main am: 56835092e4 am: 067bb6643d am: 71c1fbc958
Original change: https://android-review.googlesource.com/c/platform/build/+/2851033

Change-Id: Icd709fb2ce8ffd94cee3deb9d314254971a1d2d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 17:50:50 +00:00
Micha Schwab
8d02a20932 Merge "Add metadata to aconfig" into main am: 56835092e4 am: 558eb199a5 am: bc2314b66a
Original change: https://android-review.googlesource.com/c/platform/build/+/2851033

Change-Id: If8ed530d99faaaf08dda2b758091728937108e14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 17:48:40 +00:00
Micha Schwab
71c1fbc958 Merge "Add metadata to aconfig" into main am: 56835092e4 am: 067bb6643d
Original change: https://android-review.googlesource.com/c/platform/build/+/2851033

Change-Id: I73c32ee6be34d4e8cb181d25015975e16c70120c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 17:32:48 +00:00
Micha Schwab
bc2314b66a Merge "Add metadata to aconfig" into main am: 56835092e4 am: 558eb199a5
Original change: https://android-review.googlesource.com/c/platform/build/+/2851033

Change-Id: Id173f64e39a9ac00ec30244812b800d37613a32d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 17:16:28 +00:00
Micha Schwab
067bb6643d Merge "Add metadata to aconfig" into main am: 56835092e4
Original change: https://android-review.googlesource.com/c/platform/build/+/2851033

Change-Id: I737e31f91270ed5e3ba2721788fbb3237c51175b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 16:55:10 +00:00
Micha Schwab
558eb199a5 Merge "Add metadata to aconfig" into main am: 56835092e4
Original change: https://android-review.googlesource.com/c/platform/build/+/2851033

Change-Id: I98875da1016541e05fdeec0b3fde92296049b864
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 16:42:25 +00:00
Micha Schwab
56835092e4 Merge "Add metadata to aconfig" into main 2023-12-07 15:55:18 +00:00
Hansen Kurli
fa92526d35 Remove racoon, mtpd, pppd, ip-up-vpn
Legacy VPN types are removed. These are now unused.

Bug: 161776767
Test: m
Change-Id: I2ccc10d9c8680a6de9160e07e726312bc7b1fdc9
2023-12-07 19:20:14 +08:00
Treehugger Robot
b73c6365e2 Merge "Update create_brick_ota doc" into main am: ed339976c6 am: 9b89598e89 am: a71273fbe2
Original change: https://android-review.googlesource.com/c/platform/build/+/2863186

Change-Id: Iffa0ff9e7ffd43d83b3af528e430bd196b807ac8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 00:34:57 +00:00
Treehugger Robot
a71273fbe2 Merge "Update create_brick_ota doc" into main am: ed339976c6 am: 9b89598e89
Original change: https://android-review.googlesource.com/c/platform/build/+/2863186

Change-Id: I9e25ab99239f7cc6eb079efe7746449499161cf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 00:01:54 +00:00
Treehugger Robot
c5eb14c90a Merge "Update create_brick_ota doc" into main am: ed339976c6 am: f41a3011f2 am: 6f8ae6f124
Original change: https://android-review.googlesource.com/c/platform/build/+/2863186

Change-Id: I0b450a72504ab2daf45cdef1eee200254d6f1ff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 23:45:46 +00:00
Treehugger Robot
9b89598e89 Merge "Update create_brick_ota doc" into main am: ed339976c6
Original change: https://android-review.googlesource.com/c/platform/build/+/2863186

Change-Id: I9c5fd1b55ff082c453c52a4b2c7994a5a82e3e4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 23:30:40 +00:00
Treehugger Robot
6f8ae6f124 Merge "Update create_brick_ota doc" into main am: ed339976c6 am: f41a3011f2
Original change: https://android-review.googlesource.com/c/platform/build/+/2863186

Change-Id: I6db09dfb033835244077fa0bfa08d49a22b65719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 23:14:20 +00:00
Treehugger Robot
f41a3011f2 Merge "Update create_brick_ota doc" into main am: ed339976c6
Original change: https://android-review.googlesource.com/c/platform/build/+/2863186

Change-Id: I50295e40fb9b0a1a6db6e28cc7f8a98cbf9930e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 22:44:47 +00:00