Commit Graph

1054 Commits

Author SHA1 Message Date
Yo Chiang 8b674819ac Add x86 / x86_arm mainline_system product
- Add mainline_x86 / mainline_x86_arm board
- Add mainline_system_x86 / mainline_system_x86_arm product
- BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4

These products build only system.img and vbmeta.img.
These serve as a "golden example" for x86 / arm64 CSI.

Bug: 141972143
Bug: 141657175
Test: lunch mainline_system_x86-userdebug; m
Test: Compare $ANDROID_PRODUCT_OUT against sdk_phone_x86 / aosp_cf_x86_phone
Change-Id: I40dec69ceadfe7057c1706b883b81958d3c0a416
2019-10-05 11:35:33 +08:00
Anton Hansson b8205595c0 Re-submit "Make mainline device use apex"
The build system default was changed to not support apex, but
we want the mainline device to enable it.

Test: make mainline_system
Merged-In: I9f29e8354acffb1856dfd8a173b80a3f9324630c
Change-Id: I9f29e8354acffb1856dfd8a173b80a3f9324630c
2019-10-04 20:25:14 +08:00
Treehugger Robot 9fdb0b9250 Merge "Phase out Legacy GSI and gsi_common.mk" 2019-09-24 02:27:20 +00:00
Treehugger Robot 0b58060cae Merge "Add generic_x86_64_arm64 board" 2019-09-23 18:43:39 +00:00
Evgeny Eltsin 5c36806fbf Add generic_x86_64_arm64 board
An x86_64 board + third-party arm64 to x86_64 binary translator.

Test: none
Change-Id: I15c6249be8fc7f3e716213c9a3fe6b0fe9563d1c
2019-09-23 16:53:18 +02:00
SzuWei Lin f0776a40d0 Remove cache parition on emulator
Bug: 136616665
Test: Boot aosp_x86_arm to home screen
Test: Boot aosp_x86 to home screen

Change-Id: Id20d96afacd89e73a6c45febad5151becbe85342
2019-09-23 14:37:00 +00:00
SzuWei Lin 1b4eaef865 Phase out Legacy GSI and gsi_common.mk
The Legacy GSI is used on O/O-MR1 devices.
Do not need to support anymore. Phase out it.

Bug: 135977699
Test: none
Change-Id: I48b563a3aceca3c926e744165eb1dd88eff7a3d2
Merged-In: I48b563a3aceca3c926e744165eb1dd88eff7a3d2
2019-09-20 10:48:12 +08:00
Treehugger Robot 7be2b01f3c Merge "Revise aosp_x86_arm to inherit from mainline_system directly" 2019-09-18 04:41:30 +00:00
SzuWei Lin 18ef515e58 Revise aosp_x86_arm to inherit from mainline_system directly
After applying the patch, the contents in system/product align
to the mainline_system/aosp_product.

aosp_x86_arm is not releaseded for GSI. The patch also inherits
from BoardConfigMainlineCommon.mk instead of
BoardConfigGsiCommon.mk. But keeps output system_ext and product
files to /system/system_ext/ and /system/product/.

Bug: 136616665
Test: Compare the product out folder with/without the patch
Change-Id: I2aefbd2d3e71e26219508e53161fa8a3cc2fd652
2019-09-18 02:11:39 +00:00
Bowgo Tsai 06533fef4a Moving GSI-specific properties to /system_ext
We're now adding a core CSI system.img that is common across different
targets. So GSI-specific things should be moved to /system_ext.

Also renaming various generic*/system.prop to generic*/system_ext.prop.
This is to put the customization into /system_ext/build.prop instead of
/system/build.prop.

Bug: 137711197
Test: boot a GSI on crosshatch, and checks the value of those properties
Change-Id: Id344124280d5f4a6c10d390a9e8a4a50cc7f28fb
2019-09-10 21:55:32 +08:00
bohu 05f73f0b19 Update generic_x86_arm for native bridge support
BUG: 140623928
Change-Id: I5ea205576393f66421b4edea192d1de9f3249c06
2019-09-06 14:37:17 -07:00
Bo Hu 75e29ad5d4 Merge "goldfish: support system_ext"
am: 9432b4d052

Change-Id: Iad5ff28eab7ac56a038e192c7aa0f5019e3428a2
2019-09-03 10:40:08 -07:00
bohu 11eadcc4ed goldfish: support system_ext
For sdk_phone_* targets only

Change-Id: I4109a923a53311d09bafc2a0f5a70b2af4509cc3
2019-09-03 07:53:27 -07:00
Jeongik Cha 45ae6b065f Merge "Turn on BOARD_USES_METADATA_PARTITION in mainline"
am: b2401b58a1

Change-Id: I751894eb7e75c89d8364611d96273e49e64a1861
2019-08-27 04:16:35 -07:00
Jeongik Cha 9478f66632 Turn on BOARD_USES_METADATA_PARTITION in mainline
All the targets that inherit mainline seem to use metadata_partition,
So turn on BOARD_USES_METADATA_PARTITION

Bug: 137920314
Bug: 139731063
Test: m && check if there is /metadata
Change-Id: I17cfb5faf76a3c3d6ce1be594274ea58ebc1d1ae
2019-08-20 14:26:11 +00:00
Justin Yun 66a0d43db2 Merge "Revert "Add product and system_ext partition for emulator""
am: 0c55b6d2cb

Change-Id: I112c27402c00276f2442daeb233ceee73814fe0e
2019-08-07 16:58:49 -07:00
Justin Yun b5570cf17b Revert "Add product and system_ext partition for emulator"
This reverts commit ef7e3f2623.

The configuration affects GSI to have separate partitions for product
and system_ext which was not intended.

Bug: 138742524
Bug: 138382074
Test: emulator; check boot
Change-Id: Ie621d6b49f22ee2775adf1c1497e812f840f8ba7
2019-08-07 23:44:41 +00:00
Justin Yun ef7e3f2623 Add product and system_ext partition for emulator
Build product and system_ext image and add them to super partition.

Bug: 138382074
Test: boot emulator and check system_ext partition mounted
Change-Id: Ifa67bd6ad475ac5912e8f919c7a771c9958bd5c2
Merged-In: Ifa67bd6ad475ac5912e8f919c7a771c9958bd5c2
2019-07-31 10:45:55 +00:00
Justin Yun ff3d62d31d Add product and system_ext partition for emulator
Build product and system_ext image and add them to super partition.

Bug: 138382074
Test: boot emulator and check system_ext partition mounted
Change-Id: Ifa67bd6ad475ac5912e8f919c7a771c9958bd5c2
Merged-In: Ifa67bd6ad475ac5912e8f919c7a771c9958bd5c2
(cherry picked from commit 28843c3e32)
2019-07-31 00:13:19 +00:00
SzuWei Lin 735890c6c3 Merge "Add default LMK properties to GSI"
am: 97f75df31c

Change-Id: If0c223c87cc6cc353417af65a8304bee72792e2e
2019-07-19 16:30:57 -07:00
SzuWei Lin b3e9fc2219 Add default LMK properties to GSI
These LMK properties are product properties. The configuration will
be absent when GSI is installed as GSI doesn't mount the product
partition. Without these settings, some CTS test cases could
fail due to an aggressive LMK.

The patch puts these properties in GSI as default values.

Bug: 136212765
Bug: 134460917
Test: `run cts -m CtsFileSystemTestCases`, all pass
Change-Id: I6fde8db51debcb9bb269aece3a3e4c7e5bb991f6
Merged-In: I6fde8db51debcb9bb269aece3a3e4c7e5bb991f6
(cherry picked from commit 9547929af4)
2019-07-16 16:53:12 +08:00
Justin Yun 8f11ad5d40 Merge "Rename product_services to system_ext"
am: b7a50ece30

Change-Id: I7a56d76d3543b2bc4b1d0b24e54e8dd82ab7f15a
2019-07-09 02:14:55 -07:00
Justin Yun 6151e3f1ea Rename product_services to system_ext
Bug: 134359158
Test: build and check if system_ext.img is created
Change-Id: I67f2e95dd29eac6a28e07e24ea973d3a134c3bfc
2019-07-09 08:57:19 +00:00
Anton Hansson 7d5dbf2be0 Revert "Make mainline device use apex"
This reverts commit 5284b77e6f.

Reason for revert: broke sdk_gphone_x86_64

Change-Id: I5cbaa767900d17039e8113f29b40d61c977764dc
Merged-In: I5cbaa767900d17039e8113f29b40d61c977764dc
(cherry picked from commit 1cb902e510)
2019-07-02 13:42:16 +00:00
Jiyong Park 09dcc68663 updatable_apex.mk is not inherited from mainline_system.mk
mainline_system.mk is inherited by not only Pixels but also products
like GSI and sdk_gphone where kernel isn't capable of supporting
updatable APEX.

Stop inheriting updatable_apex.mk from mainline_system.mk and let each
product to decide whether or not to inherit updatable_apex.mk.

Also, TARGET_FLATTEN_APEX is not set to true for GSI as it is the
default setting.

Bug: 132664085
Test: choosecombo 1 aosp_arm64 userdebug; get_build_var
TARGET_FLATTEN_APEX shows true
choosecombo 1 sdk_gphone userdebug; get_build_var TARGET_FLATTEN_APEX
shows true

Change-Id: I3c4e1e4b2bbebd675904d148dd18acb57ecbdfe9
Merged-In: I3c4e1e4b2bbebd675904d148dd18acb57ecbdfe9
(cherry picked from commit 5fd45bbeb0)
2019-07-02 13:38:23 +00:00
Anton Hansson 81c61780bb Merge "Move board config variable from mainline_system" am: bf95d43dc6
am: a17c7a1005

Change-Id: I1d945c577a363716f4389f05681c5d2c3ba22f07
2019-06-28 08:37:52 -07:00
Anton Hansson c4f11be520 Move board config variable from mainline_system
This variable setting belongs in a board config, not
a product makefile.

Test: presubmit
Change-Id: I41e342ce841ec7aea69ff62aaefdc748cbf28d04
2019-06-26 18:07:05 +01:00
SzuWei Lin d20c8a5e36 Merge "Enforce property split in GSI" am: 345ed53d98
am: 0148d6e91e

Change-Id: Idedcab0c0c5ad079be83ddb7820c1427bb2e7f65
2019-06-19 19:55:26 -07:00
SzuWei Lin 79e0d25c33 Enforce property split in GSI
Pure GSI build targets has no vendor partition, such as
aosp_$arch_ab and gsi_$arch. The system properties defined by
PRODUCT_PROPERTY_OVERRIDES will be in /system/build.prop.

The patch defined a fake BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE to
let these system properties flow to vendor and won't pollute the
system.img.

The bug also move some properties to /product/build.prop.

Bug: 135508595
Bug: 131162245
Bug: 134781120
Test: check the /system/build.prop do not have "ro.carrier=unknown"
Test: adb remount on GSI Q on P
Change-Id: Ib200d66cf98fea572c26338e058bce29eb5e0cd7
2019-06-18 18:23:18 +08:00
bohu 5d94c784bb Merge "emulator: add option to disable avb" am: 4934e72933
am: f32b62266a

Change-Id: I1fd1755b951d9c2cdc42e4c794b1a2e850b79b4a
2019-06-14 04:36:02 -07:00
Treehugger Robot 4934e72933 Merge "emulator: add option to disable avb" 2019-06-14 11:08:31 +00:00
Dan Willemsen 3b37c4cad4 Merge "Add missing dependencies to python scripts" am: 56bfae6402
am: 083777a4c9

Change-Id: I791359b0acebb29402c8ebb922c0a3b30717889c
2019-06-10 20:37:40 -07:00
Dan Willemsen c84e4cb917 Add missing dependencies to python scripts
These were found when trying to run remotely on RBE with only the
sources depended upon available for each rule.

Bug: 130111713
Test: treehugger
Change-Id: Id763f8fc7dfbe60445f98604db3422147165f537
2019-06-10 23:58:49 +00:00
Anton Hansson ff2dc3f2fc Merge "Make mainline device use apex" am: b3cb9284e8
am: d0d4f1b156

Change-Id: Ib114826b29b38c6dcd34aab6d6a22fed22f13340
2019-06-10 03:31:36 -07:00
Anton Hansson 7d679bb26a Make mainline device use apex
The build system default was changed to not support apex, but
we want the mainline device to enable it.

Also re-disable it for GSI.

Test: make
Change-Id: I9a4372d375c2c741d7de5b2f83cac3c4b08767f8
Merged-In: I9a4372d375c2c741d7de5b2f83cac3c4b08767f8
2019-06-10 10:17:27 +01:00
bohu 5b1eed6fbe emulator: add option to disable avb
avbtool spends considerate amount of time, we want
to disable it in build environment to make incremental
build speed a bit faster.

BUG: 133259713

lunch sdk_phone_x86-eng
export QEMU_DISABLE_AVB=true
make -j

Change-Id: I0d227fc5933aaab1d49f66f4b07b35922bc6255b
2019-06-07 09:50:51 -07:00
Andrew Lehmer 6d3eda97ea Merge "Revert "Remove USE_XML_AUDIO_POLICY_CONF build flag"" am: 4c151cc398
am: a367884d30

Change-Id: Icb3d53628ca29a3903013838e0b136253619149d
2019-05-14 14:38:11 -07:00
Andrew Lehmer 4c42d17465 Revert "Remove USE_XML_AUDIO_POLICY_CONF build flag"
This reverts commit 79c61ba50e.

Reason for revert: Buildcop

Change-Id: I18d3ebeded2e9b20fef3a57c8509a2e701f6692e
2019-05-14 21:16:46 +00:00
Mikhail Naganov 3f2c8aed7f Merge "Remove USE_XML_AUDIO_POLICY_CONF build flag" am: 9f40efc5ff
am: 3754312901

Change-Id: I34eb76f6423ca4ce7fca11f6372c2634d64f531c
2019-05-14 13:08:09 -07:00
Mikhail Naganov 79c61ba50e Remove USE_XML_AUDIO_POLICY_CONF build flag
This flag is no more used by the build files and should
be removed.

Bug: 132435217
Test: make
Change-Id: Icbd2359da659290ce4fba1a11ba6da76f23679da
2019-05-13 14:02:43 -07:00
Tao Bao 5a45dd6409 Merge "Unset AB_OTA_UPDATER from BoardConfigMainlineCommon." am: 246a30a1cb
am: a2a708a616

Change-Id: Ib9a90b06b46d89bdccc4925a5b5a4430e1d2354b
2019-05-08 12:05:33 -07:00
Tao Bao 246a30a1cb Merge "Unset AB_OTA_UPDATER from BoardConfigMainlineCommon." 2019-05-08 18:37:28 +00:00
Tao Bao ff2a3f0af8 Unset AB_OTA_UPDATER from BoardConfigMainlineCommon.
The previous need to build mainline devices as A/B no longer applies
[1], as we have unbundled the install of update-payload-key.pub.pem from
AB_OTA_UPDATER. Unsetting AB_OTA_UPDATER from BoardConfigMainlineCommon
defers the decision of using A/B OTA to be board-specific.

mainline_arm64 is considered as a specific board to build generic
system-only OTAs in A/B format. So it defines the two variables there.

[1] commit 571fab0610

Bug: 130516531
Test: TreeHugger
Test: Compare the built images for GSI and mainline targets. They don't
      have different artifacts due to the change.
Change-Id: I33cc9b6623dca7cc7c2a7e2c65cdbccced5e816e
2019-05-07 13:26:09 -07:00
bohu 9492ee3d1b emulator: support dynamic partitions
BUG: 125540538

Change-Id: I9d486f57ac4ec11b1bbe9ab97890d12441c3054e
Merged-In: I9d486f57ac4ec11b1bbe9ab97890d12441c3054e
2019-05-05 20:34:02 -07:00
bohu a3deb4f04b emulator: support dynamic partitions
BUG: 125540538

Change-Id: I9d486f57ac4ec11b1bbe9ab97890d12441c3054e
2019-05-02 09:32:06 -07:00
Lajos Molnar bf77eecd3d allow actually 140MB vendor partition space
Bug: 129710438
Change-Id: I93bfe7f25f16a8e48871db7357ec587c21dcc7d6
Merged-In: I93bfe7f25f16a8e48871db7357ec587c21dcc7d6
2019-05-02 15:18:33 +00:00
Bowgo Tsai 50e9962a53 Merge "Removing --flag 2 when building GSI vbmeta.img" am: ab0ed975f0
am: 4b1e25af26

Change-Id: I0699a913794e3d80bbe7629f9a05b20360f771d8
2019-04-30 01:39:09 -07:00
Bowgo Tsai 2e2a7682ba Removing --flag 2 when building GSI vbmeta.img
With the support of enabling AVB on standalone partitions in libfs_avb,
devices can boot GSI with dm-verity. No need to disable AVB anymore.

Devices still can use the following command to disable AVB on
device-specific vbmeta.img if needed:

    `fastboot flash --disable-verification vbmeta vbmeta.img`

Bug: 130595457
Test: Tree Hugger
Change-Id: I067dcda15f14f04428e0b60ce1f49227d61e4349
2019-04-23 18:10:01 +08:00
SzuWei Lin 8f489d7f31 Merge "Disable non-AOSP nnapi extensions on product partition in GSI" am: 6a3d438aa0
am: 87381a80fc

Change-Id: I61bd5bc57ce58eb0572e1c0c0705de1f16ec3c7b
2019-04-22 05:06:58 -07:00
Treehugger Robot 6a3d438aa0 Merge "Disable non-AOSP nnapi extensions on product partition in GSI" 2019-04-22 11:46:13 +00:00