Commit Graph

992 Commits

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