This CL re-enables building ANGLE as parta of the base system. This was
done up until the recent merge of goog/master to aosp/master, and is
required as part of enabling ANGLE as the default OpenGL ES driver for
Cuttlefish.
Bug: b/168625635
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I12c8db290ed7dc6b213b6f1c22692666dcdf143f
Merged-In: Ide4e3d8f78d3748d557a47ecd153d66694fd1e3a
SafetyRegulatoryInfo should not exist in AOSP.
Fixes: 166139891
Test: make && flash to verify regulatory option of Settings
Merged-In: I5fbef719ba30cdbf37e0d4c6daa06a50c06e9495
Change-Id: I5fbef719ba30cdbf37e0d4c6daa06a50c06e9495
Sets ro.virtual_ab.compression.enabled and includes snapuserd_ramdisk.
A device will do the following to enable virtual a/b compression:
$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota_compression.mk)
Bug: 168257347
Test: build with product included
Change-Id: Ide19576a69629389a7878d5dff3c5706c22527d9
The Live Lock Killer Daemon (llkd) has provided enough hero moments to
improve system stability, by providing actionable collection of data
to resolve kernel, and some user space, misbehaviors. It is time to
move llkd to a required component.
NB: For llkd to be effective at finding real kernel live lock
conditions, system requirements are that there are no more un-waited
for Zombie processes, and that no kernel drivers use indeterminate
periods of uninterruptible sleep. Any kernel and user space tasks
that are killed because of suspicious behavior, must themselves have
a benefactor to restart them if necessary. If a true live lock is
discovered, data will be collected and the kernel will be panic'd to
recover from the situation.
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 164946924
Test: llkd is ever present on a release build.
Change-Id: I986a8545252bc5b68d09a6a0f4f506a58998c8a0
There are a couple of use cases where we don't want sparse image:
1. `DynamicSystemInstallationService` in Q framework doesn't support
sparse images.
2. Super image manipulation tools (like `lpadd`) doesn't play nice with
sparse images.
Force non-sparse GSI so we don't break backwards compatibility (1) and
we don't need to write `simg2img` everywhere (2).
Bug: 167695592
Test: Prepare a device flashed with Q framework
Test: Build system.img and create system.img.zip; the image is non-sparsed
Test: m tradefed-all && \
tradefed.sh run commandAndExit template/atest_local_min \
--template:map preparers=template/preparers/dsu-preparer \
--extra-file system-img.zip=out/.../system.img.zip \
--dynamic-system-update:disable-tear-down
Change-Id: Ib7667165ce53e87eb86bc7d3f56c80a418123a62
The system property ro.gfx.angle.supported needs to be enabled when
ANGLE is included in a build to indicate to the platform and CTS tests
that ANGLE is present on the device.
Test: atest CtsAngleIntegrationHostTestCases
Bug: 157670307
Merged-in: Ide4e3d8f78d3748d557a47ecd153d66694fd1e3a
Change-Id: I72ba8731fed36dbc594dae88aaa00a6299e8f4ae
This binary is for talking to vendor services, and it'll hang if
vndservicemanager is not available. On devices where it isn't supported,
just remove it.
Fixes: 165043609
Test: N/A
Change-Id: I908c8771c37deb79cf36efb10e66b7fff7adcedf
For development and debugging it is useful to have boot images with all
kernel symbols exported.
Bug: 163613927
Change-Id: I6118e5f0fff6e9cbc20ecca6bd362a26a79544b1
Not all devices support BLE_VND_INCLUDED. Disable BLE_VND_INCLUDED
in GSI before it becoming a runtime enabled feature.
Bug: 146149698
Bug: 160930886
Test: build aosp_arm64-userdebug, check the feature manually
Change-Id: I17fd2c1c3cdb87fde11362683d4a7bec1d989b6f
Rename mainline_system to generic_system in mk files
to avoid confusion with mainline module.
First, move mainline_system(.*).mk to generic_system(.*).mk
and make previous mainline_system(.*).mk to just inherit
generic_system(.*).mk to make alias except mainline_system.mk.
is just symlink to generic_system.mk.
These aliasing file will be kept remain during migration
for preventing build breakage and making changes possible
during migration.
Bug: 160649682
Test: lunch generic_system_arm64 && m nothing
Test: lunch generic_system_x86 && m nothing
Test: lunch generic_system_x86_64 && m nothing
Test: lunch generic_system_x86_arm && m nothing
Test: lunch mainline_system_arm64 && m nothing
Test: lunch mainline_system_x86 && m nothing
Test: lunch mainline_system_x86_64 && m nothing
Test: lunch mainline_system_x86_arm && m nothing
Change-Id: I3609ec2d91b0f08859a36cac75c25876b1db6d6a
Merged-In: I3609ec2d91b0f08859a36cac75c25876b1db6d6a
(cherry picked from commit 6f16b5764b)
Rename mainline_system to generic_system in mk files
to avoid confusion with mainline module.
First, move mainline_system(.*).mk to generic_system(.*).mk
and make previous mainline_system(.*).mk to just inherit
generic_system(.*).mk to make alias except mainline_system.mk.
is just symlink to generic_system.mk.
These aliasing file will be kept remain during migration
for preventing build breakage and making changes possible
during migration.
Bug: 160649682
Test: lunch generic_system_arm64 && m nothing
Test: lunch generic_system_x86 && m nothing
Test: lunch generic_system_x86_64 && m nothing
Test: lunch generic_system_x86_arm && m nothing
Test: lunch mainline_system_arm64 && m nothing
Test: lunch mainline_system_x86 && m nothing
Test: lunch mainline_system_x86_64 && m nothing
Test: lunch mainline_system_x86_arm && m nothing
Change-Id: I3609ec2d91b0f08859a36cac75c25876b1db6d6a
Merged-In: I3609ec2d91b0f08859a36cac75c25876b1db6d6a
(cherry picked from commit 6f16b5764b)
This hasn't worked for a couple years, and continues to bitrot. Just
remove it.
Test: treehugger
Change-Id: Iea6caf3c08252a560155e095135c5ddaad712991
Merged-In: Iea6caf3c08252a560155e095135c5ddaad712991
The VNDK-lite is deprecated from S. Which is used to support the
devices without enabling VNDK.
The patch removes VNDK-lite from Legacy GSI. Also, reboot the
device without enabling VNDK in both non-Legacy and Legacy GSI.
Bug: 158719241
Test: boot aosp_arm64-userdebug on a Pixel 3 device
Test: boot aosp_arm64_ab-userdebug on a Pixel 2 device
Change-Id: I70a944bb5a2a0347ab753d29eca3d1bfcae54526
This partially reverts commit 1785816ca1
so that the hash tree at the end of GSI is properly signed by AVB.
Bug: 161503491
Test: 'm dist' and check that vbmeta_system.im is gone
Test: boot GSI on android10 CF
Test: 'avbtool info_image --image system.img' and check AVB signing
Change-Id: I9f488380c0c410fdbd02c3c0803b6dc06cf7faab
To enable testing with android-mainline kernels, and them to the
aosp_arm64 build so android-mainline-based GKI boot images are produced.
Bug: 162020942
Change-Id: Ib1f957608a720a763a14324e4ca25ee170154fbb
Merged-In: Ib1f957608a720a763a14324e4ca25ee170154fbb
To enable testing with android-mainline kernels, and them to the
aosp_arm64 build so android-mainline-based GKI boot images are produced.
Bug: 162020942
Change-Id: Ib1f957608a720a763a14324e4ca25ee170154fbb
These two properties shouldn't be set in GSI image from R on,
otherwise they'll force lmkd to use the legacy strategy.
Bug: 136212765
Test: run cts-on-gsi -m CtsFileSystemTestCases
Test: run cts-on-gsi -m CtsAppExitTestCases
Change-Id: Id0001f8c4187a280cffe6c72d7a39be29065ca4e
These two properties shouldn't be set in GSI image from R on,
otherwise they'll force lmkd to use the legacy strategy.
Bug: 136212765
Test: run cts-on-gsi -m CtsFileSystemTestCases
Test: run cts-on-gsi -m CtsAppExitTestCases
Change-Id: Id0001f8c4187a280cffe6c72d7a39be29065ca4e
Merged-In: Id0001f8c4187a280cffe6c72d7a39be29065ca4e
hidl libs are removed from VNDK unless used by other VNDK libs.
Bug: 143933769
Test: update-makefiles.sh && m com.android.vndk.current
Merged-In: I25a787defb1755107c0538eabd21a0bfcf8374b1
Change-Id: I25a787defb1755107c0538eabd21a0bfcf8374b1
(cherry picked from commit 9438fb2c15)
hidl libs are removed from VNDK unless used by other VNDK libs.
Bug: 143933769
Test: update-makefiles.sh && m com.android.vndk.current
Merged-In: I25a787defb1755107c0538eabd21a0bfcf8374b1
Change-Id: I25a787defb1755107c0538eabd21a0bfcf8374b1
(cherry picked from commit 9438fb2c15)
The vendor path check is incompatible with the current setup of prebuilt
module stubs.
Bug: 160165426
Test: lunch mainline_system_x86 ; m nothing
Change-Id: I5aa809dc3e0c9b36e6963585bb60fd446a234022
The mk file is designed to provide safe default values which can be
overridden by target-specific mk files. Previously it was difficult to
correctly configure the mk files because the final prop value that
is baked in the system/build.prop is highly dependent (and sensitive as
well) to the mk file inheritance order which is very difficult (and
non-intuitive) to follow.
I9c073a21c8257987cf2378012cadaeeeb698a4fb is an attempt to make it much
easier and intuitive. Specifically, the new `a ?= b` syntax makes the
assignment optional, which means it is used only when there is no
non-optional assignment for the same prop regardless of the relative
ordering among them. In addition, the change prohibits having multiple
non-optional prop assignments for the same prop name.
pm.dex.* prop in runtime_libart.mk are now set using the `a ?= b` syntax
to explicitly mark that they provide default values.
Bug: 117892318
Bug: 158735147
Test: m
Exempt-From-Owner-Approval: cherry-pick from master
Merged-In: I044486d313d699607cd54222ae34d9eae24762b9
(cherry picked from commit bca4ea477a)
Change-Id: I044486d313d699607cd54222ae34d9eae24762b9
Some properties that are designed to provide a safe default value are
explicitly set as optional using the 'a ?= b' syntax.
Bug: 117892318
Bug: 158735147
Test: m
Exempt-From-Owner-Approval: cherry-pick from master
Merged-In: Ie6a50ab7e0bcb210e282bc18e8c1daf412903f90
(cherry picked from commit dfb3937ce4)
Change-Id: Ie6a50ab7e0bcb210e282bc18e8c1daf412903f90
The setting of ro.zygote in base_system.mk is optional, which means the
value can be overriden by other (probably more specific) mk files.
Bug: 117892318
Bug: 158735147
Test: atest --host post_process_prop_unittest
Exempt-From-Owner-Approval: cherry-pick from master
Merged-In: Ia7a67c0a04fad343d6591417f40dd4b9ddadc5e4
(cherry picked from commit b1261aac33)
Change-Id: Ia7a67c0a04fad343d6591417f40dd4b9ddadc5e4
GSI and emulator should not be specialized for tablet.
This is also to avoid the expected sysprop conflict after
I9c073a21c8257987cf2378012cadaeeeb698a4fb gets in. With the change,
duplicate assignments of a sysprop is prohibited. We currently have the
duplication due to the following hierarchy chain:
aosp_arm64.mk
-> emulator_vendor.mk -> goldfish/vendor.mk -> phone-xhdpi-2048-dalvik-heap.mk
-> generic_arm64/device.mk -> tablet-dalvik-heap.mk
Many of the dalvik.vm.* properties are duplicated between phone-*-
dalvik-heap.mk and tablet-dalvik-heap.mk files.
Bug: 117892318
Bug: 158735147
Test: atest --host post_process_prop_unittest
Exempt-From-Owner-Approval: cherry-pick from master
Merged-In: I4d1e2f819fe688a4a85e58387b6af58d603399d3
(cherry picked from commit 9f2f6dd9c9)
Change-Id: I4d1e2f819fe688a4a85e58387b6af58d603399d3
The mk file is designed to provide safe default values which can be
overridden by target-specific mk files. Previously it was difficult to
correctly configure the mk files because the final prop value that
is baked in the system/build.prop is highly dependent (and sensitive as
well) to the mk file inheritance order which is very difficult (and
non-intuitive) to follow.
I9c073a21c8257987cf2378012cadaeeeb698a4fb is an attempt to make it much
easier and intuitive. Specifically, the new `a ?= b` syntax makes the
assignment optional, which means it is used only when there is no
non-optional assignment for the same prop regardless of the relative
ordering among them. In addition, the change prohibits having multiple
non-optional prop assignments for the same prop name.
pm.dex.* prop in runtime_libart.mk are now set using the `a ?= b` syntax
to explicitly mark that they provide default values.
Bug: 117892318
Bug: 158735147
Test: m
Exempt-From-Owner-Approval: cherry-pick from master
Merged-In: I044486d313d699607cd54222ae34d9eae24762b9
(cherry picked from commit bca4ea477a)
Change-Id: I044486d313d699607cd54222ae34d9eae24762b9
Some properties that are designed to provide a safe default value are
explicitly set as optional using the 'a ?= b' syntax.
Bug: 117892318
Bug: 158735147
Test: m
Exempt-From-Owner-Approval: cherry-pick from master
Merged-In: Ie6a50ab7e0bcb210e282bc18e8c1daf412903f90
(cherry picked from commit dfb3937ce4)
Change-Id: Ie6a50ab7e0bcb210e282bc18e8c1daf412903f90
The setting of ro.zygote in base_system.mk is optional, which means the
value can be overriden by other (probably more specific) mk files.
Bug: 117892318
Bug: 158735147
Test: atest --host post_process_prop_unittest
Exempt-From-Owner-Approval: cherry-pick from master
Merged-In: Ia7a67c0a04fad343d6591417f40dd4b9ddadc5e4
(cherry picked from commit b1261aac33)
Change-Id: Ia7a67c0a04fad343d6591417f40dd4b9ddadc5e4
GSI and emulator should not be specialized for tablet.
This is also to avoid the expected sysprop conflict after
I9c073a21c8257987cf2378012cadaeeeb698a4fb gets in. With the change,
duplicate assignments of a sysprop is prohibited. We currently have the
duplication due to the following hierarchy chain:
aosp_arm64.mk
-> emulator_vendor.mk -> goldfish/vendor.mk -> phone-xhdpi-2048-dalvik-heap.mk
-> generic_arm64/device.mk -> tablet-dalvik-heap.mk
Many of the dalvik.vm.* properties are duplicated between phone-*-
dalvik-heap.mk and tablet-dalvik-heap.mk files.
Bug: 117892318
Bug: 158735147
Test: atest --host post_process_prop_unittest
Exempt-From-Owner-Approval: cherry-pick from master
Merged-In: I4d1e2f819fe688a4a85e58387b6af58d603399d3
(cherry picked from commit 9f2f6dd9c9)
Change-Id: I4d1e2f819fe688a4a85e58387b6af58d603399d3
The flattened version of com.android.apex.cts.shim.v1 should be
explicitly installed because the shim apex is prebuilt one and
PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES is not supported for
prebuilt_apex modules yet.
Bug: 158169437
Bug: 159392784
Test: m com.android.apex.cts.shim.v1_with_prebuilts.flattened
# should install the prebuilts of shim APKs
Change-Id: I8b37a320d2130d7b33aca856bc067dce37d1fb30
Removing GoogleANGLE only removed the Google-signed version of ANGLE,
but the AOSP version still remained. This CL removes the AOSP build of
ANGLE also, so there is no ANGLE on the device at all.
Bug: 158956138
Test: adb shell pm list packages | grep -i angle
Change-Id: If9a42bc6436c752d2b1a16565d99ca2a5ec60d66
GSI self contains the full Android system part. Skip mounting
the oem partition on GSI, which is a part of system.
Bug: 158433698
Test: build aosp_arm64-userdebug.
Test: Check the file /system/system_ext/etc/init/config/skip_mount.cfg
Change-Id: I689e1cc8a68b980d68b1d6ef1d715203db078dc2
Merged-In: I689e1cc8a68b980d68b1d6ef1d715203db078dc2
(cherry picked from commit f8475cc49f)
In order to support mDL on RVC, we need to
add credstore in /system/bin
Bug: 136506289
Test: atest VtsHalIdentityTargetTest
Change-Id: I7975eddde5b94edcd3a2d0e213244f84ffe43e8d
GSI self contains the full Android system part. Skip mounting
the oem partition on GSI, which is a part of system.
Bug: 158433698
Test: build aosp_arm64-userdebug.
Test: Check the file /system/system_ext/etc/init/config/skip_mount.cfg
Change-Id: I689e1cc8a68b980d68b1d6ef1d715203db078dc2
Properties for <partition>/build.prop are now added via
PRODUCT_<PARTITION>_PROPERTIES.
PRODUCT_SYSTEM_PROPERTIES is added. PRODUCT_SYSTEM_DEFAULT_PROPERTIES
will be deprecated.
PRODUCT_VENDOR_PROPERTIES is added. PRODUCT_PROPERTY_OVERRIDES and
PRODUCT_DEFAULT_PROPERTY_OVERRIDES will be deprecated in favor of the new
variable.
For other partitions (odm, system_ext, product), there is no change.
Exempt-From-Owner-Approval: cherry-pick from internal master
Bug: 117892318
Test: m
Merged-In: I98f3b5d0da661b3ad75260a23754e655103b7a44
(cherry picked from commit ad810b6dae)
Change-Id: I98f3b5d0da661b3ad75260a23754e655103b7a44
Properties for <partition>/build.prop are now added via
PRODUCT_<PARTITION>_PROPERTIES.
PRODUCT_SYSTEM_PROPERTIES is added. PRODUCT_SYSTEM_DEFAULT_PROPERTIES
will be deprecated.
PRODUCT_VENDOR_PROPERTIES is added. PRODUCT_PROPERTY_OVERRIDES and
PRODUCT_DEFAULT_PROPERTY_OVERRIDES will be deprecated in favor of the new
variable.
For other partitions (odm, system_ext, product), there is no change.
Exempt-From-Owner-Approval: cherry-pick from master
Bug: 117892318
Test: m
Merged-In: I98f3b5d0da661b3ad75260a23754e655103b7a44
(cherry picked from commit ad810b6dae)
Change-Id: I98f3b5d0da661b3ad75260a23754e655103b7a44
/system/build.prop must not be device-specific, it's for all Android targets.
The pinner.pin_camera=true is device-specific, so move it to /product/build.prop.
Bug: 158366075
Test: Make
Change-Id: Ie5cd37e09fe1d589ea619e6bb5edf807211d047f
Fix: 158036322
Test: built flame-userdebug with m OVERRIDE_TARGET_FLATTEN_APEX=true, ran
atest CtsAppSecurityHostTestCases:android.appsecurity.cts.PrivilegedUpdateTests#testDisableUpdatedSystemApp
and verified that the cts shim apex is not installed
Change-Id: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
Merged-In: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
(cherry picked from commit c9a786e5f77a5c06da6c07f718e4a7619a75d9e6)
This is going to include libraries as well, so rename to reflect this.
Bug: http://b/157709367
Test: treehugger
Change-Id: I94625a6343e18032d8607cf8c58bde49d64db85c
(cherry picked from commit 67e0295833)
Fix: 158036322
Test: built flame-userdebug with m OVERRIDE_TARGET_FLATTEN_APEX=true, ran
atest CtsAppSecurityHostTestCases:android.appsecurity.cts.PrivilegedUpdateTests#testDisableUpdatedSystemApp
and verified that the cts shim apex is not installed
Change-Id: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
Merged-In: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
(cherry picked from commit c9a786e5f77a5c06da6c07f718e4a7619a75d9e6)
libnfc-nci.so provides a default config at /system/etc/libnfc-nci.conf.
Remove /system/etc/libnfc-nci.conf PRODUCT_COPY_FILES entries from
aosp_product.mk and board/generic/device.mk.
Bug: 157704723
Test: Build gsi. /system/etc/libnfc-nci.conf is installed.
Test: Flash gsi. Check logcat and NFC still works.
Test: Toggle NFC on/off and /etc/libnfc-nci.conf is loaded.
Test: Build aosp_bonito. Both /(system|product)/etc/libnfc-nci.conf are
installed.
Test: Flash aosp_bonito. Check logcat and NFC still works.
Test: Toggle NFC on/off and /product/etc/libnfc-nci.conf is loaded.
Change-Id: Id119a88a10b549e1fd475cf9b14b18410923011b
This is going to include libraries as well, so rename to reflect this.
Bug: http://b/157709367
Test: treehugger
Change-Id: I94625a6343e18032d8607cf8c58bde49d64db85c
include stub cellbroadcat app for data preservation by dafault.
Bug: 155844209
Change-Id: I34d1978ce89f4d4edbf327a3b61f7fb87262aae0
Merged-in: I34d1978ce89f4d4edbf327a3b61f7fb87262aae0
aosp_arm64 has no emulators after the patch:
https://android-review.googlesource.com/c/platform/build/+/1286895
The patch creates all other emulator_* devices by cloning from
generic_*, and modify all sdk_phone_* to use them.
Bug: 111538404
Test: build sdk_phone_armv7-userdebug
Test: build sdk_phone_x86_64-userdebug
Test: build sdk_phone_x86-userdebug
Change-Id: I2b82e999ea919f005729f322cd948e6b72ba6843
We've converted all known users of mainline.mk to use
mainline_system.mk. Don't include mainline.mk directly in the future,
instead include mainline_system.mk and other partition specific
makefiles. Remove mainline.mk to prevent people from accidentally
including it again.
Bug: 141443017
Test: TH
Change-Id: Id161f29951982a100482a6201130adeebdb49846
mainline_arm64 is broken for quite some time. Let's just remove it
rather than trying to fix it.
IIUC this was a testing ground for mainline_system.mk when it was first
introduced. Now we have plenty of products that use mainline_system.mk
(e.g. mainline_system_arm64, aosp_arm64, aosp_<pixel>, ...).
Bug: 141443017
Test: TH
Change-Id: I8e0825b2d94134fd8e9e3edc5e2aa15dbcdf10ba
Merged-In: I08990b70d45c0663a9700f41b670513674bf7e97
The tinyhostless module is provided by AOSP and is required by Mediatek
devices.
Test: build aosp_wembley-userdebug
Bug: 157109906
Change-Id: I2a1c4957c19fd4cbd60744d2d9cb534f19d3f239
mainline_arm64 is broken for quite some time. Let's just remove it
rather than trying to fix it.
IIUC this was a testing ground for mainline_system.mk when it was first
introduced. Now we have plenty of products that use mainline_system.mk
(e.g. mainline_system_arm64, aosp_arm64, aosp_<pixel>, ...).
Bug: 141443017
Test: TH
Change-Id: I08990b70d45c0663a9700f41b670513674bf7e97
This sets external_storage.sdcardfs.enabled=0 from emulated_storage.mk,
which will disable sdcardfs on devices that are using casefolding and
quotas as sdcardfs replacements. This allows the device to use these if
sdcardfs is present in the kernel.
Bug: 155222498
Test: mount|grep "type sdcardfs" should find nothing after boot complete
if external_storage.sdcardfs.enabled=0
Change-Id: Id0446a7cac5ac768afc3b3e046359fc4e945e554
Force generate a non-A/B update package when requested.
Bug: 154344887
Test: ota_from_target_files.py --force_non_ab ...
Test: apply it as well
Change-Id: I5e81eb161722e07ef50081b6a16685cbc9963ae2
(cherry picked from commit 7169f754cc)
Merged-In: I5e81eb161722e07ef50081b6a16685cbc9963ae2
The different boot images in aosp_arm64 have different partition size
requirements. Add support for defining a partition size associated with
each boot image variant.
This support is limited to aosp_arm64 currently, which is built with
recovery-as-boot.
A previous version of this change did not update the boot-debug image
AVB logic with the required macro for multiple boot partition size
support. This is now required because the aosp-arm64 boot.img is
configured as a chained AVB partition.
Bug: 156036850
Bug: 155049180
Change-Id: I66b57de91042bfd56ba54a3659843d8cf7873955
Merged-In: I66b57de91042bfd56ba54a3659843d8cf7873955
Now that NetworkStack was bumped to API 30, use NetworkStack instead of
NetworkStackNext on the system image.
This change should not be merged in branches that are used for building
S system images for internal testing. Note that the merged-in change
is not related to this change; it is just used to prevent this change
from merging into the aosp/master merge path.
Bug: 143586229
Test: m
Merged-In: Ibc74edb88904f953a1e5e6ceef44c461f381c9cf
Change-Id: I484e148fab80a01d2b20ebf48604d9e923fe7cd3
Some devices refer to libwifi-hal-emu via
BOARD_WLAN_DEVICE := emulator
we need to import the device/generic/goldfish
namespace to link the libwifi-hal-emu symbol.
Bug: 154151802
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I68b0f9bd22e50c2a86e0dbe62abc17991581703e
Merged-In: I68b0f9bd22e50c2a86e0dbe62abc17991581703e
BOARD_EXT4_SHARE_DUP_BLOCKS can reduce the image size. Move it to
BoardConfigMainlineCommon.mk to apply on all mainline based
targets.
Bug: 155589918
Test: build aosp_arm-userdebug
Test: build gsi_gms_arm64-userdebug
Test: build sdk_gphone_arm64-userdebug
Change-Id: I8c4c7c9b2982daf6bf02991b4e62a43b296d003e
Merged-In: I8c4c7c9b2982daf6bf02991b4e62a43b296d003e
(cherry picked from commit de9dc88b59)
The different boot images in aosp_arm64 have different partition size
requirements. Add support for defining a partition size associated with
each boot image variant.
This support is limited to aosp_arm64 currently, which is built with
recovery-as-boot.
A previous version of this change did not update the boot-debug image
AVB logic with the required macro for multiple boot partition size
support. This is now required because the aosp-arm64 boot.img is
configured as a chained AVB partition.
Bug: 156036850
Bug: 155049180
Change-Id: I66b57de91042bfd56ba54a3659843d8cf7873955
This reverts commit 14199b7a93.
Reason for revert:
Rollback the stuff which has been removed
due to "remove cronet for R" to keep the intermediate branches
synced between {aosp, internal} master
Bug: 156368607
Change-Id: I95bcb80ccd330ce7f40a20912ab61c1ff9d15441
Merged-In: Ice9b733b22d45d6d6eaf8e3f3ed95b3ac50eefbb
Some devices refer to libwifi-hal-emu via
BOARD_WLAN_DEVICE := emulator
we need to import the device/generic/goldfish
namespace to link the libwifi-hal-emu symbol.
Bug: 154151802
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I68b0f9bd22e50c2a86e0dbe62abc17991581703e
BOARD_EXT4_SHARE_DUP_BLOCKS can reduce the image size. Move it to
BoardConfigMainlineCommon.mk to apply on all mainline based
targets.
Bug: 155589918
Test: build aosp_arm-userdebug
Test: build gsi_gms_arm64-userdebug
Test: build sdk_gphone_arm64-userdebug
Change-Id: I8c4c7c9b2982daf6bf02991b4e62a43b296d003e
Enables signing for them so we can verify that the boot partition
contains a valid generic boot image during the compliance test.
This change also adds the chained partition descriptor of
boot partition into vbmeta.img, which contains the corresponding
public key used to verify the boot partition.
Bug: 151094943
Test: lunch aosp_arm64-user, `make` and use `avbtool info_image`
to check that GKI images are properly signed.
Test: `make dist` and checks that GKI images in the image zip file
are properly signed.
Change-Id: I2fd69964f9dc62526a813875fa9193913aa4935b
Merged-In: I2fd69964f9dc62526a813875fa9193913aa4935b
(cherry picked from commit 0f95ac7e8c)
The different boot images in aosp_arm64 have different partition size
requirements. Add support for defining a partition size associated with
each boot image variant.
This support is limited to aosp_arm64 currently, which is built with
recovery-as-boot.
Bug: 156036850
Bug: 155049180
Change-Id: I73b70a4d52c2662c3015899632bb8a2b424108d5
Enables signing for them so we can verify that the boot partition
contains a valid generic boot image during the compliance test.
This change also adds the chained partition descriptor of
boot partition into vbmeta.img, which contains the corresponding
public key used to verify the boot partition.
Bug: 151094943
Test: lunch aosp_arm64-user, `make` and use `avbtool info_image`
to check that GKI images are properly signed.
Test: `make dist` and checks that GKI images in the image zip file
are properly signed.
Change-Id: I2fd69964f9dc62526a813875fa9193913aa4935b
Force generate a non-A/B update package when requested.
Bug: 154344887
Test: ota_from_target_files.py --force_non_ab ...
Test: apply it as well
Change-Id: I5e81eb161722e07ef50081b6a16685cbc9963ae2
When building from source this gets installed as a requirement
from Conscrypt, but needs to be present when Conscrypt is
shipped as a pre-built too.
I think the correct solution here is actually to make libcrypto
rather than Conscrypt require boringssl_self_test but Soong
considers that a circular dependency.
Bug: 155520949
Test: m installclean && m
Change-Id: I77b2921d1d7b6be493cd581c46adbadd1f186fb0
Merged-In: I77b2921d1d7b6be493cd581c46adbadd1f186fb0
(cherry picked from commit f5a05c4a4b)
When building from source this gets installed as a requirement
from Conscrypt, but needs to be present when Conscrypt is
shipped as a pre-built too.
I think the correct solution here is actually to make libcrypto
rather than Conscrypt require boringssl_self_test but Soong
considers that a circular dependency.
Bug: 155520949
Test: m installclean && m
Change-Id: I77b2921d1d7b6be493cd581c46adbadd1f186fb0
Revert "Move libpac into i18n APEX"
Revert "Add shared library into i18n APEX and add the required s..."
Revert "Make com_android_i18n namespace visible"
Revert submission 1299494-i18nApex
Reason for revert: Breaking aosp_x86-eng on aosp-master
Reverted Changes:
I30fc3735b:Move ICU from ART APEX to i18n APEX
Icb7e98b5c:Calling @IntraCoreApi from core-icu4j should not c...
Ic7de63fe3:Move core-icu4j into I18n APEX
I65b97bdba:Make com_android_i18n namespace visible
Ia4c83bc15:Move v8 and libpac into i18n APEX
I10e6d4948:Move core-icu4j into i18n APEX
I8d989cad7:Move ICU from ART APEX into i18n APEX
I72216ca12:Move ICU into i18n APEX
Ief9dace85:Add shared library into i18n APEX and add the requ...
I7d97a10ba:Move libpac into i18n APEX
I90fff9c55:Move ICU from ART APEX into i18n APEX
Change-Id: I12a7d609d43620edaf2c5f12711eb3ca3a570d79
BUG: 149826779
Test: Build x86, x86_64, armv7 and arm64
make sure x86/64 boot to home screen;
armv7/arm64 can pass disk mounting stage
Change-Id: I258b69bd0cdc4fb0a99b1a04567051e8d32c389a
Merged-In: I258b69bd0cdc4fb0a99b1a04567051e8d32c389a
Settings in aosp targets don't need to rely on static overlay.
Bug: 150820813
Bug: 152926806
Test: m
Change-Id: Ie41f881f1c48201db434605a03dbeb48149543b2
This reverts commit a780171da6.
Reason for revert: This appears to be causing intermittent build
failures. Vendor is now small enough that sometimes it does not
get enough inodes allocated for the files that must be copied to it.
Bug: 155340761
Change-Id: I453101a65d4c8b5824467d0bb7cc8c3a03ca2740
Continue the removal of emulator-specific bits from the generic
aosp_arm64 product.
Bug: 111538404
Change-Id: I97a8083bfdc3881ab70aaf73e9ace58435ddbc67
* changes:
generate multiple boot.img files in aosp_arm64
create emulator_arm64 device for sdk_phone_arm64 to use
support multiple boot.img files in release tools
multi boot.img support cleanups
Generate boot.img variants with different schemes for kernel compression
(gzip, lz4, none).
The boot image is removed from vbmeta for aosp_arm64 since it is
not possible currently to store the hashes of multiple variants of a
particular image. The GKI will be verified via VTS anyway.
Also remove some emulator-specific stuff from aosp_arm64.
Bug: 151094943
Change-Id: I465ea6c98d52e839284d51b246203f6b8dfb5566
Merged-In: I465ea6c98d52e839284d51b246203f6b8dfb5566
Changes are needed in generic_arm64 so that aosp_arm64 can be used to
distribute the GKI. These changes are incompatible with the emulator,
so modify the sdk_phone_arm64 product to use its own device.
Bug: 111538404
Change-Id: I57b77d7cbf503afffa8db45ad8b5ae635b4f4444
Merged-In: I57b77d7cbf503afffa8db45ad8b5ae635b4f4444
The release cert helps verifying CTS in a release build.
Bug: 153112812
Test: build, reboot, see a new key in /proc/keys
Change-Id: I6d8f4af6b1b0c023b668e81b7a1c71c7583d93d9
Merged-In: I6d8f4af6b1b0c023b668e81b7a1c71c7583d93d9
Until now, packages from system_ext don't create RRO packages, instead
it uses static overlay, but to make system_ext common, it should use
RRO.
Bug: 150820813
Test: m && check if there are RRO packages that use from system_ext apps
Change-Id: Id0ddb66adca07a6bb4dda66fbee49fd476ac5342
Merged-In: Id0ddb66adca07a6bb4dda66fbee49fd476ac5342
Generate boot.img variants with different schemes for kernel compression
(gzip, lz4, none).
The boot image is removed from vbmeta for aosp_arm64 since it is
not possible currently to store the hashes of multiple variants of a
particular image. The GKI will be verified via VTS anyway.
Also remove some emulator-specific stuff from aosp_arm64.
Bug: 151094943
Change-Id: I465ea6c98d52e839284d51b246203f6b8dfb5566
Changes are needed in generic_arm64 so that aosp_arm64 can be used to
distribute the GKI. These changes are incompatible with the emulator,
so modify the sdk_phone_arm64 product to use its own device.
Bug: 111538404
Change-Id: I57b77d7cbf503afffa8db45ad8b5ae635b4f4444
The release cert helps verifying CTS in a release build.
Bug: 153112812
Test: build, reboot, see a new key in /proc/keys
Change-Id: I6d8f4af6b1b0c023b668e81b7a1c71c7583d93d9
which is now (as of aosp master external/iptables @ HEAD, ie.
https://android-review.googlesource.com/c/platform/external/iptables/+/1284244
) simply a symbolic link to iptables binary
This should fix:
> FAILED:
> build/make/core/main.mk:1132: warning: build/make/target/product/generic.mk includes non-existent modules in PRODUCT_PACKAGES
> Offending entries:
> ip6tables
> build/make/core/main.mk:1132: error: Build failed.
Test: No, but building, and treehugging
Bug: 154186169
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I94709a7450d0c41a64951c592b54de4b2956eae9
Merged-In: I94709a7450d0c41a64951c592b54de4b2956eae9
Whether these are enabled or not is independent of whether storage is
emulated or not; instead, use 'external_storage', and add the enabled
suffix as per property naming guidelines.
Bug: 152170470
Bug: 153525566
Test: N/A
Change-Id: Id893ce19025ded1ee1521081f7fc722dfee8e662
Merged-In: Id893ce19025ded1ee1521081f7fc722dfee8e662
These need to be a part of the vendor partition and be set even when
using GSI.
Bug: 152170470
Bug: 153525566
Test: android.drm.cts.DRMTest#testForwardLockAccess
Change-Id: I1e69d5c203d4f7480a6651ca780fbd307ce71c23
Merged-In: I1e69d5c203d4f7480a6651ca780fbd307ce71c23
