Commit Graph

32035 Commits

Author SHA1 Message Date
Xin Li
c045ec9dd2 Merge Android 12 QPR3 ab/8391262
Bug: 226662282
Merged-In: I01040f537f57008e11d5aa693591fa8adab2c6b1
Change-Id: I08cc6f3157b735cf8a59136961de1229c3162443
2022-04-01 20:31:51 +00:00
Rob Seymour
f0651f3179 Merge "Do not install host snapshot modules with existing prebuilts." am: 3f04ab2fb4 am: 2a581813c8
Original change: https://android-review.googlesource.com/c/platform/development/+/2045663

Change-Id: I01040f537f57008e11d5aa693591fa8adab2c6b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 01:25:33 +00:00
Rob Seymour
2a581813c8 Merge "Do not install host snapshot modules with existing prebuilts." am: 3f04ab2fb4
Original change: https://android-review.googlesource.com/c/platform/development/+/2045663

Change-Id: I7b639fc71bf3ad51aa5e0e4029eb8a149029a04f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 01:06:53 +00:00
Rob Seymour
3f04ab2fb4 Merge "Do not install host snapshot modules with existing prebuilts." 2022-03-30 00:52:39 +00:00
Rob Seymour
01a4f9b2e3 Do not install host snapshot modules with existing prebuilts.
Host fake snapshot includes a prebuilt attribute for a host module
that already contains a prebuilt version in the source tree.  When
installing the host snapshot ignore any modules that already contains
a prebuilt version.

Bug: 225890931
Test: m HOST_FAKE_SNAPSHOT_ENABLE=true host-fake-snapshot dist
Test: install fake snapshot with update.py and validate prebuilt modules are not included
Change-Id: Ia8bb44c00ad5fc448ab9110d840d9059ae3294f9
2022-03-29 16:09:25 +00:00
Ivan Lozano
b1c9f7f199 Merge "Add Rust proc-macros to host snapshot update.py" am: ffb96b63ef am: aa52716392
Original change: https://android-review.googlesource.com/c/platform/development/+/2041926

Change-Id: Ieeec48a0938001b1795eee666ec4628fc49f32cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 14:32:50 +00:00
Ivan Lozano
aa52716392 Merge "Add Rust proc-macros to host snapshot update.py" am: ffb96b63ef
Original change: https://android-review.googlesource.com/c/platform/development/+/2041926

Change-Id: I563e92a84754286353eab4872303a81aa2302c93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 14:08:26 +00:00
Ivan Lozano
ffb96b63ef Merge "Add Rust proc-macros to host snapshot update.py" 2022-03-29 13:29:24 +00:00
Treehugger Robot
98f38b55ae Merge "Revert "Add parameters to repack_kernels.sh"" am: 681bf56a56 am: 2b26a37959
Original change: https://android-review.googlesource.com/c/platform/development/+/2046245

Change-Id: Ieb33f734348ff56632a185501f0394a9a21e25ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 04:13:54 +00:00
Treehugger Robot
2b26a37959 Merge "Revert "Add parameters to repack_kernels.sh"" am: 681bf56a56
Original change: https://android-review.googlesource.com/c/platform/development/+/2046245

Change-Id: I77a92487c43e0001892896b88f0584496b5d02f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 03:53:28 +00:00
Treehugger Robot
681bf56a56 Merge "Revert "Add parameters to repack_kernels.sh"" 2022-03-29 03:27:21 +00:00
SzuWei Lin
5384e2bd34 Revert "Add parameters to repack_kernels.sh"
This reverts commit a2a360813f.

Reason for revert: build errors

Change-Id: I33df157af39e148adef1e26e8b06e25157d78397
2022-03-29 01:34:10 +00:00
Treehugger Robot
85356a30f2 Merge "Add parameters to repack_kernels.sh" am: 3e0d53dc2f am: e6bd773e2e
Original change: https://android-review.googlesource.com/c/platform/development/+/2044646

Change-Id: I45b171936cad7d53f6a769f0feb008770f8af248
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:36:41 +00:00
Treehugger Robot
e6bd773e2e Merge "Add parameters to repack_kernels.sh" am: 3e0d53dc2f
Original change: https://android-review.googlesource.com/c/platform/development/+/2044646

Change-Id: I3b3f99b0f02dd13956ee520ffc5fec3adc92a37d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:15:24 +00:00
Treehugger Robot
3e0d53dc2f Merge "Add parameters to repack_kernels.sh" 2022-03-28 06:53:23 +00:00
SzuWei Lin
a2a360813f Add parameters to repack_kernels.sh
To handle different CPU architectures and build variants. To avoid
output dist/kernel/*-debug folder on user builds

Bug: 226297708
Test: TH
Change-Id: I8ebfa00cb3f9e54bc131d8226cf756f92335be19
2022-03-25 12:46:41 +08:00
Treehugger Robot
b12f537798 Merge "Remove obsolete OWNER." am: c59205de2a am: 56dce3334b
Original change: https://android-review.googlesource.com/c/platform/development/+/2042670

Change-Id: I2114e02557a70de5984c6a647343891b4d4fd63f
Signed-off-by: Automerger Merge Worker
2022-03-24 23:04:04 +00:00
Treehugger Robot
56dce3334b Merge "Remove obsolete OWNER." am: c59205de2a
Original change: https://android-review.googlesource.com/c/platform/development/+/2042670

Change-Id: Ice3b01b8fc1dbf8621a9caad426b2379bbb18643
Signed-off-by: Automerger Merge Worker
2022-03-24 22:41:30 +00:00
Treehugger Robot
c59205de2a Merge "Remove obsolete OWNER." 2022-03-24 22:22:30 +00:00
Ivan Lozano
5a747c7b55 Add Rust proc-macros to host snapshot update.py
Bug: 204304380
Test: The host snapshot Android.bp includes proc-macros.
Change-Id: I7d406d9075fc5a6aa5983a5fef71edd119c6f67f
2022-03-24 15:33:38 -04:00
Dan Albert
22902078f1 Remove obsolete OWNER.
Test: None
Bug: None
Change-Id: I0bbaafb392b5283edd0ec49de3d15a3dd7834173
2022-03-24 12:22:59 -07:00
Treehugger Robot
741f9d7763 Merge "Avoid duplicated module name for vndk_prebuilt_shared" am: 9ad7ca0281 am: 978343d3b1
Original change: https://android-review.googlesource.com/c/platform/development/+/2031883

Change-Id: I05d57b0bcf086d6d4363725be335c4f83318e408
2022-03-21 06:10:34 +00:00
Treehugger Robot
978343d3b1 Merge "Avoid duplicated module name for vndk_prebuilt_shared" am: 9ad7ca0281
Original change: https://android-review.googlesource.com/c/platform/development/+/2031883

Change-Id: I11ec10df51ded4e14ef3bd20e8eb1f7200e25644
2022-03-21 05:37:37 +00:00
Treehugger Robot
9ad7ca0281 Merge "Avoid duplicated module name for vndk_prebuilt_shared" 2022-03-21 05:11:08 +00:00
Justin Yun
fea111c2a7 Avoid duplicated module name for vndk_prebuilt_shared
There may have prebuilt files that share a single name causing
duplicated module name error. Fix this bug by generating the
vndk_prebuilt_shared module per each module name.

Bug: 225265099
Bug: 225243872
Test: development/vndk/snapshot/gen_buildfiles.py
Change-Id: I2f6df9956d33b2ed0e901d73c93621ff4727370d
2022-03-18 12:03:52 +00:00
Treehugger Robot
0a24a459cf Merge "Add open_then_run to TEST_EXCLUDE" am: 8d976b785a am: 81bd698d16
Original change: https://android-review.googlesource.com/c/platform/development/+/2026903

Change-Id: I5393087c8e3a8e3829c956ee41a88a2c4dce7400
2022-03-16 18:35:56 +00:00
Treehugger Robot
81bd698d16 Merge "Add open_then_run to TEST_EXCLUDE" am: 8d976b785a
Original change: https://android-review.googlesource.com/c/platform/development/+/2026903

Change-Id: Id2f5a43d429b6353c2d7e167218e5c352f0acd2e
2022-03-16 18:05:02 +00:00
Treehugger Robot
8d976b785a Merge "Add open_then_run to TEST_EXCLUDE" 2022-03-16 17:32:36 +00:00
Hsin-Yi Chen
13a93dc38b Merge "Remove arch variants from ABI dump directory names" am: 6daaa86fc1 am: a91eda5b71
Original change: https://android-review.googlesource.com/c/platform/development/+/2018035

Change-Id: Iaad678c4809405a72aa3c395e09df70552c08f21
2022-03-16 03:02:08 +00:00
Hsin-Yi Chen
a91eda5b71 Merge "Remove arch variants from ABI dump directory names" am: 6daaa86fc1
Original change: https://android-review.googlesource.com/c/platform/development/+/2018035

Change-Id: I00f9319e5711cc639044b3c6dfca46957719668a
2022-03-16 02:34:33 +00:00
Hsin-Yi Chen
6daaa86fc1 Merge "Remove arch variants from ABI dump directory names" 2022-03-16 02:09:40 +00:00
David LeGare
d3bbf8cb7f Add open_then_run to TEST_EXCLUDE
Test: manual - Performed bulk update of crate TEST_MAPPING files
Change-Id: I39f7696eb1a0633d002a534ad21cc5f460eeee8c
2022-03-15 16:01:49 +00:00
Treehugger Robot
50a4e41856 Merge "Output system_dlkm_staging_archive.tar.gz to dist folder" am: 87142847ad am: d0b2af43eb
Original change: https://android-review.googlesource.com/c/platform/development/+/2022796

Change-Id: Id4629f271ce711c1d7750ea73f4182f9e5c5a32f
2022-03-14 04:15:01 +00:00
Treehugger Robot
d0b2af43eb Merge "Output system_dlkm_staging_archive.tar.gz to dist folder" am: 87142847ad
Original change: https://android-review.googlesource.com/c/platform/development/+/2022796

Change-Id: Ia368a91a2fe74d25c7b5c3b79eed263d92384503
2022-03-14 03:53:07 +00:00
Treehugger Robot
87142847ad Merge "Output system_dlkm_staging_archive.tar.gz to dist folder" 2022-03-14 03:29:40 +00:00
SzuWei Lin
887386c263 Output system_dlkm_staging_archive.tar.gz to dist folder
Bug: 223726390
Test: TH
Change-Id: Iba067ad36ce2ce1f05035d39fb6eb2730880a436
2022-03-14 10:24:04 +08:00
Treehugger Robot
ec4e699101 Merge "Output system_dlkm.img to dist folder" am: 2a8587c729 am: 25985f1fc2
Original change: https://android-review.googlesource.com/c/platform/development/+/2019975

Change-Id: I046b786283138e076508d0efd8b43e0309df849d
2022-03-10 11:36:12 +00:00
Treehugger Robot
25985f1fc2 Merge "Output system_dlkm.img to dist folder" am: 2a8587c729
Original change: https://android-review.googlesource.com/c/platform/development/+/2019975

Change-Id: I0cc92f3e96254ef584c629dcf95a1c0e33350cbb
2022-03-10 11:12:45 +00:00
Treehugger Robot
2a8587c729 Merge "Output system_dlkm.img to dist folder" 2022-03-10 10:46:46 +00:00
SzuWei Lin
20a24006ec Output system_dlkm.img to dist folder
Bug: 223726390
Test: TH
Change-Id: I7a03162dfb7770381c8465a279379b3fa5dfed84
2022-03-10 17:34:14 +08:00
Hsin-Yi Chen
5dee7b0454 Remove arch variants from ABI dump directory names
The build system finds the ABI dumps in the directories named
<TARGET_ARCH> and <TARGET_2ND_ARCH>_<TARGET_ARCH>. The ABI of the
non-generic arch variants are compared with the dumps.

Bug: 213127415
Test: ./create_reference_dumps.py
Change-Id: I3924092a75e2b9b68f5f60ece86a9d46537384f9
2022-03-10 15:35:32 +08:00
Treehugger Robot
0ef7a0ca03 Merge "Add install_in_root property to VSDK generated Android.bp." am: ffdc3be22a am: 15251d849c
Original change: https://android-review.googlesource.com/c/platform/development/+/2012417

Change-Id: Ica740286d631391a7c47afa3d1c6100240fc8d14
2022-03-08 18:02:20 +00:00
Treehugger Robot
15251d849c Merge "Add install_in_root property to VSDK generated Android.bp." am: ffdc3be22a
Original change: https://android-review.googlesource.com/c/platform/development/+/2012417

Change-Id: I09a8f0c2c9a033fe36b0ec9438a8a8b1aa78d9dc
2022-03-08 17:37:43 +00:00
Treehugger Robot
ffdc3be22a Merge "Add install_in_root property to VSDK generated Android.bp." 2022-03-08 17:10:54 +00:00
Xin Li
09fcb1673a [automerger skipped] Merge "Merge Android 12L" am: f8d6bfd1b9 -s ours am: e7c4955805 -s ours
am skip reason: Merged-In I513aa15f5d655ac3fbb535797659d3654ccfec5e with SHA-1 bf674ec373 is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2012637

Change-Id: I2e49601360d9c093ed1dbbcf24452529a5b858cf
2022-03-08 11:06:54 +00:00
Xin Li
67a21794bf [automerger skipped] Merge Android 12L am: dbe0f25851 -s ours am: c4c2173037 -s ours
am skip reason: Merged-In I513aa15f5d655ac3fbb535797659d3654ccfec5e with SHA-1 bf674ec373 is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2012637

Change-Id: I6f5c78bc7c74e21061d61ec96b24ab8ce890a46e
2022-03-08 11:03:58 +00:00
Xin Li
e7c4955805 [automerger skipped] Merge "Merge Android 12L" am: f8d6bfd1b9 -s ours
am skip reason: Merged-In I513aa15f5d655ac3fbb535797659d3654ccfec5e with SHA-1 bf674ec373 is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2012637

Change-Id: Ib81de7f10430f79d203fd8129633b36689930e47
2022-03-08 10:22:05 +00:00
Xin Li
c4c2173037 [automerger skipped] Merge Android 12L am: dbe0f25851 -s ours
am skip reason: Merged-In I513aa15f5d655ac3fbb535797659d3654ccfec5e with SHA-1 bf674ec373 is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2012637

Change-Id: I0f3d40fc9b2d3b865635b0b27f37b9d6f04d1aae
2022-03-08 10:19:07 +00:00
Xin Li
f8d6bfd1b9 Merge "Merge Android 12L" 2022-03-08 06:53:24 +00:00
Xin Li
dbe0f25851 Merge Android 12L
Bug: 222710654
Merged-In: I513aa15f5d655ac3fbb535797659d3654ccfec5e
Change-Id: I0e4553be8788fcb5ca9e9d534ed47ac82b52a427
2022-03-08 00:14:10 +00:00