Commit graph

1062 commits

Author SHA1 Message Date
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