Commit Graph

1169 Commits

Author SHA1 Message Date
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
SzuWei Lin 3c6fde2d90 Disable non-AOSP nnapi extensions on product partition in GSI
The extensions is for OEM. To avoid AOSP code using OEM
extensions mistakenly. GSI denys product to use the extensions
by enabling the following property:

    ro.nnapi.extensions.deny_on_product=true


Bug: 129900377
Test: make gsi_arm64-userdebug, check /system/build.prop
Change-Id: Ia679f1f9c108bd5a164c8cdeb1d73f57da755608
2019-04-22 06:28:13 +00:00
Isaac Chen bcd412cf8e Merge "Change emulator system image to unsparse format" am: d18be7f8db
am: b1056bae51

Change-Id: Ieccc9d7620c2343d457adbb78fff58da96399baf
2019-04-15 05:17:33 -07:00
Isaac Chen d18be7f8db Merge "Change emulator system image to unsparse format" 2019-04-15 11:57:49 +00:00
Isaac Chen 90bfda1cc4 Change emulator system image to unsparse format
Currently, emulator system image is the non-legasy GSI, which is in sparse
format. Several internal clients don't support sparse format, and other
internal/external clients usually support both. The reason to choose sparse
format for GSI may not be valid any more. See bug for detail.

Bug: 130341962
Test: Checked the header of system.img to see if it's unsparse.
      Boot emulator aosp_x86 successfully.
      Boot mixed GSI and CF x86 successfully.

Change-Id: I839f49809429227607b2e876a4a3628df43a97b4
2019-04-12 13:16:34 +08:00
Dan Willemsen b801fa66ad Merge "Stop using build/target -> build/make/target symlink" am: e3ef041244
am: db1e6e9cbc

Change-Id: I3900e2c73b2379a9b4d36576f3e9d02bd4dd24b7
2019-04-10 13:46:36 -07:00
Dan Willemsen 0ab1be6fe2 Stop using build/target -> build/make/target symlink
Instead, fully specify build/make/target/... everywhere

Test: treehugger
Change-Id: Idf89b2e6a0b777adbfb6370ea34f35faee6d4965
2019-04-09 21:35:37 -07:00
Anton Hansson bba55ee2aa Merge "Enable JIT Zygote experiment in mainline boardconfig" am: f49c38c2c1
am: 40af566c4f

Change-Id: Ifffad6407b7bc95e0e7111046e1507f916266a3d
2019-04-09 02:14:25 -07:00
Lajos Molnar 953dc98790 Merge "allow actually 140MB vendor partition space" into qt-dev 2019-04-05 18:09:36 +00:00
Anton Hansson 66bd1852f1 Enable JIT Zygote experiment in mainline boardconfig
Like Ie413f84c545c869ee336912a7b05ca80bb968129, but for all
mainline devices.

Bug: 119800099
Test: m
Change-Id: Ief77adaea61203a013f85cf870c5350253fdb7dd
2019-04-05 18:45:17 +01:00
Lajos Molnar 0fb6fcca27 allow actually 140MB vendor partition space
Bug: 129710438
Change-Id: I93bfe7f25f16a8e48871db7357ec587c21dcc7d6
2019-04-04 21:59:30 +00:00
Anton Hansson 9ca0c27be6 Move device-specific vars from mainline common
Move a couple of variables out of BoardConfigMainlineCommon
because they vary either by device or by how they build in
AOSP vs internal.

Bug: 80410283
Test: presubmit
Change-Id: Ia42df91ad8c8d8fc4618be375a17ea23896f4352
Merged-In: Ia42df91ad8c8d8fc4618be375a17ea23896f4352
2019-04-04 18:47:48 +01:00
Anton Hansson 91aa9414c0 Move device-specific vars from mainline common
Move a couple of variables out of BoardConfigMainlineCommon
because they vary either by device or by how they build in
AOSP vs internal.

Bug: 80410283
Test: presubmit
Change-Id: Ia42df91ad8c8d8fc4618be375a17ea23896f4352
2019-04-04 17:33:51 +01:00
Dan Willemsen e5b842206f Merge "Stop installing host packages via PRODUCT_PACKAGES" am: 672e98fac8 am: cc2155aa37
am: 7e8cc8ce6c

Change-Id: I13151a5e1918d5de18dbda6939da14a4d1be36b1
2019-03-28 20:34:08 -07:00
Dan Willemsen 672e98fac8 Merge "Stop installing host packages via PRODUCT_PACKAGES" 2019-03-29 03:20:52 +00:00
SzuWei Lin e62a8b3d0e Merge "Phase out all _a targets" am: fde506a6d7 am: 969c3cd3ba
am: c31910805e

Change-Id: I4b9230194542440fe49fa6f82294e48cc348feca
2019-03-27 06:20:20 -07:00
SzuWei Lin b90ffb0f9a Phase out all _a targets
The _a targets are build for Legacy GSI for non-system-as-root
partition layout devices. The Android build system is not able
to build a system image with non-system-as-root anymore.
Also, `init` supports mounting system-as-root system image at
all, all devices should no problem to mount it.

Bug: 124278972
Test: none
Change-Id: I9c56e7e5d8517a630854f030616c3b3ecb94b9a8
2019-03-27 12:16:43 +08:00
Anton Hansson 6e1026e591 Merge "Unset system-as-root for mainline" am: 2f5e18362b am: d3229a7179
am: 508d4a2797

Change-Id: I4edec0fd236f7c53087f436a2ddfd3c65cca7ee5
2019-03-26 14:26:33 -07:00
Anton Hansson 2f5e18362b Merge "Unset system-as-root for mainline" 2019-03-26 19:34:13 +00:00
Anton Hansson cd2f94407c Unset system-as-root for mainline
This flag is not allowed to be true when dynamic partitions are
enabled, which mainline devices are expected to do.

Bug: 80410283
Test: make
Change-Id: I50c9fe9332ea1490a84484f9311cfe001a083754
2019-03-26 09:22:07 +00:00
Anton Hansson 0af2847ba0 Merge "Make mainline device enable property split" am: 072795054a am: cc85e0377c
am: 802e6faa77

Change-Id: I055a9967654e1efee1274d28cdea45b8113e43b7
2019-03-25 11:59:58 -07:00
Anton Hansson 018bd137b7 Make mainline device enable property split
This setting moves the PRODUCT_PROPERTY_OVERRIDES to
the vendor partition.

Bug: 80410283
Test: tail system/build.prop | grep ro.carrier=
      (empty)

Change-Id: I30d564fbd2dd3b56763ccff77979b223857f1c2f
2019-03-25 10:53:07 +00:00
Anton Hansson 5fbbea2d18 Merge "Set file system types for mainline_arm64 partitions" am: 9274688574 am: 3632d053d0
am: eb49e55ad7

Change-Id: I3365a50b76f9e9116db48b75aa2c591f155bc414
2019-03-25 02:41:15 -07:00
Anton Hansson ccf93e6096 Merge "Enable AB_OTA_UPDATER for mainline" am: 30355b60f7 am: fa96c5c4a0
am: 5d6db45d82

Change-Id: I752e88c304e500e374ae42c3218ca4647e493374
2019-03-25 02:38:52 -07:00
Anton Hansson 9274688574 Merge "Set file system types for mainline_arm64 partitions" 2019-03-25 09:24:16 +00:00
Anton Hansson 1683198010 Set file system types for mainline_arm64 partitions
This config was in a weird state where it sets the OUT
directory for these partitions but not the file system
type. Within the build system, both of these variables
are used interchangeably to check whether these partitions
are expected to be present.

A typical mainline device is expected to /vendor and
/product, so just add these.

Bug: 120974093
Test: make
Change-Id: I803d7afdcadc37e4384ae80f08bc1c8db535d2f4
2019-03-22 17:25:43 +00:00
Anton Hansson 571fab0610 Enable AB_OTA_UPDATER for mainline
The file $(TARGET_OUT_ETC)/update_engine/update-payload-key.pub.pem
is installed conditionally based on this variable, and was found
to differ between mainline_system and the intended device targets.

Also move the variable from gsi_common.mk as GSI inherits the mainline
boardconfig. The variable is not a PRODUCT flag (and not inherited as
such), so fits better in the BoardConfig I think.

Bug: 80410283
Test: presubmit
Change-Id: Ida6fa923fd01b062ff3b93e7737e1e6edf7e4fa1
2019-03-21 14:54:43 +00:00
Dan Willemsen 2e79dafed1 Stop installing host packages via PRODUCT_PACKAGES
Test: treehugger
Change-Id: I24ac93f3558116f4ddd96d22ef9bbd47240fdd06
2019-03-20 10:29:42 -07:00
SzuWei Lin b3ba5843f2 Merge "Disable RescueParty in GSI temporary" am: 39f88f9c28 am: b9bf035c60
am: ff91a64d85

Change-Id: Ic120b0cb84de828548772f59712ee680f31aa73d
2019-03-18 04:27:41 -07:00
SzuWei Lin 4fff0440b0 Disable RescueParty in GSI temporary
RescueParty reboot the device to recovery mode if there is any
priv app die continuously. The behavior blocks the testing.
Disable the feature temporary before all problem apps fixed.

Bug: 120679683
Test: Boot a device with GSI and a die app
Test: Unplug USB and does not auto reboot
Change-Id: I70e5b7222299c6d0173d87e41d7a68beeda77dd5
2019-03-14 22:43:02 +08:00
Dan Willemsen 3d05a08a6f Reland "First pass at creating PRODUCT_HOST_PACKAGES"
Adds icu-data_host_runtime_apex to fix unbundled builds which pull it in
via PRODUCT_PACKAGES, but are missing packages that would pull it in via
PRODUCT_HOST_PACKAGES.

Test: build/soong/build_test.bash
Test: in ub-timezonedata-master; tapas TimeZoneData; m
Change-Id: I1583c7582b386c3e8478711cb1df340518d763c1
Merged-In: I1583c7582b386c3e8478711cb1df340518d763c1
2019-03-06 14:46:06 -08:00
Dan Willemsen 4a70a19f84 Reland "First pass at creating PRODUCT_HOST_PACKAGES"
Adds icu-data_host_runtime_apex to fix unbundled builds which pull it in
via PRODUCT_PACKAGES, but are missing packages that would pull it in via
PRODUCT_HOST_PACKAGES.

Test: build/soong/build_test.bash
Test: in ub-timezonedata-master; tapas TimeZoneData; m
Change-Id: I1583c7582b386c3e8478711cb1df340518d763c1
2019-03-04 18:03:14 -08:00
Yifan Hong 7a82913627 Merge "Build ODM manifests and fragments for each SKU." am: 5a4696e460 am: 9abd15f3c1
am: 934174f0bd

Change-Id: Ia088e5a7445e2701920307c65647def62589dd78
2019-03-01 11:00:14 -08:00
Yifan Hong 5a4696e460 Merge "Build ODM manifests and fragments for each SKU." 2019-03-01 18:32:32 +00:00
Lingfeng Yang fbae04c480 Merge "Add more space in the sdk image for an updated swiftshader" am: aa39d0bdbc am: 60928d7ea8
am: cdca859619

Change-Id: I72dad71a4cb0264cfbddc1549cb8fcfad328e651
2019-02-26 08:34:50 -08:00
Cody Schuffelen 45dd92e51b Add more space in the sdk image for an updated swiftshader
Related change: aosp/907158.

Bug: 124530765
Test: TreeHugger
Change-Id: Id9313c3900dae90696101c83d04827d4ee5911bf
2019-02-26 00:21:17 -08:00
Dan Willemsen 086f8f002c Revert "First pass at creating PRODUCT_HOST_PACKAGES"
This reverts commit 7218a21ed0.

Reason for revert: broke some side branches, and the mac build

Change-Id: Ifa52f2dbf9a383f69e07ba0aceb4742b05376364
Fixes: 125912305
2019-02-22 22:02:23 +00:00
Dan Willemsen 7218a21ed0 First pass at creating PRODUCT_HOST_PACKAGES
This only defines PRODUCT_HOST_PACKAGES as a concept, and requires that
it contain at least all of the files that would be installed to the host
from PRODUCT_PACKAGES (minus libraries, as those are expected to be
installed based on what's required by other modules).

It does not actually change what will be built, that will happen in a
future change.

Test: build/soong/build_test.bash
Change-Id: Ie502b1a483f821b957cfd407c31a93e243896dae
2019-02-20 12:58:37 -08:00
Bowgo Tsai cf82764987 Merge "GSI vbmeta.img: set rollback_index to zero" am: 93030e3f4d am: 8ef0dae2c6
am: 12d9c24978

Change-Id: Ic8e133ef3ff8743806086b0f06afb6ab64b6d0de
2019-02-19 17:54:52 -08:00
Yifan Hong b321665b9d Build ODM manifests and fragments for each SKU.
In BoardConfig.mk, ODM manifests can be specify as follows:

    # installed to /odm/etc/vintf/manifest.xml
    ODM_MANIFEST_FILES := device/foo/bar/odm_manifest.xml

    # installed to /odm/etc/vintf/manifest_baz.xml
    ODM_MANIFEST_SKUS := baz
    ODM_MANIFEST_BAZ_FILES := device/foo/bar/odm_manifest_baz.xml

This is preferred over PRODUCT_COPY_FILES because it uses
assemble_vintf to check manifest at build time.

Test: builds

Change-Id: I18517b8ba09d3271627d6f21b8250b1bfc9e5db3
2019-02-19 12:37:50 -08:00
Bowgo Tsai c1a8f1a5d7 GSI vbmeta.img: set rollback_index to zero
The major purpose of vbmeta.img built on GSI targets (e.g., aosp_arm,
aosp_arm64, etc) is to disable AVB. We should also set the rollback
index to zero, to prevent the device bootloader from updating the
last seen rollback index in the tamper-evident storage.

Bug: 122583908
Test: build aosp_arm64, then `avbtool info_image --image $OUT/vbmeta.img`
Change-Id: I48a49957f8dd3169003b9507fe80e519f301d5b5
2019-02-19 10:38:40 +08:00
Luca Stefani 461aaf9635 Merge "Fix flags argument passed to avbtool for GSI images" am: 6867fd7dda am: 15c83f9713
am: 428b90c473

Change-Id: I1ee5bff4e7d2fe48abab0b50eeb64932c75ea9be
2019-02-17 21:46:54 -08:00
Treehugger Robot 6867fd7dda Merge "Fix flags argument passed to avbtool for GSI images" 2019-02-18 05:27:52 +00:00
SzuWei Lin 6089834247 Merge "Fix booting problem on GSI with user build" am: b41ab14b1e am: 3e985e9b10
am: faffe14ea7

Change-Id: I34f18f0a5621429fae1abe110d5da2a19802c1fd
2019-02-15 02:54:26 -08:00
Treehugger Robot b41ab14b1e Merge "Fix booting problem on GSI with user build" 2019-02-15 10:37:44 +00:00
SzuWei Lin fd6d294c2b Fix booting problem on GSI with user build
GSI doesn't include gsi_system.prop on user build, and cause some
devices cannot boot GSI with user build. Some properies in
gsi_system.prop do not suitable for user build, the patch create
a new gsi_system_user.prop for GSI user build.

Bug: 124479721
Test: boot aosp_arm64-user on a blueline device.
Change-Id: Ide2bdc8e8733817afb832b50b28807768e22f011
2019-02-15 14:34:53 +08:00
Jiyong Park 45433aec35 Merge "TARGET_FLATTEN_APEX for GSI" am: 84f1ade63f am: cd3825adc7
am: 9772c4284a

Change-Id: I85f5b44b444a3050b85202eac5ae7bf7a29ca940
2019-02-12 00:23:16 -08:00
Jiyong Park 84f1ade63f Merge "TARGET_FLATTEN_APEX for GSI" 2019-02-12 08:04:39 +00:00
Jiyong Park c35a33e59c TARGET_FLATTEN_APEX for GSI
Regular (non-flattened) APEX may require changes to the kernel, which is
against the Treble promise. For maximum compatibility, APEXes are
flattened for GSI so that APEXes can be activated by legacy kernels.

Bug: 124159875
Test: N/A
Change-Id: Iea5701d3b917ebf8657d3ce38131c1838b51677e
2019-02-11 21:50:02 +09:00
Anton Hansson a16b161499 Merge "Enable suspend for mainline charger" am: c75e5ba356 am: faf0bbf2b8
am: 33f67f3c46

Change-Id: I4ef01514cc4a17f460d17fb2c379221f0d727c7d
2019-02-11 03:11:00 -08:00
Luca Stefani 7c7b4b6beb Fix flags argument passed to avbtool for GSI images
* avbtool expect extra flags to be passed with the --flags argument
  but currently we're missing an 's'.
  Luckily this isn't an issue as python argparse matches
  --flag as an alias to --flags ( python... )

Test: m vbmetaimage; check vbmeta header
Change-Id: I42d833c61c9b313dc067b1e519bae36395d09824
2019-02-10 19:59:27 +01:00
Anton Hansson b100f5b834 Enable suspend for mainline charger
Bug: 80410283
Test: make
Change-Id: I09efa8dd557d586424c342772925b9ab2940bc88
2019-02-08 13:34:49 +00:00
Anton Hansson ac03357fa7 Merge "Add bluetooth build config for mainline" am: 375291fa26 am: 6b50388c80
am: 9e78eb58ba

Change-Id: Iedda9dfda4513aff273be82e519bf570bc7fb30f
2019-02-07 00:23:57 -08:00
Anton Hansson 60bf75ae47 Add bluetooth build config for mainline
This matches the build config used on current mainline devices,
but should ideally be removed once possible.

Bug: 123695868
Test: boot blueline
Change-Id: I8fdef9fbe45b75f175afe9350974f54d1ec5e0c8
2019-02-06 15:51:03 +00:00
SzuWei Lin 0fae759a19 Merge changes I1772a55a,Ibd398d4f,If5476048,Ied201aad am: f834600fb3 am: c1ea73f62e
am: c93d4c67cd

Change-Id: If96022f3f2fc7a08558979d32513ce17c134078e
2019-02-01 16:52:30 -08:00
SzuWei Lin ce1fdb2f55 Change aosp_$arch.mk to inherit from gsi_common.mk
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
2019-02-01 11:29:02 +08:00
SzuWei Lin b31043144e Merge "Add gsi_common.mk" am: 59fa4ca993 am: a4dabb3050
am: 782e918327

Change-Id: I90fabbbec4f10b3b9092f22df649cdaeb7caf956
2019-01-29 21:59:15 -08:00
SzuWei Lin 97951719ae Add gsi_common.mk
gsi_common.mk is a new makefile file for GSI build targets.
It inherited the content from Mainline by mainline_system.mk.
Also it include other default GSI settings and try to covered
all contents from aosp_base_telephony.mk

It will be used to replace the treble_common*.mk. All
aosp_$arch*.mk will become to inherit from gsi_common.mk.

This patch also contains a new build target gsi_arm64,
which is used to test the gsi_common.mk purely.

Bug: 119747870
Test: compare the out system folder between gsi_arm64 and aosp_arm64
Test: also the gsi_arm64-userdebuge can boot on a Pixel device
Change-Id: I9a013f9407e0fe06b45011e36d5169b94f67148d
2019-01-29 18:00:04 +08:00
Dan Willemsen fee862995a Merge "Bump the remaining 32-bit arm configs to require neon" am: 1fdf5d789b am: 7ce2e247d9
am: f60131d3d8

Change-Id: If906225e372e1c278749ea0af8586dbdb4bdf77e
2019-01-24 20:14:23 -08:00
Dan Willemsen 53d62fed72 Bump the remaining 32-bit arm configs to require neon
Stop using armv7-a without neon for 32-bit unbundled apps, and update
generic_x86_arm to match the cuttlefish configuration that includes
neon.

Test: treehugger
Change-Id: Ieb6a2106655803a8ca609907c12168e628ee1b85
2019-01-23 22:27:33 -08:00
Anton Hansson d596209561 Merge "Enable 64-bit mediadrmserver for mainline" am: 767569b489 am: 9c67ac4003
am: a9ea6d883c

Change-Id: I0d48bf4b3d529a425e30a7454a25f9adc8abaa38
2019-01-23 02:23:04 -08:00
Anton Hansson 767569b489 Merge "Enable 64-bit mediadrmserver for mainline" 2019-01-23 09:56:46 +00:00
Anton Hansson f4e9102ea8 Merge "Set TARGET_COPY_OUT_ for product/vendor in mainline" am: 9a0dd5b288 am: dae8049421
am: 8dad70660d

Change-Id: Ib9eae63af430c2751093cfc731145139b708e421
2019-01-16 09:09:38 -08:00
Anton Hansson 9791518d58 Set TARGET_COPY_OUT_ for product/vendor in mainline
This product variable is used to generate the loader config (to use
either /system/product or /product), and the vendor one is likely
used in similar ways. Having these partitions is required for mainline
devices, so set it in the shared BoardConfig.

Bug: 80410283
Test: make
Change-Id: I6f2d94ff43572a28df54ea8c60f2d838a3b9216c
2019-01-16 13:32:51 +00:00
Elliott Hughes 59de691ecf Merge "Use NEON for CTS/SDK/VTS builds too (64-bit edition)." am: 6621a2fa8b am: 2818d925f9
am: 5bd3719dc2

Change-Id: I1f6dd9008ce3b7eb7330bc84fe95d5e6573767b8
2019-01-10 13:47:28 -08:00
Elliott Hughes eed7c8a458 Merge "Use NEON for CTS and SDK builds too." am: c64bc3229a am: 048939b1f0
am: c8a5ae36c0

Change-Id: I7cfbf110a81abf31aa816531b5ef0f6077ee84b4
2019-01-10 09:01:34 -08:00
Elliott Hughes 53a5581430 Use NEON for CTS/SDK/VTS builds too (64-bit edition).
It's 2019 and the CDD has required NEON for many years now.

I've left unbundled apps alone for now.

I think the recent fix here for https://issuetracker.google.com/116070933
was incorrect. (I've commented on the bug.)

Test: treehugger
Change-Id: Ia02305cfdff9fd18a85359bc44d8eb9cab1413bd
2019-01-10 08:59:47 -08:00
Elliott Hughes c64bc3229a Merge "Use NEON for CTS and SDK builds too." 2019-01-10 16:39:41 +00:00
SzuWei Lin e491887a29 Merge "Fix Legacy GSI settings for BoardConfigGsiCommon.mk" am: eeeb9f96c8 am: 3b9a7bca18
am: 27c2a4f8ab

Change-Id: I9ebce6a79e72f4ded2d337842671b47a361bd3a6
2019-01-09 19:35:19 -08:00
SzuWei Lin a2d5ed1bed Fix Legacy GSI settings for BoardConfigGsiCommon.mk
Legacy GSI had been changed to include BoardConfigGsiCommon.mk
instead of treble_common*.mk. However, some default settings are
different than the original. This patch fixes
BOARD_BUILD_SYSTEM_ROOT_IMAGE in Legacy GSI makefiles.

The patch also removes redundant settings and fix some comments.

Bug: 122282239
Test: make
Change-Id: Ie4eb8cf410bfd2edc74648c0e5ee81028242a1b7
2019-01-10 10:26:03 +08:00
Elliott Hughes 27932bf3a8 Use NEON for CTS and SDK builds too.
It's 2019 and the CDD has required NEON for many years now.

I've left unbundled apps alone for now.

Test: treehugger
Change-Id: Iee22d4605a81e2840063a203b76db7df5b4f3c37
2019-01-09 20:15:30 +00:00
Anton Hansson ac952ee4d7 Enable 64-bit mediadrmserver for mainline
This flag turns on 64-bit mediadrmserver for mainline. Keep the default
value for GSI for now.

Bug: 80410283
Test: make
Change-Id: Ie09b258f140b56121e4b531775b2a052b4dc6c15
2019-01-09 16:12:38 +00:00
SzuWei Lin 9d71661ea4 Merge "Refactor GSI BoardConfig.mk" am: 104904bdf0 am: eec9c48a6a
am: 8110b534f8

Change-Id: Ic1981c1cfeb172cd439b2b01be18fb3c0d532fc5
2019-01-08 22:29:14 -08:00
SzuWei Lin c0104fb4ed Merge "Set 32bits Legacy GSI to be 32bits binder" am: ebe0590d0a am: ec8517adb4
am: be5abf1b2a

Change-Id: If883acde4919e3666b4afc0d3ab678710fa0c7d2
2019-01-08 01:58:22 -08:00
SzuWei Lin 1457b3fcbf Refactor GSI BoardConfig.mk
The patch modifies the Legacy GSI to use BoardConfigGsiCommon.mk
instead of board config treble-common*.mk, and delete these
treble-common*.mk files.

After the patch, the GSI common board configs are in single file
BoardConfigGsiCommon.mk

The patch also includes:

- Moving `TARGET_COPY_OUT_VENDOR := vendor` to
  BoardConfigGsiCommon.mk, because GSI always contains no vendor
  contents.
- Configure the binder interface bitness explicitly.
- Unify the structure of each BoardConfig.mk.

Bug: 122282239
Test: compare the out folder between with and without the patch
Test: output files are all the same
Change-Id: Ie5901446920dda317dea848e6d5a7bbcf10a32cf
2019-01-08 17:35:05 +08:00
SzuWei Lin aee5affa6d Set 32bits Legacy GSI to be 32bits binder
The binder interface bitness is always 64bits from P.
To keep 32bits binder interface for Legacy GSI, we need to explict
configure it.

Bug: 122282239
Test: lunch aosp_arm_ab-userdebug; make -j
Change-Id: I90b45adb52c398d1c0cf3f877199f9dd1e0b3f86
2019-01-07 18:23:42 +08:00
Rajeev Kumar 53011f3c3a Enable statsd on Android Go devices running Android Q.
Bug: 120794303
Test: Manual test using following commands
adb shell getprop ro.statsd.enable
adb shell ps | grep statsd
adb shell cmd stats print-stats

Change-Id: I482544920069fa11ffeef686847923342e4d2a51
2018-12-19 19:30:13 +00:00
Anton Hansson 08ff4221e6 Merge "Reenable avb for mainline" am: 4a46570ff2 am: 0127f7dd4f
am: 5c50562aab

Change-Id: I8d33806ed913928f936f75d2ccc7cda99353ca97
2018-12-04 09:45:33 -08:00
Anton Hansson de6f4cfdc8 Reenable avb for mainline
Partial rollback of Id5d114bde8b93800fe52c791ccc47cdffd86f382.

It is likely mainline also wants some of the BOARD_AVB_SYSTEM.. flags,
but I'm not entirely sure which ones.

Test: run build_mixed with this patch
Change-Id: I6ef3c01f6c74e6d93cf798b26b8c7a4785bbefb4
2018-12-04 16:56:33 +00:00
Anton Hansson f49818173d Merge "Split GSI and mainline board configs" am: c0f0c2094d am: 42c220c79e
am: c144165c0b

Change-Id: I9b41873c56132c907bdb59bc01d1dd86cbd7dc3c
2018-12-03 08:07:28 -08:00
Anton Hansson c0f0c2094d Merge "Split GSI and mainline board configs" 2018-12-03 11:16:30 +00:00
Anton Hansson ba9016342f Merge "Remove USE_HWC2 plumbing and settings" am: bd5bad916a am: b9b80d4cab
am: dd4f2c5f45

Change-Id: Ic7d531a1b8fb539d9d7397e0db75fd816625d75d
2018-11-30 01:33:01 -08:00
Anton Hansson 40c4773288 Split GSI and mainline board configs
Make the mainline board config only import a subset of the GSI
options. The current set of attributes is the minimal set to
keep mainline_system_arm64 building, as well as not producing
any diffs in the current set of files in /system. It's possible
we'll need to move a few more over, but we'll do that on a
case-by-case basis.

Make the GSI config inherit the mainline one. The only diff for GSI
should be the addition of BOARD_USES_SYSTEM_OTHER_ODEX.

Bug: 119911662
Test: build mainline_system_arm64
Change-Id: Id5d114bde8b93800fe52c791ccc47cdffd86f382
2018-11-29 20:56:39 +00:00
Anton Hansson b91e0c5ab1 Remove USE_HWC2 plumbing and settings
Last use removed in Ibefde5feaeaec8fb68cbc6ea1c019bf8b5e608bb

Test: make
Change-Id: I0567347379b1d030ed2f8dba7babc1f22be5dac4
2018-11-29 10:08:07 +00:00
Anton Hansson cd60e6afa8 Merge "Add BOARD_USES_SYSTEM_OTHER_ODEX := true to mainline" am: 6f2cfd93d8 am: 366dd21d79
am: db0671a079

Change-Id: Ibcb99f8e8b36cf0c14d133b3bdfc88fe2cad6dfa
2018-11-20 02:34:46 -08:00
Anton Hansson adbafe0a7c Add BOARD_USES_SYSTEM_OTHER_ODEX := true to mainline
Likely not the final setting we'll settle with for this device,
but brings mainline_system builds closer to the device builds
it's targeting.

Bug: 80410283
Test: build mainline_arm64
Change-Id: Ib672d1a060d0ad6a4e1faa210461bbbbaf6f2bc6
2018-11-16 16:36:50 +00:00
Anton Hansson 627f275460 Merge "Add a mainline arm64 device" am: 89fe71180b am: a93cb53236
am: 54cbd82865

Change-Id: Icb02b9316395a7c23e9e2354c351047eb1b7bd05
2018-10-29 12:34:19 -07:00
Anton Hansson 284b81c1ae Add a mainline arm64 device
The existing 'generic' targets are emulator devices, and targeting
it has the side-effect of including emulator-specific artifacts.

Create a mainline device instead, which is really generic. This also
allows specifying tweaks unsuitable for the emulator.

Include BoardConfigGsiCommon for now, even though it includes a few
things we likely won't want in the future.

Bug: 80410283
Bug: 111538404
Test: lunch mainline_arm64; m
Change-Id: I15e7cb41fcbd3c0592a091ba7a8575ddf10bda71
2018-10-29 16:15:04 +00:00
SzuWei Lin 8fa8d16c8f Merge "Workaround Legancy GSI for some Wifi firmware" am: 17c9e2a296 am: 55b07f5b00
am: 02ce7df100

Change-Id: I7bc220ddf5eef7396ea0989bb8397f8104663dbb
2018-10-19 15:43:14 -07:00
Treehugger Robot 17c9e2a296 Merge "Workaround Legancy GSI for some Wifi firmware" 2018-10-19 22:22:03 +00:00
SzuWei Lin 11892a4b9a Workaround Legancy GSI for some Wifi firmware
Bug: 117963911
Test: Turn on wifi with aosp_arm64_ab-userdebug on Pixel 1/2/3 devices
Change-Id: I0d516876522a687709ff21cbfc5bc0cc415b8335
2018-10-19 17:37:20 +08:00
bohu ef14e322c2 Merge "fix generic_x86_arm"
am: 569ddd300b

Change-Id: I66338017c69b4ecfad9c630b1f9cbc6c45041d86
2018-10-18 00:27:28 -07:00
bohu 9b4e805a4d fix generic_x86_arm
To make the generic_x86_arm bootable.
Third party translabor binary can be added on the resulting
system.img and be tested at least on emulator.

BUG: 117673798

Change-Id: Iffbcf9217bbedc12ba83a4851e84ecbf299bf8e7
Merged-In: Iffbcf9217bbedc12ba83a4851e84ecbf299bf8e7
2018-10-17 21:57:15 +00:00
bohu ec849266a1 fix generic_x86_arm
To make the generic_x86_arm bootable.
Third party translabor binary can be added on the resulting
system.img and be tested at least on emulator.

BUG: 117673798

Change-Id: Iffbcf9217bbedc12ba83a4851e84ecbf299bf8e7
2018-10-17 14:54:31 -07:00
Bowgo Tsai 94a6706eec Merge "Revert "Fix build error for sdk_gphone_x86_64-userdebug"" am: 3e795ee38b am: aba6c98fd2
am: 9b858192b7

Change-Id: I709ddec3f7f0dedd34c0992361010471002eb79c
2018-10-04 00:02:46 -07:00
Bowgo Tsai aba6c98fd2 Merge "Revert "Fix build error for sdk_gphone_x86_64-userdebug""
am: 3e795ee38b

Change-Id: I1f97f0e1c36115e341397bbac76d684a083198d5
2018-10-03 23:52:22 -07:00
Treehugger Robot 3e795ee38b Merge "Revert "Fix build error for sdk_gphone_x86_64-userdebug"" 2018-10-04 06:37:38 +00:00
Bowgo Tsai 3ac95b53f4 Revert "Fix build error for sdk_gphone_x86_64-userdebug"
This reverts commit 6924b25729.

Reason for revert: with the following fix, this workaround is no longer needed.
  https://android-review.googlesource.com/c/platform/build/+/762663

Bug: 112322265
Change-Id: I07363f6a5aa1697b6f7702343f3120e1049f07d8
Test: build sdk_gphone_x86_64-userdebug
2018-10-04 04:35:55 +00:00
yidong.zhang d0699b79bd Merge "Enable TARGET_2ND_ARCH_VARIANT := armv7-a for vts build" am: 993513a7d0 am: 62a5929b56
am: d8249b4fa9

Change-Id: I7bb36022bc2c5c6cba6b65d083cd55f08bdd749e
2018-09-21 14:38:45 -07:00
yidong.zhang 62a5929b56 Merge "Enable TARGET_2ND_ARCH_VARIANT := armv7-a for vts build"
am: 993513a7d0

Change-Id: Ic3b9480cd54942a13c8918a66ec22b45db78ed05
2018-09-20 22:55:27 -07:00
yidong.zhang f190daa19b Enable TARGET_2ND_ARCH_VARIANT := armv7-a for vts build
Vts release package is not compatible with cortext-a7(armv7-a) cores.
Build vts with TARGET_2ND_ARCH_VARIANT := armv7-a instead of armv8-a.

Bug: 116070933
Test: run vts -m VtsHalBaseV1_0TargetTest on cortext-a7 platform
Change-Id: I8089856223bac5129ad807496ad78b2cbfe1cc8a
2018-09-20 15:14:41 +00:00
Bowgo Tsai 3e8bbc1035 Merge "Fix build error for sdk_gphone_x86_64-userdebug" am: 8596dd8828 am: afb8caeadc
am: 2d48d064cd

Change-Id: Idba8d55873b43ac746e2bca2e79c118f1473b42f
2018-09-11 07:52:45 -07:00
Bowgo Tsai afb8caeadc Merge "Fix build error for sdk_gphone_x86_64-userdebug"
am: 8596dd8828

Change-Id: Id209bcb1c4f24419980fdbb7dbef6c3c423ce788
2018-09-11 07:42:22 -07:00
Bowgo Tsai 6924b25729 Fix build error for sdk_gphone_x86_64-userdebug
Increases BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE to 128MB to fix
the build break. This is because we enabled AVB signing in the following
CL. And verified boot metadata will consume the reserved size in current
build system.

  https://android-review.googlesource.com/c/platform/build/+/745691

Bug: None
Test: build sdk_gphone_x86_64-userdebug
Change-Id: If1f44dccbc3a69b1b38a23e979f50c2c52401a25
2018-09-11 19:23:14 +08:00
Bowgo Tsai 038aa9038e Merge "Enable AVB signing on GSI" am: d9a58852bd am: 84452c6876
am: e51be704f6

Change-Id: I753227ffea20f252b52cdae608b7f2c21a368c2f
2018-09-10 23:46:38 -07:00
Bowgo Tsai 84452c6876 Merge "Enable AVB signing on GSI"
am: d9a58852bd

Change-Id: I16b4761de19f135265df4df5698f042ee8c47400
2018-09-10 23:37:17 -07:00
Bowgo Tsai 9d28638cfc Enable AVB signing on GSI
In current GSI builds, AVB signing is not allowed.
We should allow signing GSI image, while building a vbmeta.img with
AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED (flag 2).

When need to disable AVB, use the vbmeta.img above together with the
GSI. When need enable AVB on GSI, include the GSI public key into the
device-specific vbmeta.img. Note that GSI is a chain partition so the
keys used to sign GSI and vbmeta.img are different.

Bug: 112293933
Test: build aosp_arm64-userdebug, checks flag 2 is set in vbmeta.img
      and there is AVB HASHTREE in system.img
      `avbtool info_image --image $OUT/system.img`
      `avbtool info_image --image $OUT/vbmeta.img`

Change-Id: If1eff317621882994e7dcbf37cd35f5bfa16b69a
2018-09-06 09:41:42 +08:00
Kevin Rocard b4150586c5 Add emulator audio policy config in /vendor not /system
audio_policy_configuration_generic.xml is pushed in /system as the default
configuration (used if the vendor does not provide one in /vendor or /odm)
and for the emulator.

As a result it can be parsed by 2.0 and 4.0 audio HALs. The format
is retro-compatible, but not forward-compatible.

Additionally, the generic config pushed in /system should never be used
as the vendor should always provide a configuration file describing its
target architecture. Thus it should not be part of the GSI.

Those files were originally pushed in /system the emulator
target does not provide its own configuration file.
The emulator should provide config file instead in /vendor instead.

Bug: 78543061
Test: sdk_gphone_x86 and aosp_x86_64 emulator has audio
Test: adb shell cat /vendor/etc/audio_policy_configuration.xml | diff - \
          frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml
Change-Id: Ice43cb4670a82f4e60fcccc58a636d224f240b5a
Merged-In: Ice43cb4670a82f4e60fcccc58a636d224f240b5a
Signed-off-by: Kevin Rocard <krocard@google.com>
(cherry picked from commit dad3ad6126)
2018-08-21 06:42:11 +00:00
Dan Willemsen 140839b15c Merge "Remove default BUILD_BROKEN_DUP_RULES := false" am: aa47189e1c am: 555904b0f3
am: a5d2c326f5

Change-Id: I395a80e5519a03a8fa77f8de54d5b2f6488dd1d1
2018-08-14 20:00:51 -07:00
Colin Cross aaa5a14719 Merge "Remove TARGET_USES_MKE2FS" am: de684e84fb am: 232bc25b8a
am: 8ebb4ac573

Change-Id: I41bb6a7b580d609807277d85d9db93123653e636
2018-08-14 17:21:11 -07:00
Dan Willemsen 555904b0f3 Merge "Remove default BUILD_BROKEN_DUP_RULES := false"
am: aa47189e1c

Change-Id: Ib623fe24300b4310509f9b9d07aa26479226a8fe
2018-08-14 16:40:05 -07:00
Treehugger Robot aa47189e1c Merge "Remove default BUILD_BROKEN_DUP_RULES := false" 2018-08-14 23:32:20 +00:00
Colin Cross 232bc25b8a Merge "Remove TARGET_USES_MKE2FS"
am: de684e84fb

Change-Id: If2f3d4fba3e782d12962b2d99b3d6b709ff85b70
2018-08-14 15:51:33 -07:00
Dan Willemsen d1f319bc48 Remove default BUILD_BROKEN_DUP_RULES := false
This is now false by default.

Bug: 77611511
Test: build_test on git_master
Change-Id: I37ad52a3846c77da184725e7d6f4daae9f4b7f1c
2018-08-14 13:23:49 -07:00
Colin Cross a110579e31 Remove TARGET_USES_MKE2FS
Nothing reads TARGET_USES_MKE2FS any more, mke2fs is always used.
Remove the requirement that TARGET_USES_MKE2FS is set, and remove
the places it is set.

Bug: 112241651
Test: m checkbuild
Change-Id: Ibdca062bbe7dcd19ba8f7ee7f8291ce746b74e65
2018-08-13 17:40:26 +00:00
TreeHugger Robot 431a392db0 Merge "Enable dyanmic image size for GSI" into stage-aosp-master 2018-08-07 03:36:42 +00:00
Isaac Chen b11a33230c Merge "Revert "Revert "Build GSIs (aosp_$arch products) in sparse format""" am: 451fa13fa6 am: 3085fc0c05 am: e0feda17dc
am: 527d1f1e81

Change-Id: Idb36f2ba72066f2e8e3c3476c59a88119182cb4b
2018-08-06 14:28:41 -07:00
Isaac Chen e0feda17dc Merge "Revert "Revert "Build GSIs (aosp_$arch products) in sparse format""" am: 451fa13fa6
am: 3085fc0c05

Change-Id: I873482e8a707ae2930e12fb4a333dbef95812e0b
2018-08-06 13:18:12 -07:00
Isaac Chen 3085fc0c05 Merge "Revert "Revert "Build GSIs (aosp_$arch products) in sparse format"""
am: 451fa13fa6

Change-Id: I655794830ffc687c55f29d700368b9fc7074d23c
2018-08-06 12:10:14 -07:00
SzuWei Lin 56ad542fb8 Merge "Enable dyanmic image size for GSI" into stage-dr1-aosp-master am: cccca824ef
am: 8d4e8d3616

Change-Id: If2f4097ec8780235605ccb10a7afd42f8773edc0
2018-08-06 11:56:04 -07:00
TreeHugger Robot cccca824ef Merge "Enable dyanmic image size for GSI" into stage-dr1-aosp-master 2018-08-06 18:41:42 +00:00
Isaac Chen b9b51b1b73 Revert "Revert "Build GSIs (aosp_$arch products) in sparse format""
This reverts commit 132748cb80.

Reason for revert: The e2fsck issue, b/112062612, that caused the
revert of the original CL has been fixed in aosp/725259.

Change-Id: I5c919aedcc5b1c4823f565ea2bbe0e6ea81bc3b0
2018-08-06 02:48:28 +00:00
TreeHugger Robot baff15d43f Merge "Add emulator audio policy config in /vendor not /system" into stage-dr1-aosp-master 2018-08-03 17:52:51 +00:00
SzuWei Lin aadbd3084c 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
2018-08-03 06:57:19 +00: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
Colin Cross 9e9f74dc2f Merge "Revert "Build GSIs (aosp_$arch products) in sparse format"" am: a2b0e478d3 am: 9d2fe1b5c7 am: cf15d77bbd
am: 5471e17875

Change-Id: Ifd8eef4162c592f84a4b0495369b225d07988d85
2018-08-01 02:44:33 -07:00
Colin Cross cf15d77bbd Merge "Revert "Build GSIs (aosp_$arch products) in sparse format"" am: a2b0e478d3
am: 9d2fe1b5c7

Change-Id: I57115c3462dad64acc10a95fe2204599d66dae91
2018-08-01 02:33:23 -07:00
Colin Cross 9d2fe1b5c7 Merge "Revert "Build GSIs (aosp_$arch products) in sparse format""
am: a2b0e478d3

Change-Id: Ia2191fd7e0653f7f634bf273667aecbdffa5635c
2018-08-01 02:29:23 -07:00
Colin Cross 132748cb80 Revert "Build GSIs (aosp_$arch products) in sparse format"
This reverts commit bc0248f211.

Reason for revert: Triggered preexisting issue with e2fsck and ASAN

Bug: 112062612
Change-Id: I7b52fe539252ab1bb7229d32accb7abd6417f470
2018-08-01 06:26:03 +00:00
Kevin Rocard f36085bff9 Add emulator audio policy config in /vendor not /system
audio_policy_configuration_generic.xml is pushed in /system as the default
configuration (used if the vendor does not provide one in /vendor or /odm)
and for the emulator.

As a result it can be parsed by 2.0 and 4.0 audio HALs. The format
is retro-compatible, but not forward-compatible.

Additionally, the generic config pushed in /system should never be used
as the vendor should always provide a configuration file describing its
target architecture. Thus it should not be part of the GSI.

Those files were originally pushed in /system the emulator
target does not provide its own configuration file.
The emulator should provide config file instead in /vendor instead.

Bug: 78543061
Bug: 111963599
Test: sdk_gphone_x86 and aosp_x86_64 emulator has audio
Test: adb shell cat /vendor/etc/audio_policy_configuration.xml | diff - \
          frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml
Change-Id: Ice43cb4670a82f4e60fcccc58a636d224f240b5a
Merged-In: Ice43cb4670a82f4e60fcccc58a636d224f240b5a
Signed-off-by: Kevin Rocard <krocard@google.com>
(cherry picked from commit dad3ad6126)
2018-08-01 04:22:50 +00:00
Isaac Chen 93e6850cbb Merge "Build GSIs (aosp_$arch products) in sparse format" am: 44c61176e8 am: 442e2f4441 am: b2f34a44ac
am: f10e900e35

Change-Id: Ibd20d11d8d179e62e4e6a269737256075198ba4e
2018-07-31 09:18:59 -07:00
Isaac Chen b2f34a44ac Merge "Build GSIs (aosp_$arch products) in sparse format" am: 44c61176e8
am: 442e2f4441

Change-Id: I7297b2bacf91db615c480e0de3c3edad0b3a0030
2018-07-31 09:09:41 -07:00
Isaac Chen 442e2f4441 Merge "Build GSIs (aosp_$arch products) in sparse format"
am: 44c61176e8

Change-Id: Icfb51956662a4dbca0f8cf37ea9e4ddc6fe1c214
2018-07-31 09:05:31 -07:00
Mathieu Chartier 2781e8ba56 Move ro.config.low_ram back to being a vendor property
(cherry-picked from commit 2fb62c8ea0)

Bug: 110517986
Test: make
Merged-In: I1394ac1220c290533fbe9641d10c5997362577fd
Change-Id: I1394ac1220c290533fbe9641d10c5997362577fd
2018-07-30 20:12:52 +00:00
Isaac Chen bc0248f211 Build GSIs (aosp_$arch products) in sparse format
After aosp/719235 is merged, mk_qemu_image.sh now accepts
images in both raw and sparse formats. So We can build GSIs
(system images of aosp_$arch products) in sparse format, which,
historically, is expected by users of GSIs.

Bug: 111775319
Test: The system images below are all in sparse format:
    $ 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: I4cb8df0908c4618376117249b61c853fac947e47
2018-07-27 10:33:57 +08:00
SzuWei Lin db3d1712f5 resolve merge conflicts of 2927f2185c to stage-dr1-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I7812dcb06172fd0ca5caf38ad8ee616cf1936f43
2018-07-23 16:28:14 +08:00
SzuWei Lin 2927f2185c Merge "Move some BoardConfig settings from EmuCommon to GsiCommon"
am: bcc4081cd1

Change-Id: I456dde1025f2e61c3c9c463c38279aa0404d91ac
2018-07-23 00:35:49 -07:00
SzuWei Lin 9469377fec Merge "Move some BoardConfig settings from EmuCommon to GsiCommon" into pi-dev-plus-aosp
am: ee11fe287b

Change-Id: Ic1878311d5ec18addee2ad66bf88eee574ef126c
2018-07-22 23:58:54 -07:00
SzuWei Lin e592c965ee Move some BoardConfig settings from EmuCommon to GsiCommon
Move the settings which effect the system image to the file
BoardConfigGsiCommon.mk

Bug: 80117040
Test: build aosp_arm64-userdebug and pass
Change-Id: I42b14a124992c21b2da0e9e6197b1c38c6e58ce3
Merged-In: I42b14a124992c21b2da0e9e6197b1c38c6e58ce3
2018-07-18 10:19:46 +00:00
SzuWei Lin 96d51f0c54 Move some BoardConfig settings from EmuCommon to GsiCommon
Move the settings which effect the system image to the file
BoardConfigGsiCommon.mk

Bug: 80117040
Test: build aosp_arm64-userdebug and pass
Change-Id: I42b14a124992c21b2da0e9e6197b1c38c6e58ce3
2018-07-18 18:17:21 +08:00
Isaac Chen 8e7d526c41 Merge "Create extra symbolic links at root for arm64 GSI" am: 226dd71836 am: 19a41487e9
am: 7831ed6d31

Change-Id: Id7be2738c6330ec962348b6663355e153a16078e
2018-07-16 21:19:43 -07:00
Isaac Chen 7831ed6d31 Merge "Create extra symbolic links at root for arm64 GSI" am: 226dd71836
am: 19a41487e9

Change-Id: If4d98998ff1c40ab1564f5107aad9dd719246aa6
2018-07-16 21:16:04 -07:00
Isaac Chen 19a41487e9 Merge "Create extra symbolic links at root for arm64 GSI"
am: 226dd71836

Change-Id: I83fa295a8657ba93dd7e8e008e4c929499c0d1fd
2018-07-16 21:12:25 -07:00
Treehugger Robot 226dd71836 Merge "Create extra symbolic links at root for arm64 GSI" 2018-07-17 04:04:12 +00:00
Isaac Chen 50978e8640 Create extra symbolic links at root for arm64 GSI
Relevant firmware/SW components have been moved out of directories
under root, but not all references to them updated. For example,
/vendor/firmware_mnt won't be used by Android to load firmware.
So we still need these symlinks so the firmware/SW components can
be accesses.

These links should be removed after all references are updated.

Bug: 111287060
Test: $ lunch aosp_arm64-userdebug; m -j
      # Checked $OUT/root for the added links
Change-Id: Ia7915dbdeabdee7a5cf8851772e89f080b927c45
2018-07-17 10:10:31 +08:00
Mathieu Chartier 2fb62c8ea0 Move ro.config.low_ram back to being a vendor property
Bug: 110517986
Test: make
Change-Id: I1394ac1220c290533fbe9641d10c5997362577fd
2018-07-10 13:19:14 -07:00
SzuWei Lin 9b619a9621 Merge "Add USE_XML_AUDIO_POLICY_CONF to GSI" am: 88a60636b3 am: 808b06d658
am: 89cdf13dff

Change-Id: Ia926894e695fcbc149ad7bb27e79e4bb83a6894c
2018-07-07 16:41:27 -07:00
SzuWei Lin 89cdf13dff Merge "Add USE_XML_AUDIO_POLICY_CONF to GSI" am: 88a60636b3
am: 808b06d658

Change-Id: If30117a53ed897c3a3f55718985ad9755882b4d5
2018-07-07 16:37:47 -07:00
SzuWei Lin 808b06d658 Merge "Add USE_XML_AUDIO_POLICY_CONF to GSI"
am: 88a60636b3

Change-Id: I4472c2d88202bd8a074373a8b1325e4d96efa6a8
2018-07-07 16:34:10 -07:00
SzuWei Lin fa420b40c5 Add USE_XML_AUDIO_POLICY_CONF to GSI
USE_XML_AUDIO_POLICY_CONF is must for Treble device, so it is
also must on GSI. The settings is missed when creating GSI
aosp_$arch, add it back by this patch.

Bug: 110988359
Bug: 111053290
Test: build aosp_arm64 and build pass
Change-Id: I95f096e58350233fdcc8de115cc1691360070445
2018-07-06 13:22:35 +08:00
Isaac Chen 55e1d01f92 Refactor BoardConfig.mk for emulator products
The majority of the contents in BoardConfig.mk of emulator products
are the same. The common part is factored out as EmuConfig.mk so it's
easier to maintain these closely related products going forward.

Bug: 80117040
Test: Following products have been built and booted to homescreen:
  $ lunch aosp_x86-userdebug; m -j; emulator
  $ lunch aosp_x86_64-userdebug; m -j; emulator

Change-Id: I5392e0e88865d4908906a67c29939c23af84baf0
Merged-In: I5392e0e88865d4908906a67c29939c23af84baf0
(cherry picked from commit 510b76d8ff)
2018-07-05 18:47:15 +08:00
Isaac Chen 116c46928d Merge "Refactor BoardConfig.mk for emulator products" into stage-aosp-master am: c9ff0edb20
am: 7f2eb04bb6

Change-Id: I2a2b98ce6db55c89cc2193842f8b7dc72a1b602f
2018-07-04 10:44:44 -07:00
Isaac Chen 7f2eb04bb6 Merge "Refactor BoardConfig.mk for emulator products" into stage-aosp-master
am: c9ff0edb20

Change-Id: I316f9712786b283918a9a938e78e50c181ab6e9e
2018-07-04 10:40:45 -07:00
Isaac Chen 510b76d8ff Refactor BoardConfig.mk for emulator products
The majority of the contents in BoardConfig.mk of emulator products
are the same. The common part is factored out as EmuConfig.mk so it's
easier to maintain these closely related products going forward.

Bug: 80117040
Test: Following products have been built and booted to homescreen:
  $ lunch aosp_x86-userdebug; m -j; emulator
  $ lunch aosp_x86_64-userdebug; m -j; emulator

Change-Id: I5392e0e88865d4908906a67c29939c23af84baf0
2018-07-03 09:58:59 +00:00
Bowgo Tsai 631900e6ce Enable /cache mount point
Non-A/B devices using AOSP OTA flow will mount /cache in the
fstab file. Without setting BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE,
/cache will be a symlink to /data/cache which introduces the
failure of `mount_all /vendor/etc/fstab.{ro.hardware}`. This is
because all devices laucned in P need to switch to "system-as-root".

This CL sets board config to create /cache directory in rootfs
(system-as-root GSI image). Note that A/B devices doesn't mount
or use /cache so leaving an empty /cache in rootfs has no harm.

Bug: 78485405
Test: Boot GSI on walleye
Change-Id: Ic260d2917cc64c9497f5f60ea11303e953e80efd
Merged-In: Ic260d2917cc64c9497f5f60ea11303e953e80efd
2018-06-29 14:23:25 +01:00
Anton Hansson 6ad2c2b3a8 Merge "Add some experimental mainline targets." into stage-aosp-master am: c74d03ed18
am: 91c4688045

Change-Id: Iceeaa7bbcb7ac82ad840d3122e484caf5aaac5b4
2018-06-29 03:13:56 -07:00
Anton Hansson 91c4688045 Merge "Add some experimental mainline targets." into stage-aosp-master
am: c74d03ed18

Change-Id: Ic85dbb05e5e1c23d689487fc34f6eef51f01cb10
2018-06-29 03:09:58 -07:00
Anton Hansson c0c39cf270 Add some experimental mainline targets.
These are not really realistic at the moment, but it's nice to get some
targets checked in that can be iterated upon.

- mainline_system: base mk for mainline systemimage. It will evolve to
  inherit other mks than base, and probably get a bunch of things added.
- mainline_system_arm: variant of mainline_system, specifically for
  the 'generic' device.
- mainline_arm: experimental product that also includes the non-system
  parts of aosp. Useful to experiment with the mk split.

Bug: 80410283
Test: lunch mainline_arm64 && m nothing && lunch mainline_system_arm64 && m nothing
Change-Id: I9beaa6f5f9c683733ed76a6d4e5c70b9376a5bb2
Merged-In: I9beaa6f5f9c683733ed76a6d4e5c70b9376a5bb2
2018-06-28 17:28:24 +01:00
Anton Hansson cf27a3da33 Add some experimental mainline targets.
These are not really realistic at the moment, but it's nice to get some
targets checked in that can be iterated upon.

- mainline_system: base mk for mainline systemimage. It will evolve to
  inherit other mks than base, and probably get a bunch of things added.
- mainline_system_arm64: variant of mainline_system, specifically for
  the 'generic' device.
- mainline_arm64: experimental product that also includes the non-system
  parts of aosp. Useful to experiment with the mk split.

Bug: 80410283
Test: lunch mainline_arm && m nothing && lunch mainline_system_arm && m nothing
Change-Id: I9beaa6f5f9c683733ed76a6d4e5c70b9376a5bb2
2018-06-28 17:27:08 +01:00
Mathieu Chartier f39c2c7495 Move go default system properties into prop files
Test: manual
Bug: 110517986

(cherry-picked from commit 732a4cc62f)

Merged-In: I28f5c18bb9e70c755ece50c49c02434f825878dc
Change-Id: I28f5c18bb9e70c755ece50c49c02434f825878dc
2018-06-26 15:12:46 -07:00
Mathieu Chartier 732a4cc62f Move go default system properties into prop files
Test: manual
Bug: 110517986

Change-Id: I28f5c18bb9e70c755ece50c49c02434f825878dc
2018-06-26 18:26:21 +00:00
TreeHugger Robot d8f86ae1fe Merge "Add emulator audio policy config in /vendor not /system" 2018-06-21 18:08:50 +00:00
Dan Willemsen 9bc1da527f Merge "aosp_x86_arm builds have overriding commands" am: 6ae08c1416
am: 93e1a187c7

Change-Id: I5448aa14a1f0d104bebbeb269c1999fe971ece9a
2018-06-20 10:07:11 -07:00
Dan Willemsen 93e1a187c7 Merge "aosp_x86_arm builds have overriding commands"
am: 6ae08c1416

Change-Id: Ie3cf105dfa9fca4c2e26e2a5e96b992a1be343b6
2018-06-20 10:03:54 -07:00
Dan Willemsen 5250840358 aosp_x86_arm builds have overriding commands
This product has warnings about overriding build commands, which means
that there are multiple instructions on how to build a file, and we've
just picked one of them. Which one we pick is usually stable, but it can
change.

Bug: 77611511
Test: turn default to false, aosp_x86_arm still uses a warning
Change-Id: Id821c04e3dd6a1f69ea748827c3570a751b4e1dd
2018-06-19 23:25:16 -07:00
Kevin Rocard dad3ad6126 Add emulator audio policy config in /vendor not /system
audio_policy_configuration_generic.xml is pushed in /system as the default
configuration (used if the vendor does not provide one in /vendor or /odm)
and for the emulator.

As a result it can be parsed by 2.0 and 4.0 audio HALs. The format
is retro-compatible, but not forward-compatible.

Additionally, the generic config pushed in /system should never be used
as the vendor should always provide a configuration file describing its
target architecture. Thus it should not be part of the GSI.

Those files were originally pushed in /system the emulator
target does not provide its own configuration file.
The emulator should provide config file instead in /vendor instead.

Bug: 78543061
Test: sdk_gphone_x86 and aosp_x86_64 emulator has audio
Test: adb shell cat /vendor/etc/audio_policy_configuration.xml | diff - \
          frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml
Change-Id: Ice43cb4670a82f4e60fcccc58a636d224f240b5a
Signed-off-by: Kevin Rocard <krocard@google.com>
2018-06-19 17:48:10 -07:00
Weilun Du dfe622a1ef Merge "Increase system image size to 2.5 GB" into pi-dev
am: bd141d36a0

Change-Id: I28c9f05314f7ce00969c45a03863f52a8d68b3a4
2018-06-18 16:23:59 -07:00
Weilun Du 31b2f7e57f Increase system image size to 2.5 GB
Fixed build breakge caused by insufficient image size.
BUG: 110198136

Change-Id: I12a4a43b522b7867ff789854cf5b76d13f2f5499
Signed-off-by: Weilun Du <wdu@google.com>
2018-06-17 15:37:53 -07:00
Treehugger Robot 7f0ac95d21 Merge "Set proper CPU variant for aosp_arm" 2018-06-15 20:19:10 +00:00
Isaac Chen e44b0d96b9 Set proper CPU variant for aosp_arm
System image of aosp_arm products is the new GSI in Pi.
Its arch variants need to be the same as the legacy GSI built
with aosp_arm_ab so it can pass related CTS/VTS tests.

Bug: 80401108
Test: $ lunch aosp_arm-userdebug; m -j; emulator # booted OK
      $ lunch aosp_arm-userdebug; m -j cts

Change-Id: I29fffca3e02a2251913a327b54640fc622e77a8d
Merged-Id: I29fffca3e02a2251913a327b54640fc622e77a8d
(cherry picked from commit b2e58893c3)
2018-06-15 18:40:42 +00:00
bohu a89ee59b13 emualtor: cleanup media configuration
am: d7dd3e2d3d

Change-Id: I86c7507d4c850f1d03710b03f5a52aa50fe1d6df
2018-06-13 16:01:39 -07:00
Android Build Merger (Role) f249ced167 [automerger] emualtor: cleanup media configuration am: d7dd3e2d3d am: 4cf7715bab
Change-Id: If6fae38c988be3d60602f3b2f22133b638734e37
2018-06-13 22:58:08 +00:00
TreeHugger Robot e64b309d22 Merge "emulator: move sepolicy to goldfish project" into pi-dev 2018-06-13 22:19:14 +00:00
Bo Hu 82de42067e Merge "emulator: move sepolicy to goldfish project" 2018-06-13 22:14:32 +00:00
bohu d7dd3e2d3d emualtor: cleanup media configuration
The media configuration is handled by goldfish/vendor.mk
already; clean them up from device.mk files.

this cl does not impact arm devices;
and it does the right thing for x86/64 devices
because the media configuration should go to vendor
instead of staying on system

BUG: 110030159
Change-Id: If492f1e01f600b1c969e9ef04598f7af6783970e
2018-06-13 22:10:51 +00:00
bohu 0d749a7a3e emulator: move sepolicy to goldfish project
The sepolicies are emulator specific and are installed
under vendor partition, move them to the right location.

this cl does not impact real devices, as the selinux
rules are for emulator only

BUG: 110030159
Change-Id: I6acc27a3b787a3fafd9373c84492537185b184c5
Merged-In: I6acc27a3b787a3fafd9373c84492537185b184c5
2018-06-13 22:09:24 +00:00
bohu 4abeb75f32 emulator: move sepolicy to goldfish project
The sepolicies are emulator specific and are installed
under vendor partition, move them to the right location.

BUG: 110030159
Change-Id: I6acc27a3b787a3fafd9373c84492537185b184c5
Merged-In: I6acc27a3b787a3fafd9373c84492537185b184c5
2018-06-13 12:45:47 -07:00
bohu 4001858313 emulator: move sepolicy to goldfish project
The sepolicies are emulator specific and are installed
under vendor partition, move them to the right location.

BUG: 110030159
Change-Id: I6acc27a3b787a3fafd9373c84492537185b184c5
Merged-In: I6acc27a3b787a3fafd9373c84492537185b184c5
2018-06-13 18:37:16 +00:00
bohu 780692fe61 emulator: move sepolicy to goldfish project
The sepolicies are emulator specific and are installed
under vendor partition, move them to the right location.

BUG: 110030159
Change-Id: I6acc27a3b787a3fafd9373c84492537185b184c5
2018-06-13 11:30:30 -07:00
Treehugger Robot 59c5127bea Merge "Create system.prop for GSI Pi" 2018-06-13 17:48:06 +00:00
Bjoern Johansson 2bfb5627ea Merge "Support new hostapd build target without HIDL"
am: acbfc3fb94

Change-Id: I13bc909b0ba2204703ccc166ae17624efe8ab3d5
2018-06-12 17:12:15 -07:00
Bjoern Johansson a2d754ce3a Support new hostapd build target without HIDL
The new build target for hostapd does not include the HIDL control
interface and it's a separate binary from the hostapd used for WiFi
hotspots. This new binary needs its own SELinux rules and it should be
included in emulator builds since it's used to provide virtual access
points.

BUG: 74401469
Test: run cts -m CtsNetTestCases

(cherry picked from commit a53c522678)

Change-Id: I8fa4908d1bef8ff25573abb72bbac433ae3151de
2018-06-12 11:39:00 -07:00
SzuWei Lin 326ad779c1 Create system.prop for GSI Pi
Properties for GSI Pi are not exactly the same as those for legacy GSI.
Create a new gsi_system.prop for GSI Pi to avoid reusing legacy
treble_system.prop used by legacy GSI (aosp_$arch_a(b) products).

Bug: 78605339
Test: build and observe the system/build.prop
Change-Id: I435e33558e244009af9a91a97580fd56591ff6f3
Merged-In: I435e33558e244009af9a91a97580fd56591ff6f3
(cherry picked from commit 3fc49fede8)
2018-06-12 18:03:31 +08:00
Bjoern Johansson a53c522678 Support new hostapd build target without HIDL
The new build target for hostapd does not include the HIDL control
interface and it's a separate binary from the hostapd used for WiFi
hotspots. This new binary needs its own SELinux rules and it should be
included in emulator builds since it's used to provide virtual access
points.

BUG: 74401469
Test: run cts -m CtsNetTestCases
Change-Id: I6a654ac2dea20af048ac731876ac603773fcf3d8
2018-06-11 15:56:51 -07:00
bohu 3a83195522 emulator: update aosp sepolicies
There have been quite some changes that should go to aosp.
This CL squash all of them into a single one.

Change-Id: I1e8d172b99cc98c93f2925fef32da8b461c277ed
Merged-In: I93b8489f710d194917d4b482ebca960c39658fd9
Merged-In: Ifac85db4e13d0b946f91b7eeffb4288d40d0ebb8
2018-06-11 15:56:25 -07:00
Bo Hu 23508266a8 Merge "emulator: allows vendor_init to set qemu_props" into pi-dev
am: 8e2f247ca1

Change-Id: Ifac85db4e13d0b946f91b7eeffb4288d40d0ebb8
2018-06-07 21:05:49 -07:00