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 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
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
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
The GKI boot.img should be generated alongside the GSI. To make this
possible, define a flag (TARGET_NO_VENDOR_BOOT) that can be used to
disable the generation of the vendor_boot image.
Bug: 138323550
Change-Id: I91181853b26815e68a2fa2216b68579780d034dc
Make aosp targets inherit handheld_system_ext.mk and
telephony_system_ext.mk files.
Devices that have /system_ext or /system/system_ext must inherit any
of *_system_ext.mk files to install mandatory packages for system_ext
partition.
Bug: 144542478
Test: Build aosp targets
Change-Id: Ibdbf0000ac4aa98c8485d67827f52208f9a827c5
We may add all possible scripts to "root" to clean up the whitelists
of mainline devices.
One of the zygote init scripts is selected by "ro.zygote" property.
Bug: 143121605
Test: build test for all device targets
Change-Id: I4435f1c48a306c3a8d42522ed780d405a32780b4
64 bits GSI expects supporting both zygote_64_32 and zygote_32_64.
The patch adds including init.zygote32_64.rc in gsi_release.mk
direclty, and also revises all GSI releasing build targets.
Bug: 138625977
Test: build aosp_arm64-userdebug and has init.zygote32_64.rc
Test: build aosp_arm-userdebug and no init.zygote32_64.rc
Change-Id: Ia61db1315321798bae8902b35ddaa5e5f3e7dd3e
The patch seperates gsi_common.mk to aosp_product.mk and
gsi_release.mk. Let GSI targets can be inherit with 3 parts:
- system: mainline_system.mk
- product: aosp_product.mk
- vendor: none or emulator vendor makefiles
aosp_product.mk includes the AOSP packages/settings will be in
the product partition.
GSI targets also includes the gsi_release.mk, which contains
the special settings for the GSI for releasing, ex.
skip_mount.cfg, extra VNDK, etc. After the patch, the build
targets inherit from aosp_$arch.mk will not apply these special
settings anymore.
The gsi_common.mk, legacy_gsi_common.mk and aosp_$arch_ab.mk will
be phased out later.
Bug: 135502030
Test: build gsi_arm64-userdebug and aosp_arm64-userdebug, compare
Test: root, system and vendor in out folder with/without the patch
Change-Id: Ic604ac91ba9a704e6507bac324d19bbf68063464
There are some makefile inherit from aosp_$arch*.mk. This patch
change to only enable mainline checking on excat GSI targets,
such as aosp_$arch or aosp_$arch_(a|ab), and does not apply on
the child targets.
This patch also add some more whitelist items to gsi_common.mk
Bug: 123613261
Test: aosp_arm64-userdebug build pass
Test: remove some whitelist items and aosp_arm64-userdebug build fail
Test: sdk_phone_arm64-eng build pass
Test: gsi_arm64-userdebug build pass
Change-Id: I1772a55ab823a0312b9f215f0d2c3b0c727c8e4b
The patch changes GSI (aosp_$arch) to inherit from gsi_common.mk
instead of aosp_base_telephony.mk.
The patch also clones the emulator_vendor.mk from emulator.mk to
include all vendor modules.
Bug: 119747870
Test: boot aosp_arm64-userdebug on a blueline device on master/P
Test: boot aosp_x86-userdebug on the emulator
Test: boot aosp_x86_64-userdebug on the emulator
Test: compare the out folder with/without the patch, only more content
Change-Id: Ibd398d4f93d2a964813e05ccd434975435d25adc
Uses skip_mount.cfg for `init` to skip mounting product and
product_service paritions in GSI. The patch also removes
the un-mount in `init.gsi.rc`.
With this patch, a device with flashing GSI will not use the
content in product/prodcut_service partitions on the device
and will always use the content under /system/product in GSI.
The patch also rename the target/product/vndk to
target/product/gsi.
Bug: 120208657
Bug: 117246558
Test: Boot blueline master/P with flashing aosp_arm64-userdebug
Test: /product and /product_service should be symbolic links
Change-Id: Idc9c60e5a05b3d90fc4ab64b0ac000571849b19b
This is a workaround solution. It let GSI to unmount product
partition when booting. The patch avoid the problem that
- share UID between between system and product partition
- the product partition override the content under /system/product
Bug: 119391482
Test: Boot aosp_arm64-userdebug on a blueline device with Android P
Change-Id: I48808fcc1ca527a23eb1446b97176b08268b500e
This reverts commit ffdbab3ff3.
Bug: 113560265
Test: (with the topic) build aosp_arm-userdebug and app only with and without vndk 28
Change-Id: I68a74ba5544a262414e777d8f07bc1ea18f24235
This reverts commit 6c4578b64e.
Reason for revert: breaks unbundled app builds that don't have prebuilts/vndk
Bug: 113560265
Change-Id: I7c067fda1a369c67866eb8f327eb61170bb26533
From Android Q, Legacy GSI (aosp_$arch_a(b)-userdebug) can only
support the devices which upgraded from O or O-MR1.
The normal GSI (aosp_$arch-userdebug) will support the device which
launch from P or Q.
The patch add VNDK v28 to Legacy GSI and normal GSI.
Bug: 113560265
Test: lunch aosp_arm64_ab-userdebug; make -j
Check the folder $OUT/system/lib64/vndk-28 existing
Change-Id: I941d2cd56264fffc3ded338871409594a430dce5
The emulator vendor paritions are better moved out of
emulator.mk into device/generic/goldfish/vendor.mk
so that changes in vendor.mk will just concentrate on
vendor partition.
this cl does not impact real devices, and it does not
even impact emulator images (it does code refactoring only)
BUG: 110030159
Change-Id: Ic5778cda8ca6ccf7bc2bc2f9028f801cda970143
Merged-In: Ic5778cda8ca6ccf7bc2bc2f9028f801cda970143
(cherry picked from commit 6676853016)
The original size number of GSI are fixed size. Change to give
size by the content with appending 64M bytes space.
Bug: 71970853
Test: `make systemimage` and check the out system.img
Change-Id: I345f5e22c2fee7b553fc3337e9bff0ba28f579e1
Merged-In: I345f5e22c2fee7b553fc3337e9bff0ba28f579e1
Not all phones support the VR, so on phones
that don't, the inclusion of vr_hwc is causing
VtsHalGraphicsComposerV2_1Target failures.
Bug: 109913118
Bug: 111963599
Test: vr_hwc is not on aosp_arm64_ab
Change-Id: I803b4dddc5a87e35875992ad9421c644698112f1
Merged-In: I803b4dddc5a87e35875992ad9421c644698112f1
(cherry picked from commit 52971ca09b)
The feature should work fine on the devices with partition _a and _b.
and will not be enabled on the devices without partition _a and _b.
Bug: 110763858
Test: build aosp_arm64-userdebug and aosp_arm64_ab-userdebug
Change-Id: I9f783dd6fe69eff2536a6aac0506e41c724510b2
Merged-Id: I9f783dd6fe69eff2536a6aac0506e41c724510b2
bug: 80137441
Test: build and runaosp_x86-userdebug. adb logcat -b radio.
check the rild read the right property vendor.rild.libpath
Change-Id: I0529c32b79cf791821d71369bcd0fb244c13361c
This change only impact emulator images.
Test: Compare the system partition before and after this change,
make sure they are identical.
Bug: 79584197
Test: Boot success.
Change-Id: I00427f663f068cc7ba9984e4facaff1b0c98b17f
GSI Pi (for newly launched devices) need to enable this to pass
VtsTrebleSysProp.
Bug: 79395858
Test: Built aosp_{arm,arm64,x86,x86_64}. Check system/etc/prop.default
and found "ro.actionable_compatible_property.enabled=true".
aosp_x86(_64) could boot to home screen.
Change-Id: I04a4ff7c5feee7671d727c04c9d9657b63ec0912
Bug: 78308559
Test: Check the /system/etc/init/vr_hwc.rc and /system/bin/vr_hwc
are built into system.img
Change-Id: I84ac8149d1bccaff0451f4a4ae679853d6625976
This change modifies aosp_$arch product makefiles so their
system images can be closer to their respective GSIs.
The added contents in this CL are based on treble_common*.mk.
Contents specific to GSI are in aosp_$arch.mk.
Contents common to all devices are moved to full_base.mk.
Contents related to specific device are moved to device.mk.
BoardConfig related makefiles will be changed in another CL.
Bug: 70772101
Test: The following products can boot to home screen:
$ lunch aosp_x86-userdebug; m -j; emulator
$ lunch aosp_x86_64-userdebug; m -j; emulator
$ lunch aosp_arm-userdebug; m -j; emulator
$ lunch aosp_arm64-userdebug; m -j; emulator
Change-Id: I225a13dd74b3e748cc5d1705e1a453348b01d43f
Now init.ranchu.rc picks up fstab.ranchu from vendor/etc
instead of from /
BUG: 77233572
Change-Id: Ifd8639ac4cb883402c90de45b15b11077a60fa5f
Merged-In: Ifd8639ac4cb883402c90de45b15b11077a60fa5f
(cherry picked from commit acc16846e3)
This commit adds android.hardware.ethernet.xml file for ethernet
permission to PRODUCT_COPY_FILES which will be copied to
/system/etc/permission folder on the target. Reason for adding
this permission file is for enabling the ethernet and having
functional networking until RIL backend support in ranchu is
implemented.
This requires dhcpcd_eth0 service definition in init.ranchu.rc.
Architectures that use goldfish emulator do not need ethernet
support, because networking is provided by RIL.
Change-Id: I7972f80cf78c0fdecf3fde45bf018230bbcefd38
This patch ensures that the system image produced for the 'aosp_arm64'
build products can actually run under emulation with the new qemu-android
binaries [1]
The main issue is that the virtual board is named 'ranchu' instead of
'goldfish' (because the virtual hardware is _very_ different), and thus
requires specific files for the boot to start properly
(in particular fstab.ranchu is required to mount the system, data and
cache partitions, otherwise init will fail badly because /system/bin/
and /data/ are missing important files).
IMPORTANT: This requires the files under device/generic/goldfish/ from:
https://android-review.googlesource.com/#/c/105020/
[1] Binaries built from https://qemu-android.googlesource.com/qemu-android
BUG=17154406
Change-Id: Ic40360bf56e32aab708551c810000467d23793d4
Add a new product, core_64_bit.mk, that products can inherit from
to configure zygote and the rest of the build system for a standard
64-bit product.
Make the 64-bit emulator targets for arm64, mips64, and x86_64
inherit from it.
Change-Id: I7e809264db39472f554cd5290529f3d6499345d4
