Commit graph

5973 commits

Author SHA1 Message Date
Beverly Tai
7943056adc Merge "Revert "Retire mainline.mk"" 2020-05-27 14:02:57 +00:00
Beverly Tai
4003bd9def Revert "Retire mainline.mk"
This reverts commit 60c0064902.

Reason for revert: build breakages

Change-Id: Ie8304d1979c50578901efed77fb31281c336505c
Fixes: 157548597
2020-05-27 13:28:22 +00:00
Treehugger Robot
6a00738ed8 Merge "Create emulator_* devices for emulators" 2020-05-27 11:27:58 +00:00
Treehugger Robot
8ecc4d5710 Merge "Retire mainline.mk" 2020-05-27 10:31:28 +00:00
SzuWei Lin
c73db784b9 Create emulator_* devices for emulators
aosp_arm64 has no emulators after the patch:

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

The patch creates all other emulator_* devices by cloning from
generic_*, and modify all sdk_phone_* to use them.

Bug: 111538404
Test: build sdk_phone_armv7-userdebug
Test: build sdk_phone_x86_64-userdebug
Test: build sdk_phone_x86-userdebug
Change-Id: I2b82e999ea919f005729f322cd948e6b72ba6843
2020-05-27 16:41:44 +08:00
Howard Chen
c0ea7e89b8 Merge "Add tinyhostless to mainline_system.mk" 2020-05-27 02:41:37 +00:00
Yo Chiang
60c0064902 Retire mainline.mk
We've converted all known users of mainline.mk to use
mainline_system.mk. Don't include mainline.mk directly in the future,
instead include mainline_system.mk and other partition specific
makefiles. Remove mainline.mk to prevent people from accidentally
including it again.

Bug: 141443017
Test: TH
Change-Id: Id161f29951982a100482a6201130adeebdb49846
2020-05-27 02:29:02 +00:00
Yo Chiang
e32703d3be Merge "Remove mainline_arm64.mk" 2020-05-27 02:26:26 +00:00
Treehugger Robot
fdc392b245 Merge "Fix type error" 2020-05-26 19:24:41 +00:00
Yo Chiang
cb559ac3d8 Remove mainline_arm64.mk
mainline_arm64 is broken for quite some time. Let's just remove it
rather than trying to fix it.
IIUC this was a testing ground for mainline_system.mk when it was first
introduced. Now we have plenty of products that use mainline_system.mk
(e.g. mainline_system_arm64, aosp_arm64, aosp_<pixel>, ...).

Bug: 141443017
Test: TH
Change-Id: I8e0825b2d94134fd8e9e3edc5e2aa15dbcdf10ba
Merged-In: I08990b70d45c0663a9700f41b670513674bf7e97
2020-05-26 14:09:25 +00:00
Howard Chen
2f6bb93178 Add tinyhostless to mainline_system.mk
The tinyhostless module is provided by AOSP and is required by Mediatek
devices.

Test: build aosp_wembley-userdebug
Bug: 157109906
Change-Id: I2a1c4957c19fd4cbd60744d2d9cb534f19d3f239
2020-05-26 02:51:14 +00:00
Treehugger Robot
0e19b74112 Merge "Move BOARD_EXT4_SHARE_DUP_BLOCKS to BoardConfigMainlineCommon.mk" 2020-05-20 13:32:24 +00:00
Yifan Hong
65afc07f9d Support forcefully generating non-AB packages.
Force generate a non-A/B update package when requested.

Bug: 154344887
Test: ota_from_target_files.py --force_non_ab ...
Test: apply it as well

Change-Id: I5e81eb161722e07ef50081b6a16685cbc9963ae2
(cherry picked from commit 7169f754cc)
Merged-In: I5e81eb161722e07ef50081b6a16685cbc9963ae2
2020-05-19 15:23:27 -07:00
Treehugger Robot
def74b4c2b Merge "support different boot partition sizes in aosp_arm64" 2020-05-19 21:30:07 +00:00
Roman Kiryanov
6e0c857fe2 Import the d/g/goldfish soong namespace for libwifi-hal-emu
Some devices refer to libwifi-hal-emu via

BOARD_WLAN_DEVICE := emulator

we need to import the device/generic/goldfish
namespace to link the libwifi-hal-emu symbol.

Bug: 154151802
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I68b0f9bd22e50c2a86e0dbe62abc17991581703e
Merged-In: I68b0f9bd22e50c2a86e0dbe62abc17991581703e
2020-05-18 09:46:25 -07:00
SzuWei Lin
6b26f52cf7 Move BOARD_EXT4_SHARE_DUP_BLOCKS to BoardConfigMainlineCommon.mk
BOARD_EXT4_SHARE_DUP_BLOCKS can reduce the image size. Move it to
BoardConfigMainlineCommon.mk to apply on all mainline based
targets.

Bug: 155589918
Test: build aosp_arm-userdebug
Test: build gsi_gms_arm64-userdebug
Test: build sdk_gphone_arm64-userdebug
Change-Id: I8c4c7c9b2982daf6bf02991b4e62a43b296d003e
Merged-In: I8c4c7c9b2982daf6bf02991b4e62a43b296d003e
(cherry picked from commit de9dc88b59)
2020-05-18 15:37:44 +08:00
Steve Muckle
903a1ca7e1 support different boot partition sizes in aosp_arm64
The different boot images in aosp_arm64 have different partition size
requirements. Add support for defining a partition size associated with
each boot image variant.

This support is limited to aosp_arm64 currently, which is built with
recovery-as-boot.

A previous version of this change did not update the boot-debug image
AVB logic with the required macro for multiple boot partition size
support. This is now required because the aosp-arm64 boot.img is
configured as a chained AVB partition.

Bug: 156036850
Bug: 155049180
Change-Id: I66b57de91042bfd56ba54a3659843d8cf7873955
2020-05-15 10:16:17 -07:00
Paul Duffin
29beb858ef Merge "Revert "support different boot partition sizes in aosp_arm64"" 2020-05-14 09:23:49 +00:00
Paul Duffin
b5a334d0b3 Revert "support different boot partition sizes in aosp_arm64"
This reverts commit 11c4bcf406.

Reason for revert: Broke build b/156569314

Bug: 156569314
Change-Id: I384740320acf48d09b0544e45b5a13ff0a6a163d
2020-05-14 08:40:52 +00:00
Treehugger Robot
ade028ea9e Merge "support different boot partition sizes in aosp_arm64" 2020-05-14 07:05:31 +00:00
Steve Muckle
70ef6fd4f2 Merge "Enables signing for generic boot images" 2020-05-13 19:36:56 +00:00
Steve Muckle
11c4bcf406 support different boot partition sizes in aosp_arm64
The different boot images in aosp_arm64 have different partition size
requirements. Add support for defining a partition size associated with
each boot image variant.

This support is limited to aosp_arm64 currently, which is built with
recovery-as-boot.

Bug: 156036850
Bug: 155049180
Change-Id: I73b70a4d52c2662c3015899632bb8a2b424108d5
2020-05-12 16:51:45 -07:00
Treehugger Robot
f4a9f159aa Merge "Update Keymaster AIDL to V2 in VNDK list" 2020-05-11 17:28:43 +00:00
David Zeuthen
d5505f2c74 Update Keymaster AIDL to V2 in VNDK list
Bug: 156076333
Test: atest VtsHalIdentityTargetTest
Test: atest android.security.identity.cts
Change-Id: I293f4cca815b62bbbaf6334b36a83c669694fd12
2020-05-08 12:50:44 -04:00
Treehugger Robot
47f2597490 Merge "Build com.android.inprocess.tethering for Go variant" 2020-05-08 12:11:47 +00:00
markchien
ddb0f0ab3b Build com.android.inprocess.tethering for Go variant
Bug: 155604224
Test: build
Change-Id: I1c5ac07e72068a617fa20797496dd022f279d88e
Merged-In: I1c5ac07e72068a617fa20797496dd022f279d88e
2020-05-08 09:33:42 +00:00
Bowgo Tsai
0f95ac7e8c Enables signing for generic boot images
Enables signing for them so we can verify that the boot partition
contains a valid generic boot image during the compliance test.

This change also adds the chained partition descriptor of
boot partition into vbmeta.img, which contains the corresponding
public key used to verify the boot partition.

Bug: 151094943
Test: lunch aosp_arm64-user, `make` and use `avbtool info_image`
      to check that GKI images are properly signed.
Test: `make dist` and checks that GKI images in the image zip file
      are properly signed.
Change-Id: I2fd69964f9dc62526a813875fa9193913aa4935b
2020-05-08 08:16:25 +00:00
Pete Bentley
f5a05c4a4b Add boringssl_self_test to base PRODUCT_PACKAGES.
When building from source this gets installed as a requirement
from Conscrypt, but needs to be present when Conscrypt is
shipped as a pre-built too.

I think the correct solution here is actually to make libcrypto
rather than Conscrypt require boringssl_self_test but Soong
considers that a circular dependency.

Bug: 155520949
Test: m installclean && m

Change-Id: I77b2921d1d7b6be493cd581c46adbadd1f186fb0
2020-05-07 14:35:54 +01:00
Victor Chang
ce051d16a4 "Move core-icu4j into i18n APEX" Attempt 2
This reverts commit b72f1e1a8a.
Reland https://r.android.com/1284676

Bug: 138994281
Test: core-icu4j observed in i18n APEX
Change-Id: If773316261fb1f5fb37b56c5233efcc4a434354a
2020-05-05 19:16:30 +01:00
vichang
b72f1e1a8a Revert "Move core-icu4j into i18n APEX"
Revert "Move libpac into i18n APEX"

Revert "Add shared library into i18n APEX and add the required s..."

Revert "Make com_android_i18n namespace visible"

Revert submission 1299494-i18nApex

Reason for revert: Breaking aosp_x86-eng on aosp-master
Reverted Changes:
I30fc3735b:Move ICU from ART APEX to i18n APEX
Icb7e98b5c:Calling @IntraCoreApi from core-icu4j should not c...
Ic7de63fe3:Move core-icu4j into I18n APEX
I65b97bdba:Make com_android_i18n namespace visible
Ia4c83bc15:Move v8 and libpac into i18n APEX
I10e6d4948:Move core-icu4j into i18n APEX
I8d989cad7:Move ICU from ART APEX into i18n APEX
I72216ca12:Move ICU into i18n APEX
Ief9dace85:Add shared library into i18n APEX and add the requ...
I7d97a10ba:Move libpac into i18n APEX
I90fff9c55:Move ICU from ART APEX into i18n APEX

Change-Id: I12a7d609d43620edaf2c5f12711eb3ca3a570d79
2020-05-05 11:11:30 +00:00
Victor Chang
a27b703c49 Move core-icu4j into i18n APEX
Bug: 138994281
Test: core-icu4j observed in i18n APEX
Change-Id: I10e6d49485305f84b31d62f858c3c032aba4d3df
2020-05-04 12:46:03 +01:00
Anton Hansson
d4e85a97e7 Merge "Revert "remove emulator_vendor.mk from aosp_arm64.mk"" 2020-04-30 10:58:43 +00:00
Howard Chen
a566f5e4bf Fix type error
Bug: 155358317
Test: Compile
Change-Id: I32fdd6b20bd0a2b65fa02356dcd9a5819b921a66
2020-04-30 15:52:35 +08:00
Steve Muckle
41a6e3b02f Revert "remove emulator_vendor.mk from aosp_arm64.mk"
This reverts commit a780171da6.

Reason for revert: This appears to be causing intermittent build
failures. Vendor is now small enough that sometimes it does not
get enough inodes allocated for the files that must be copied to it.

Bug: 155340761
Change-Id: I453101a65d4c8b5824467d0bb7cc8c3a03ca2740
2020-04-30 05:55:58 +00:00
David Zeuthen
a9800b4db5 Merge "Update Identity Credential to V2 in VNDK list" 2020-04-29 23:41:41 +00:00
Steve Muckle
a780171da6 remove emulator_vendor.mk from aosp_arm64.mk
Continue the removal of emulator-specific bits from the generic
aosp_arm64 product.

Bug: 111538404
Change-Id: I97a8083bfdc3881ab70aaf73e9ace58435ddbc67
2020-04-29 11:25:07 -07:00
Steve Muckle
57ad4b2541 remove goldfish vendor from aosp_arm64
This is causing goldfish kernel modules to show up in the GKI.

Bug: 155230412
Change-Id: I78cc307a770a20235728e8baf0dc59828b627877
2020-04-28 22:06:45 -07:00
David Zeuthen
236601f86d Update Identity Credential to V2 in VNDK list
Bug: 154631410
Test: atest VtsHalIdentityTargetTest
Test: atest android.security.identity.cts
Change-Id: I7d08d0aec7bab1f456237e46a2c3ae74b02020f9
2020-04-28 19:37:09 -04:00
Steve Muckle
e0a08fde91 enable BOARD_EXT4_SHARE_DUP_BLOCKS for generic_arm64
Bug: 154907226
Change-Id: Iab55afbfaf7d28ac0e826f8eb94b113a2780a4c9
2020-04-24 23:10:02 +00:00
Treehugger Robot
be01cf841e Merge changes I465ea6c9,I57b77d7c
* changes:
  generate multiple boot.img files in aosp_arm64
  create emulator_arm64 device for sdk_phone_arm64 to use
2020-04-22 03:45:49 +00:00
Steve Muckle
0959fbfd2e generate multiple boot.img files in aosp_arm64
Generate boot.img variants with different schemes for kernel compression
(gzip, lz4, none).

The boot image is removed from vbmeta for aosp_arm64 since it is
not possible currently to store the hashes of multiple variants of a
particular image. The GKI will be verified via VTS anyway.

Also remove some emulator-specific stuff from aosp_arm64.

Bug: 151094943
Change-Id: I465ea6c98d52e839284d51b246203f6b8dfb5566
2020-04-20 05:31:15 +00:00
Steve Muckle
1e1514a5ef create emulator_arm64 device for sdk_phone_arm64 to use
Changes are needed in generic_arm64 so that aosp_arm64 can be used to
distribute the GKI. These changes are incompatible with the emulator,
so modify the sdk_phone_arm64 product to use its own device.

Bug: 111538404
Change-Id: I57b77d7cbf503afffa8db45ad8b5ae635b4f4444
2020-04-20 05:30:25 +00:00
Treehugger Robot
2162d25b8f Merge "Add fsverity release cert" 2020-04-18 02:17:20 +00:00
Victor Hsieh
d24991a26e Add fsverity release cert
The release cert helps verifying CTS in a release build.

Bug: 153112812
Test: build, reboot, see a new key in /proc/keys
Change-Id: I6d8f4af6b1b0c023b668e81b7a1c71c7583d93d9
2020-04-17 10:27:42 -07:00
Treehugger Robot
1bc7f6436b Merge "remove dependency on ip6tables" 2020-04-16 10:10:03 +00:00
Maciej Żenczykowski
4cdfacae10 remove dependency on ip6tables
which is now (as of aosp master external/iptables @ HEAD, ie.
  https://android-review.googlesource.com/c/platform/external/iptables/+/1284244
) simply a symbolic link to iptables binary

This should fix:
  > FAILED:
  > build/make/core/main.mk:1132: warning:  build/make/target/product/generic.mk includes non-existent modules in PRODUCT_PACKAGES
  > Offending entries:
  > ip6tables
  > build/make/core/main.mk:1132: error: Build failed.

Test: No, but building, and treehugging
Bug: 154186169
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I94709a7450d0c41a64951c592b54de4b2956eae9
2020-04-16 01:11:10 -07:00
Martijn Coenen
c5ce32b19a Rename ro.emulated_storage properties.
Whether these are enabled or not is independent of whether storage is
emulated or not; instead, use 'external_storage', and add the enabled
suffix as per property naming guidelines.

Bug: 152170470
Bug: 153525566
Test: N/A
Change-Id: Id893ce19025ded1ee1521081f7fc722dfee8e662
2020-04-15 17:28:23 +02:00
Martijn Coenen
178040341b Move ro.emulated_storage properties to PRODUCT_PROPERTY_OVERRIDES.
These need to be a part of the vendor partition and be set even when
using GSI.

Bug: 152170470
Bug: 153525566
Test: android.drm.cts.DRMTest#testForwardLockAccess
Change-Id: I1e69d5c203d4f7480a6651ca780fbd307ce71c23
2020-04-15 14:21:34 +02:00
Treehugger Robot
083b9e9daa Merge "libselinux is LLNDK, not VNDK-core" 2020-04-13 04:05:31 +00:00
Vladimir Marko
385c9ae90f Merge "Pass /system/etc/updatable-bcp-packages.txt to dex2oat." 2020-04-07 07:34:14 +00:00