Spandan Das
0c01c90544
Update hardcoded references to android_*stubs_current
...
The hardcoded references should be updated to variables exported by
Soong. This enables the stub selection logic to exist in a single place.
Test: TH
Test: No change in out/build-<lunch_product>.ninja
Change-Id: I153f1c6ffc6c93d8a64c3edfef3e8d52c84207a3
2023-03-20 21:59:18 +00:00
Cole Faust
e08325fb55
Merge "Create image apexes by default instead of flattened apexes" am: 14108b6a57
am: 299878fb17
am: bfbb7718c7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2491212
Change-Id: I66d57643ba132b420edf9725d9b4bd36457f692f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 21:52:52 +00:00
Treehugger Robot
3c79e80233
Merge "Add rkpd to the list of individually toggleable modules" am: 5f3ddd4f41
am: 708b70a554
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2497575
Change-Id: I9479b1cc06bcd4d2abd5ac4009bfa92b4f24acfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 21:16:00 +00:00
Cole Faust
bfbb7718c7
Merge "Create image apexes by default instead of flattened apexes" am: 14108b6a57
am: 299878fb17
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2491212
Change-Id: Ie773663bd3cd5770af0e754ee29c9f411d574244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 21:14:47 +00:00
Treehugger Robot
1e06b554b6
Merge "[config] Boards can supply custom super image script" am: 6dcf429d8f
am: d90bc8e5ee
am: 96a1cfe673
am: 76394be62a
am: dbc50126f9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2496355
Change-Id: I72100f90e9619b3f8410a4460180458bbb5731bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 21:14:31 +00:00
YoungJoon Yang
4d291ec5ee
Adding BOARD_NON_AB_OTA_DISABLE_COMPRESSION
...
Brotli decompression error occured during sideloading non A/B full OTA.
The flag disable brotli compression for non A/B full OTA.
The flag set if a device supports non A/B update.
Bug: 248350283
Test: build and sideload the full ota package.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:64f700aad93501edbcfb0d2fa81b3bacc2194a73 )
Merged-In: I1a7dcd0cbfc425629ec4a8b7dbe18f2937571c09
Change-Id: I1a7dcd0cbfc425629ec4a8b7dbe18f2937571c09
2023-03-20 21:04:42 +00:00
Treehugger Robot
5f3ddd4f41
Merge "Add rkpd to the list of individually toggleable modules"
2023-03-20 20:41:51 +00:00
Cole Faust
14108b6a57
Merge "Create image apexes by default instead of flattened apexes"
2023-03-20 19:54:49 +00:00
Treehugger Robot
76394be62a
Merge "[config] Boards can supply custom super image script" am: 6dcf429d8f
am: d90bc8e5ee
am: 96a1cfe673
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2496355
Change-Id: If650e824bbf7f7446e3c4b922dd8a471d3a8e543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 19:47:23 +00:00
Treehugger Robot
96a1cfe673
Merge "[config] Boards can supply custom super image script" am: 6dcf429d8f
am: d90bc8e5ee
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2496355
Change-Id: Ia41fb01d563745f2b13a95875273a5c0347ab7fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 19:02:32 +00:00
Jiakai Zhang
fb2734e36b
Use the boot image mainline extension when dexpreopting in Make.
...
aosp/2470961 introduces a boot image mainline extension. We need to use
it when dexpreopting apps in Make.
Bug: 274059172
Bug: 269230245
Test: See "boot-framework-adservices.art" in
out/target/product/vsoc_x86_64/obj/APPS/PrebuiltGmail_intermediates/oat/x86_64/package.invocation
on internal master.
Change-Id: Ic0b1753a0066bd16a31de028743f1ad908e9bdfc
2023-03-20 18:42:13 +00:00
Cole Faust
5e2491eff2
Create image apexes by default instead of flattened apexes
...
This is a list of all the internal master products that
use flattened apexes before and after this commit:
https://diff.googleplex.com/#key=AcyUcqOwqpXZ
Apexes can still be flattened by setting `TARGET_FLATTEN_APEX := true`
or `OVERRIDE_TARGET_FLATTEN_APEX := true` in their product config.
Bug: 254205429
Test: presubmits
Change-Id: I5b15f0fc9e149730fd33722632a8ac14432ab757
2023-03-20 18:39:22 +00:00
Treehugger Robot
6dcf429d8f
Merge "[config] Boards can supply custom super image script"
2023-03-20 17:52:41 +00:00
Paul Duffin
4891cc9a37
Merge "Add rkpd to the list of individually toggleable modules" into udc-dev am: d82796bbf8
am: 56c3dd03ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22141213
Change-Id: Ib372a3abe246566e986f754c8c6789b0ff4d8d93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 17:03:08 +00:00
Paul Duffin
a537224b3a
Add rkpd to the list of individually toggleable modules
...
This is needed because the rkpd module is optional at runtime and so
needs to be optional at build time.
Ignore-AOSP-First: rkpd only exists internally
Bug: 259958590
Test: # Add prebuilts for the rkpd module.
m MODULE_BUILD_FROM_SOURCE=true droid
m MODULE_BUILD_FROM_SOURCE=false droid
# Make sure that they build from sources and prebuilts respectively.
Merged-In: Id0c0e482e2928d57a1bb6ee4f3bcd143ca15122c
Change-Id: Id0c0e482e2928d57a1bb6ee4f3bcd143ca15122c
(cherry picked from commit 95b546475f
)
2023-03-20 16:21:23 +00:00
Paul Duffin
d82796bbf8
Merge "Add rkpd to the list of individually toggleable modules" into udc-dev
2023-03-20 16:13:18 +00:00
Ziwei Zhang
eefd329d02
Merge "Add python mobly test template xml." am: 0a25e67404
am: 863bf01391
am: 31337205d6
am: 34a9f9c13e
am: d32e404977
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2469502
Change-Id: I134fb99cbb9cbbfa02975c4cc522eb4b1dea266f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 05:22:24 +00:00
Ziwei Zhang
34a9f9c13e
Merge "Add python mobly test template xml." am: 0a25e67404
am: 863bf01391
am: 31337205d6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2469502
Change-Id: I8a7a54ca25114c61782aac8e7c4f6ea8597ff925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 04:08:05 +00:00
Ziwei Zhang
31337205d6
Merge "Add python mobly test template xml." am: 0a25e67404
am: 863bf01391
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2469502
Change-Id: I15452245b1a59125d5e40b6fa1d3bd81090da4b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 03:28:46 +00:00
Ziwei Zhang
0a25e67404
Merge "Add python mobly test template xml."
2023-03-20 02:16:04 +00:00
Ludvig Hansson
6d11991f1d
Clean additional Robolectric variable
...
Add LOCAL_INSTRUMENT_SRCJARS to list of variables
to reset when calling CLEAR_VARS from a makefile.
This fixes an issue when generating JaCoCo coverage
reports for Robolectric tests.
The value from another module would bleed into the current
one causing the wrong source directory to be used during
report creation, which in turn resulted in an empty report.
This would only happen for modules still using 'Android.mk';
when using Android.bp files the value for LOCAL_INSTRUMENT_SRCJARS
is always set from 'robolectric.go'.
Bug: 214588476
Test: m clockwork-frameworks-robotests-jacoco
Change-Id: I7b527c82bdbe4db06acd1a1fa1a2443e64ed703d
(cherry picked from commit cc799bdf9161dc3c0f6eb437ed064f9712bbfd6b)
2023-03-17 23:55:29 +00:00
Paul Duffin
95b546475f
Add rkpd to the list of individually toggleable modules
...
This is needed because the rkpd module is optional at runtime and so
needs to be optional at build time.
Ignore-AOSP-First: rkpd only exists internally
Bug: 259958590
Test: # Add prebuilts for the rkpd module.
m MODULE_BUILD_FROM_SOURCE=true droid
m MODULE_BUILD_FROM_SOURCE=false droid
# Make sure that they build from sources and prebuilts respectively.
Change-Id: Id0c0e482e2928d57a1bb6ee4f3bcd143ca15122c
2023-03-17 22:26:54 +00:00
Aidan Wolter
fbf53522cf
[config] Boards can supply custom super image script
...
Some boards may need to customize the format of the super image. We will
now provide the variable BOARD_CUSTOM_BUILD_SUPER_IMAGE so that boards
can provide their own script for constructing the super image. This
mimics similar code in the same file for allowing boards to supply a
custom VBMeta (BOARD_CUSTOM_AVBTOOL) or boot image
(BOARD_CUSTOM_MKBOOTIMG).
Bug: None
Change-Id: I461caeb6dfb705fd5c671228fc35561ed403a1cb
2023-03-17 20:17:35 +00:00
Steven Moreland
d733e64b9f
Remove vtsc host tool
...
We haven't used this in years.
Bug: N/A
Test: N/A
Change-Id: If79b05d75ca358b110c2e1723f1dd7f522e13f12
2023-03-17 18:10:31 +00:00
Treehugger Robot
a7364f7bc2
Merge "Disable riscv64 dependency on bcc and ld.mc" am: d2b9ad4eb4
am: 01321a6bb2
am: cdbc794cd9
am: dc1652c955
am: b9f3ab26bd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2448665
Change-Id: Iea7b9cc736bce839148561e80721bcbd107b8cea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 22:50:17 +00:00
Treehugger Robot
dc1652c955
Merge "Disable riscv64 dependency on bcc and ld.mc" am: d2b9ad4eb4
am: 01321a6bb2
am: cdbc794cd9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2448665
Change-Id: Iaa151c740697ab6e041a8980dcc1a9266fb5ef2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 21:37:26 +00:00
Treehugger Robot
cdbc794cd9
Merge "Disable riscv64 dependency on bcc and ld.mc" am: d2b9ad4eb4
am: 01321a6bb2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2448665
Change-Id: I498a9489ef3332f29aba7ffe641103185efa234c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 20:58:38 +00:00
Treehugger Robot
d2b9ad4eb4
Merge "Disable riscv64 dependency on bcc and ld.mc"
2023-03-16 19:39:00 +00:00
Spandan Das
251205d866
New product config flag to gate blueprint modules
...
Bug: 270654958
Example usage:
PRODUCT_INCLUDE_TAGS += use_myspecial_sdk
This also populates the allowlist with go/nogo mainline tags. Usage of
`PRODUCT_INCLUDE_TAGS` outside this allowlist will raise an error
in product config
Test: TH
Change-Id: Ica82a8f65cbfda600d72fc54fb873c1eaa1666a7
Merged-In: Ica82a8f65cbfda600d72fc54fb873c1eaa1666a7
(cherry picked from commit 055e5f89a7bc5d12877fc6bc8110c1e1e8b6ee59)
2023-03-15 22:15:30 +00:00
Wei Li
2e574aa01c
Merge "Generate SBOM of the target product in file sbom.spdx.json in product out directory." am: 15187b6f1a
am: 0f06273190
am: 90217d9c4c
am: 3cc80290c6
am: f8de279da3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2485540
Change-Id: Ia4032c2a5f9ed5afa16fbee9700d09eff1883b52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 08:16:18 +00:00
Wei Li
3cc80290c6
Merge "Generate SBOM of the target product in file sbom.spdx.json in product out directory." am: 15187b6f1a
am: 0f06273190
am: 90217d9c4c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2485540
Change-Id: I1f3f461e3311b8538431c95134c369f6ffa3cdac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 07:03:42 +00:00
Wei Li
90217d9c4c
Merge "Generate SBOM of the target product in file sbom.spdx.json in product out directory." am: 15187b6f1a
am: 0f06273190
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2485540
Change-Id: Ibdca45c0e2c871c9a7f4c26bfa5d18d825112c27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 06:27:44 +00:00
Wei Li
15187b6f1a
Merge "Generate SBOM of the target product in file sbom.spdx.json in product out directory."
2023-03-15 05:20:44 +00:00
Wei Li
499333616c
Generate SBOM of the target product in file sbom.spdx.json in product out directory.
...
Original aosp/2374663 was reverted, so this change cnotains the implementation but disabled by default and SBOM will not be built by default with "m dist".
The feature will be enabled later in small CLs after running tests successfully in forrest.
Test: m sbom
Test: m dist
Test: on aosp, lunch aosp_bluejay-userdebug && m dist
Bug: 266726655
Change-Id: I926d0f97f3a0330ef61d059f12ea660005d370e6
2023-03-14 15:14:06 -07:00
Xin Li
eb2ad4b002
Merge "Merge Android 13 QPR2"
2023-03-14 21:40:46 +00:00
Treehugger Robot
9e470c6a3d
Merge "add make_erofs to otatools to support erofs apex" am: d4248892e6
am: 90a8a8b81c
am: f63e3bcc68
am: c189bbce54
am: a9608ada8e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2477085
Change-Id: Iea2970943c546cec979bb181cc1e28072ff2ccb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 18:41:53 +00:00
Steve Berbary
2c4dad8ca3
Update Security String to 2023-05-01 am: 6a3344db86
am: eaaa30b619
am: 07c703d53d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029
Change-Id: I3094f5ac3fdabb17f8083a4fff9addb4f043ba11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 18:23:46 +00:00
Steve Berbary
07c703d53d
Update Security String to 2023-05-01 am: 6a3344db86
am: eaaa30b619
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029
Change-Id: Ia798666364797ccfdf9eb95ff70a6bd8c8e7f972
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 17:44:19 +00:00
Treehugger Robot
c189bbce54
Merge "add make_erofs to otatools to support erofs apex" am: d4248892e6
am: 90a8a8b81c
am: f63e3bcc68
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2477085
Change-Id: I902fedcad79461d179d8264a5fac511bbeaaa0c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 17:28:11 +00:00
Steve Berbary
eaaa30b619
Update Security String to 2023-05-01 am: 6a3344db86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029
Change-Id: I1f32dc8fc18928417073ec419dd968841f2412d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 17:09:15 +00:00
Treehugger Robot
f63e3bcc68
Merge "add make_erofs to otatools to support erofs apex" am: d4248892e6
am: 90a8a8b81c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2477085
Change-Id: Id1c7287ba00f9e905eb10813d65a2dcf81d77667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 16:51:27 +00:00
Treehugger Robot
90a8a8b81c
Merge "add make_erofs to otatools to support erofs apex" am: d4248892e6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2477085
Change-Id: Ia58dbc4d9ab685fe63ec0fac27829c1a7aff5e2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 16:16:07 +00:00
Treehugger Robot
d4248892e6
Merge "add make_erofs to otatools to support erofs apex"
2023-03-14 15:47:05 +00:00
Steve Berbary
fa8a0ea9ef
Update Security String to 2023-05-01 am: 2130534b73
am: 24272b1f7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21960115
Change-Id: I0428ed3835e0c0f151569654133ae406ab5f3c8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 04:38:34 +00:00
Steve Berbary
877ca9f537
Update Security String to 2023-05-01 am: 2130534b73
am: 24272b1f7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21960115
Change-Id: I9a6f1a6d9be4978dd534f4e409fa864d4b68b48a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 04:30:17 +00:00
Steve Berbary
24272b1f7e
Update Security String to 2023-05-01 am: 2130534b73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21960115
Change-Id: If0001148ac378f7433dc325320d20e4456c056c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 03:50:29 +00:00
Steve Berbary
3f3053cbb0
Update Security String to 2023-05-05 am: be772485c3
am: 072f723276
am: 72e9b8675e
am: 49a2a95e63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959028
Change-Id: I7f9a053f89236095fbb756829dfbe3065d85736c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 03:00:19 +00:00
Steve Berbary
72e9b8675e
Update Security String to 2023-05-05 am: be772485c3
am: 072f723276
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959028
Change-Id: If91e327a31200c158cea3639b985710810b87172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 01:58:16 +00:00
Kevin Han
6c9b4a73e5
Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: afb2495f6f
am: a27f3cef8b
am: db4eccb0b2
am: 21f3289c94
am: c9be3d652f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2485539
Change-Id: Iefc91ff5367bb7526c002e084f6a59db916a05ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 01:47:36 +00:00
Steve Berbary
072f723276
Update Security String to 2023-05-05 am: be772485c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959028
Change-Id: I6d3f9eb5d4c285be1a90852231bf03ef3f5bdcc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 01:17:35 +00:00