Commit graph

87772 commits

Author SHA1 Message Date
Matthew Sedam
b5b285c4e9 Merge "Fix small spelling error in build/core/main.mk" am: d104c386f6 am: cfc47399f1 am: a9ba4d2aac am: 2ad1c6402a am: 5e5e038399
Original change: https://android-review.googlesource.com/c/platform/build/+/2597518

Change-Id: I8077b1fe0bb9d13909998b41a46b084853214dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 19:02:24 +00:00
Anton Hansson
7c0628b3b8 Merge "Don't add build ID to version name" am: 08b97147ac am: 9ef02252a6
Original change: https://android-review.googlesource.com/c/platform/build/+/2594246

Change-Id: I9c380b5cbd82065f5e23cf6ce329c74118a0e5e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 18:56:07 +00:00
Matthew Sedam
5e5e038399 Merge "Fix small spelling error in build/core/main.mk" am: d104c386f6 am: cfc47399f1 am: a9ba4d2aac am: 2ad1c6402a
Original change: https://android-review.googlesource.com/c/platform/build/+/2597518

Change-Id: I79139e5a49eb5cf2c3187f22d4730ce50565e336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 18:18:18 +00:00
Anton Hansson
9ef02252a6 Merge "Don't add build ID to version name" am: 08b97147ac
Original change: https://android-review.googlesource.com/c/platform/build/+/2594246

Change-Id: I601913fd85a87ffebc248845bc77a4ecbd78c66c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 18:16:39 +00:00
Anton Hansson
08b97147ac Merge "Don't add build ID to version name" 2023-05-22 17:43:10 +00:00
Matthew Sedam
2ad1c6402a Merge "Fix small spelling error in build/core/main.mk" am: d104c386f6 am: cfc47399f1 am: a9ba4d2aac
Original change: https://android-review.googlesource.com/c/platform/build/+/2597518

Change-Id: I7b834b4b2eaa3b58d1ca4379a983944d711940c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 17:38:16 +00:00
Satoshi Futenma
792dfa537a Add merge_ota to otatools
Bug: 282189563
Test: manual, m otatools-package, confirm that merga_ota is
    present in otatools.zip
(cherry picked from https://android-review.googlesource.com/q/commit:6d56d45f96cc1f4e45141bfd04cd92551451d3f5)
Merged-In: I40c3866bfb016aa1dec1c6dc2d95c66deb1e61ea
Change-Id: I40c3866bfb016aa1dec1c6dc2d95c66deb1e61ea
2023-05-22 17:31:49 +00:00
Kelvin Zhang
2268091521 Unsparse images before generating OTA
Test: th
Bug: 283172692
Change-Id: Ie6d3dc704fd9a8c107e2888222e4c2bf804dad3e
2023-05-22 10:22:59 -07:00
Matthew Sedam
a9ba4d2aac Merge "Fix small spelling error in build/core/main.mk" am: d104c386f6 am: cfc47399f1
Original change: https://android-review.googlesource.com/c/platform/build/+/2597518

Change-Id: Ib188aff36830eb29cb53c71660b1a07a2bfecca3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 16:42:04 +00:00
Matthew Sedam
cfc47399f1 Merge "Fix small spelling error in build/core/main.mk" am: d104c386f6
Original change: https://android-review.googlesource.com/c/platform/build/+/2597518

Change-Id: I85adc59cbb50530251748c17a3c2a64604e85bb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 16:14:07 +00:00
Matthew Sedam
d104c386f6 Merge "Fix small spelling error in build/core/main.mk" 2023-05-22 15:45:43 +00:00
Treehugger Robot
52c041e8d7 Merge changes from topic "aconfig-stable-flag-order" am: f469fd6cc6 am: 1ad09e0bfa am: 90ea531bb2 am: f44cf94667 am: ffa3d13926
Original change: https://android-review.googlesource.com/c/platform/build/+/2595206

Change-Id: Iee71188b5a251105feaa7ef96a9c97f52f5e0df7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 14:20:57 +00:00
Treehugger Robot
ffa3d13926 Merge changes from topic "aconfig-stable-flag-order" am: f469fd6cc6 am: 1ad09e0bfa am: 90ea531bb2 am: f44cf94667
Original change: https://android-review.googlesource.com/c/platform/build/+/2595206

Change-Id: I85b3ba7c355b464e3151dc0c33fb55fa3a5b6b17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 13:52:51 +00:00
Treehugger Robot
f44cf94667 Merge changes from topic "aconfig-stable-flag-order" am: f469fd6cc6 am: 1ad09e0bfa am: 90ea531bb2
Original change: https://android-review.googlesource.com/c/platform/build/+/2595206

Change-Id: I08cd699e067580ed95a6d17c2a47cecd0e88db54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 13:23:47 +00:00
Treehugger Robot
90ea531bb2 Merge changes from topic "aconfig-stable-flag-order" am: f469fd6cc6 am: 1ad09e0bfa
Original change: https://android-review.googlesource.com/c/platform/build/+/2595206

Change-Id: I9e812cef63f8786585db3154626f76ab1d1d5f64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 12:56:59 +00:00
Treehugger Robot
1ad09e0bfa Merge changes from topic "aconfig-stable-flag-order" am: f469fd6cc6
Original change: https://android-review.googlesource.com/c/platform/build/+/2595206

Change-Id: Ic66ea4047487b6f8c4c51237bf583d035b7032d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 12:30:11 +00:00
Treehugger Robot
f469fd6cc6 Merge changes from topic "aconfig-stable-flag-order"
* changes:
  aconfig: sort items in cache by name
  aconfig: dump: support multiple caches
2023-05-22 12:15:06 +00:00
Mårten Kongstad
2f95444281 aconfig: sort items in cache by name
Introduce a builder pattern for constructing a cache from flag
declarations and flag values. Teach the builder to sort the flags by
name as the last step. This will ensure consistent dump output
regardless of the order flags are specified in the input files.

Bug: 279485059
Test: atest aconfig.test
Change-Id: Icdd62f51fa3761a469663f17581a83d9909e9ffe
2023-05-22 10:01:05 +02:00
Mårten Kongstad
af677038b3 aconfig: dump: support multiple caches
Teach `aconfig dump` to read multiple caches at the same time.

A cache represents a single namespace, and the Android build creates
multiple caches for different namespaces. By passing in all those cache
files to `aconfig dump`, aconfig will create a complete overview of all
flags in the Android tree.

Caches are traversed in order of namespace to produce the same output
regardless of the order the cache files are given on the command line.
If two caches use the same namespace, their order with respect to each
other is undefined.

Bug: 279485059
Test: atest aconfig.test
Change-Id: I54c3950bbb7b2be7d96c8928e78ae83aa626c2e2
2023-05-22 09:57:48 +02:00
Jeongik Cha
b35b330f7b Merge "Introduce dist-for-goals-with-filenametag" am: 07cfdab76a am: 1622541b05 am: f75b936fd1 am: 5283549e42 am: a9e7460c4e
Original change: https://android-review.googlesource.com/c/platform/build/+/2567250

Change-Id: Ib62c8092bbfec86805fd52ca431ec1c5e5c19caa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 04:47:17 +00:00
Jeongik Cha
a9e7460c4e Merge "Introduce dist-for-goals-with-filenametag" am: 07cfdab76a am: 1622541b05 am: f75b936fd1 am: 5283549e42
Original change: https://android-review.googlesource.com/c/platform/build/+/2567250

Change-Id: I3a6ab7638c4e739dfe203c293a114b00e700e720
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 04:18:24 +00:00
Jeongik Cha
5283549e42 Merge "Introduce dist-for-goals-with-filenametag" am: 07cfdab76a am: 1622541b05 am: f75b936fd1
Original change: https://android-review.googlesource.com/c/platform/build/+/2567250

Change-Id: Ie245028a08325b575f3b3ea2ac4aef3a0a19c423
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 03:51:56 +00:00
Jeongik Cha
f75b936fd1 Merge "Introduce dist-for-goals-with-filenametag" am: 07cfdab76a am: 1622541b05
Original change: https://android-review.googlesource.com/c/platform/build/+/2567250

Change-Id: I06b1e156c5d3fe952337863872e493e978bc1928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 03:25:38 +00:00
Jeongik Cha
1622541b05 Merge "Introduce dist-for-goals-with-filenametag" am: 07cfdab76a
Original change: https://android-review.googlesource.com/c/platform/build/+/2567250

Change-Id: Ie697682a5c01c8c25db6f9eba58848f8d3fa2d8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 03:00:16 +00:00
Jeongik Cha
07cfdab76a Merge "Introduce dist-for-goals-with-filenametag" 2023-05-22 02:25:45 +00:00
Joe Onorato
f70c4bb2aa Merge "Revert "Define release flags in starlark instead of make"" am: 2f1f4c25f7 am: f54a552cc5 am: 87d0ddc115 am: a5ab48113a am: 6a70de644b
Original change: https://android-review.googlesource.com/c/platform/build/+/2595631

Change-Id: Ic9a3a608366eb3a747edda042950e97eb8d69270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 04:01:49 +00:00
Joe Onorato
6a70de644b Merge "Revert "Define release flags in starlark instead of make"" am: 2f1f4c25f7 am: f54a552cc5 am: 87d0ddc115 am: a5ab48113a
Original change: https://android-review.googlesource.com/c/platform/build/+/2595631

Change-Id: Ib8ab34f61142f0d21237a99ac5ee7623b6367da0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 03:34:42 +00:00
Joe Onorato
a5ab48113a Merge "Revert "Define release flags in starlark instead of make"" am: 2f1f4c25f7 am: f54a552cc5 am: 87d0ddc115
Original change: https://android-review.googlesource.com/c/platform/build/+/2595631

Change-Id: I8d3d7466b916cd98a58e17dcfe5d9b47f5798068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 03:10:00 +00:00
Joe Onorato
87d0ddc115 Merge "Revert "Define release flags in starlark instead of make"" am: 2f1f4c25f7 am: f54a552cc5
Original change: https://android-review.googlesource.com/c/platform/build/+/2595631

Change-Id: Iac619d584c63af116ec490d4707b3912c46051a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 02:46:40 +00:00
Joe Onorato
f54a552cc5 Merge "Revert "Define release flags in starlark instead of make"" am: 2f1f4c25f7
Original change: https://android-review.googlesource.com/c/platform/build/+/2595631

Change-Id: I0d7ebe8a487ee1699268fc14d618614855079c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 02:22:50 +00:00
Treehugger Robot
9cd47bd8ff Merge "16k: Add 16K variant kernel/ramdisk build targets" am: c179330edb am: 233236fa17 am: 4552dd8a21 am: 562fabb016 am: 40ce3a4348
Original change: https://android-review.googlesource.com/c/platform/build/+/2595672

Change-Id: Ib5371825f26dc4cb8b61d6718473453084948899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 01:58:18 +00:00
Joe Onorato
2f1f4c25f7 Merge "Revert "Define release flags in starlark instead of make"" 2023-05-20 01:52:53 +00:00
Treehugger Robot
40ce3a4348 Merge "16k: Add 16K variant kernel/ramdisk build targets" am: c179330edb am: 233236fa17 am: 4552dd8a21 am: 562fabb016
Original change: https://android-review.googlesource.com/c/platform/build/+/2595672

Change-Id: I68756edc12917698d0320d2f63501255aca360ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 01:33:28 +00:00
Treehugger Robot
562fabb016 Merge "16k: Add 16K variant kernel/ramdisk build targets" am: c179330edb am: 233236fa17 am: 4552dd8a21
Original change: https://android-review.googlesource.com/c/platform/build/+/2595672

Change-Id: I21aa0bd8ff51d4ecee87d4ec4172ec25384d3f5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 01:09:48 +00:00
Treehugger Robot
4552dd8a21 Merge "16k: Add 16K variant kernel/ramdisk build targets" am: c179330edb am: 233236fa17
Original change: https://android-review.googlesource.com/c/platform/build/+/2595672

Change-Id: If6ae27053c6866ef9404e3546712b63085d070fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 00:46:04 +00:00
Treehugger Robot
233236fa17 Merge "16k: Add 16K variant kernel/ramdisk build targets" am: c179330edb
Original change: https://android-review.googlesource.com/c/platform/build/+/2595672

Change-Id: Ib67f680d06d79b0946430fe6d686baf260b0a528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 00:22:26 +00:00
Treehugger Robot
c179330edb Merge "16k: Add 16K variant kernel/ramdisk build targets" 2023-05-20 00:11:16 +00:00
Wei Li
1e3cf6d665 [automerger skipped] Merge changes from topic "cherrypicker-L80700000960770298:N69600001370607907" into udc-dev am: f96858a818 am: 89dd3c7e38 am: 90d290f97c -s ours
am skip reason: Merged-In I41622366e5e6ed9dc78cca7bc7bb69a1f8f9bd9f with SHA-1 233d5b97f8 is already in history

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

Change-Id: I72e8ae282c4735d309b0ff6e1e5112e5f37b199d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 23:59:43 +00:00
Wei Li
5f4ef73772 [automerger skipped] Export some make variables to soong.variables. am: d637b06d8f am: 02959543d0 am: c51b703b2f -s ours
am skip reason: Merged-In I2e7a07007224364418659453d979e2bee58fe5f9 with SHA-1 d637b06d8f is already in history

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

Change-Id: I671573c3e31c82db99964c7a786c219a44cdd10b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 23:59:40 +00:00
Wei Li
09623e3ebb [automerger skipped] Merge changes from topic "cherrypicker-L80700000960770298:N69600001370607907" into udc-dev am: f96858a818 am: 89dd3c7e38 -s ours am: 6c4b4c19e9 -s ours
am skip reason: Merged-In I41622366e5e6ed9dc78cca7bc7bb69a1f8f9bd9f with SHA-1 233d5b97f8 is already in history

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

Change-Id: I3cbe64343faa933059f34fb186d45cc2eb3f3198
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 23:13:47 +00:00
Wei Li
448714c62e [automerger skipped] Export some make variables to soong.variables. am: d637b06d8f am: 02959543d0 -s ours am: 5db9488bbb -s ours
am skip reason: Merged-In I2e7a07007224364418659453d979e2bee58fe5f9 with SHA-1 d637b06d8f is already in history

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

Change-Id: Ib18b39135f15c95be88dcec1c09d306e40507a5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 23:13:43 +00:00
Automerger Merge Worker
6d4e81430f [automerger skipped] Merge changes from topic "am-5a6f444331ae472aaeb494acba3b9515" into udc-dev-plus-aosp am: e876500b08 -s ours am: b0ea07fc2c -s ours
am skip reason: Merged-In I41622366e5e6ed9dc78cca7bc7bb69a1f8f9bd9f with SHA-1 fd7e6517d3 is already in history

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

Change-Id: Iccbe286067d899b8bb33a8a53e1fc23bd725a49d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 23:13:11 +00:00
Wei Li
7ee7fc6d7b [automerger skipped] Merge changes from topic "cherrypicker-L80700000960770298:N69600001370607907" into udc-dev am: f96858a818 -s ours am: 377f88a664 -s ours am: 284d7bbaf8 -s ours
am skip reason: Merged-In I41622366e5e6ed9dc78cca7bc7bb69a1f8f9bd9f with SHA-1 fd7e6517d3 is already in history

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

Change-Id: I995aad7db9920be03619dcdf159cc011452aa817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 23:13:08 +00:00
Kelvin Zhang
1688d93544 Merge "Revert "16k: Add 16K variant kernel/ramdisk build targets"" am: 863cba2c1d am: f6da3925e4 am: 16edf2b59f am: 3e067dc7b8 am: 590b9d3c7d
Original change: https://android-review.googlesource.com/c/platform/build/+/2598005

Change-Id: I73d7a8a8340eab674e163abbbd3de1d54b52ed48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 23:12:40 +00:00
Wei Li
90d290f97c Merge changes from topic "cherrypicker-L80700000960770298:N69600001370607907" into udc-dev am: f96858a818 am: 89dd3c7e38
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23305031

Change-Id: If069426ce804cda66ec7d1cad78b8134080fc77e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 23:10:30 +00:00
Wei Li
c51b703b2f Export some make variables to soong.variables. am: d637b06d8f am: 02959543d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23305028

Change-Id: Ibeca00ccd1fed1a4c268b1f2efaf3ff5c1ab1976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 23:10:26 +00:00
Wei Li
6c4b4c19e9 [automerger skipped] Merge changes from topic "cherrypicker-L80700000960770298:N69600001370607907" into udc-dev am: f96858a818 am: 89dd3c7e38 -s ours
am skip reason: Merged-In I41622366e5e6ed9dc78cca7bc7bb69a1f8f9bd9f with SHA-1 233d5b97f8 is already in history

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

Change-Id: Idbf5c3d6d649d1aae886e50a8ba101b4263dcc64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 23:07:03 +00:00
Wei Li
5db9488bbb [automerger skipped] Export some make variables to soong.variables. am: d637b06d8f am: 02959543d0 -s ours
am skip reason: Merged-In I2e7a07007224364418659453d979e2bee58fe5f9 with SHA-1 d637b06d8f is already in history

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

Change-Id: I9116fe6ed58853fcd5137999be9e5517985bc590
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 23:07:00 +00:00
Automerger Merge Worker
b0ea07fc2c Merge changes from topic "am-5a6f444331ae472aaeb494acba3b9515" into udc-dev-plus-aosp am: e876500b08 -s ours
am skip reason: Merged-In I41622366e5e6ed9dc78cca7bc7bb69a1f8f9bd9f with SHA-1 fd7e6517d3 is already in history

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

Change-Id: I147b637686b7f7a4f9c2ab80c41cf0c2c925da01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 22:47:18 +00:00
Wei Li
284d7bbaf8 [automerger skipped] Merge changes from topic "cherrypicker-L80700000960770298:N69600001370607907" into udc-dev am: f96858a818 -s ours am: 377f88a664 -s ours
am skip reason: Merged-In I41622366e5e6ed9dc78cca7bc7bb69a1f8f9bd9f with SHA-1 fd7e6517d3 is already in history

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

Change-Id: I8fa44447ec1f57422b76136a218c1e3d9e7c02cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 22:47:16 +00:00