Commit Graph

24 Commits

Author SHA1 Message Date
SzuWei Lin 2d541f35cd Apply skip mounting product and other partitions in GSI
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
2018-12-19 14:42:27 +08:00
SzuWei Lin 4999dc047c Unmount product partition in GSI
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
2018-11-15 21:06:56 +08:00
Hung-ying Tyan 5f8eb7c553 Revert "Revert "Add VNDK v28 to GSI from Android Q""
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
2018-09-19 17:55:29 +08:00
Colin Cross ffdbab3ff3 Revert "Add VNDK v28 to GSI from Android Q"
This reverts commit 6c4578b64e.

Reason for revert: breaks unbundled app builds that don't have prebuilts/vndk

Bug: 113560265
Change-Id: I7c067fda1a369c67866eb8f327eb61170bb26533
2018-09-17 20:25:21 +00:00
SzuWei Lin 6c4578b64e Add VNDK v28 to GSI from Android Q
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
2018-09-06 09:25:16 +08:00
Hyunyoung Song 3aa57d8d90 Fix unbundled branch by not having it pick up goldfish dependency
Bug: 110165361

Change-Id: I0824b140fdfee296288c03fd03a3bac7966e9179
Merged-In: I0824b140fdfee296288c03fd03a3bac7966e9179
(cherry picked from commit 16e7004e3f)
2018-08-21 06:55:33 +00:00
bohu ebbdea824f emulator: factor vendor partition out of emulator.mk
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)
2018-08-21 14:40:43 +08:00
SzuWei Lin a2da9a3361 Enable dyanmic image size for GSI
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
2018-08-03 14:47:43 +08:00
Steven Moreland 91c5154a42 Remove vr_hwc from GSI image.
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)
2018-07-31 02:48:29 +00:00
SzuWei Lin d13c1719b9 Add A/B update to GSI
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
2018-07-23 06:48:22 +00:00
huans ae665f0833 Update the rild.libpath to vendor.rild.libpath for aosp_$arch
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
2018-05-30 14:48:31 -07:00
huans de55429ad3 Add missing emulator vendor contents for treblizing aosp_$arch
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
2018-05-16 22:02:46 +00:00
Isaac Chen 8f222b9e15 Merge "Enable PRODUCT_COMPATIBLE_PROPERTY for aosp_$arch" into pi-dev 2018-05-15 04:09:36 +00:00
Isaac Chen 075ee920fb Enable PRODUCT_COMPATIBLE_PROPERTY for aosp_$arch
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
2018-05-10 13:13:21 +08:00
SzuWei Lin ece9324bed Add vr_hwc to GSI
Bug: 78308559
Test: Check the /system/etc/init/vr_hwc.rc and /system/bin/vr_hwc
      are built into system.img

Change-Id: I84ac8149d1bccaff0451f4a4ae679853d6625976
2018-05-07 13:44:30 +08:00
Isaac Chen 164eed2e7d Make aosp_$arch system images closer to GSIs
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
2018-04-18 18:28:41 +08:00
bohu 49664b3c70 emulator: update fstab.ranchu installation for arm images
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)
2018-04-03 15:23:19 +08:00
bohu 753e9e4462 emulator: squash misc modifications from oc-emu-dev
Change-Id: I7380292cd4dc851a987683bdf61d511dbf74aff6
2017-08-13 22:32:01 -07:00
Pierre Imai 0040280747 Remove references to deleted dhcpcd
Change-Id: Ic977c3aaa72544310696b970e73c64401aafbbc8
2016-03-18 10:18:50 +09:00
Miroslav Tisma 39b59502c7 Add android.hardware.ethernet.xml for ranchu targets
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
2015-06-19 11:35:38 +02:00
David 'Digit' Turner d3e8cb7fda arm64: Fix aosp_arm64 system image.
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
2014-08-22 11:15:01 +02:00
Colin Cross 75b29ae078 build: add core_64_bit.mk
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
2014-05-01 10:56:12 -07:00
Colin Cross 930b5fbcb9 make 64-bit builds into multiarch builds
Also enable the 64-bit binder interface and make them only use ART.

Change-Id: I05de41ce348c14722c84a658f745659bde5ba423
2014-02-12 19:49:47 -08:00
Colin Cross 4f0eb7d50c build: rename aarch64 target to arm64
Rename aarch64 build targets to arm64.  The gcc toolchain is still
aarch64.

Change-Id: Ia92d8a50824e5329cf00fd6f4f92eae112b7f3a3
2014-01-23 22:39:38 -08:00