Commit graph

5942 commits

Author SHA1 Message Date
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
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
Treehugger Robot
ddeddc819d Merge "Fix signing on some GSI targets" 2020-04-07 04:33:19 +00:00
bohu
0f9c766320 emulator: fix full-eng build on aosp
BUG: 153361966
Test: Build full-eng
Change-Id: I0e8f065cf875d19be705430c642922f2c9a39d76
2020-04-06 20:01:24 +00:00
bohu
8fd437c80a emulator: enable vendor boot image
BUG: 149826779
Test: Build x86, x86_64, armv7 and arm64
make sure x86/64 boot to home screen;
armv7/arm64 can pass disk mounting stage

Change-Id: I258b69bd0cdc4fb0a99b1a04567051e8d32c389a
2020-04-06 14:05:28 +00:00
Vladimir Marko
09e885dc6d Pass /system/etc/updatable-bcp-packages.txt to dex2oat.
Test: aosp_taimen-userdebug boots.
Test: Check logcat for the new argument in the dex2oat
      invocations that happen on first boot.
Bug: 151314205
Change-Id: Id2a14c3810897ead213238b63aee5ff180b56397
2020-04-06 12:15:57 +01:00
Nikita Ioffe
f26b9c8c33 Merge "Make init.userspace_reboot.is_supported a rw property" 2020-04-01 13:14:21 +00:00
Dan Shi
916be61b91 Merge "Rename VTS to VTS10" 2020-03-31 17:32:34 +00:00
Jiyong Park
0b7b97bfc3 libselinux is LLNDK, not VNDK-core
libselinux has stable C APIs and therefore provides a stub library for
Mainline clients. It is not copied into any Mainline modules and the
only instance of the lib in /system/lib serves all of them.

However for vendors, we still had another copy of libselinux in VNDK
(e.g. in the VNDK APEX that is served via the path /system/lib/vndk).
Since the library is guaranteed to have stable C APIs, there is no
reason to keep the vendor variant of the library in VNDK. Keeping it in
VNDK would be just a waste of storage space.

This change removes libselinux from VNDK and marks it as LLNDK. The
single instance of if in /system/lib serves vendor processes as well as
Mainline modules.

Bug: 151303316
Test: m
Change-Id: I7106ac236770b55b147c8a7f524bc2eddbddedb1
2020-03-31 17:04:54 +09:00
Nikita Ioffe
bb9699c2e1 Make init.userspace_reboot.is_supported a rw property
General recommendation is to avoid read-only properties, and instead control
"read-onlines" by only allowing init/vendor_init to set the property.

Since ro.init.userspace_reboot.is_supported was added in this release, and
nobody outside of the platform is querying it directly, it should be fine to
simply rename it.

Test: adb shell getprop init.userspace_reboot.is_supported
Test: atest CtsUserspaceRebootHostSideTestCases
Bug: 152803929
Change-Id: Ie3604b315a5d2a846037064ad9a29258f2cad9d0
2020-03-30 23:42:18 +01:00
Peter Collingbourne
d78f96ee20 Merge "Remove crash_dump from PRODUCT_PACKAGES." 2020-03-30 19:03:42 +00:00
Dan Shi
dec1d6e084 Rename VTS to VTS10
Bug: 151896491
Test: m -j vts10
Change-Id: I0a6468e63f381e67f34666975c18058d64048178
2020-03-28 13:28:21 -07:00
Yifan Hong
0f113c208a Merge "Add system_ext_manifest.xml" 2020-03-24 17:01:17 +00:00
Ulya Trafimovich
c46e0673d0 Get rid of obsolete Make variable TARGET_CORE_JARS.
Test: aosp_walleye-userdebug boots.
Change-Id: Ibed8c8479b9c1f3ac333c66aeddea4f5f06c9aad
2020-03-23 15:35:00 +00:00
Ulyana Trafimovich
07c20355ac Merge "Put com.android.location.provider before services on the system server classpath." 2020-03-23 12:28:45 +00:00
Ulya Trafimovich
d2744bca56 Put com.android.location.provider before services on the system server classpath.
Test: aosp_walleye-userdebug boots and there are no messages in the
  logcat regarding class loader context mismatch:

    $ adb logcat | grep 'mismatch'
    # empty

Bug: 147017252
Change-Id: I338685b9cf71681b5ca0c541752948934b656b46
Merged-In: I338685b9cf71681b5ca0c541752948934b656b46
(cherry picked from commit db088602f5)
2020-03-23 10:21:48 +00:00
Yifan Hong
382bbdf2cc Add system_ext_manifest.xml
Bug: 147915920
Test: m check-vintf-all -j
Change-Id: I38d4861f433b307574a1b3fae0d912833dfa35e3
2020-03-20 13:01:31 -07:00
Peter Collingbourne
40d6508b5c Remove crash_dump from PRODUCT_PACKAGES.
Was causing build failures now that crash_dump has been moved to
an apex.

Bug: 151857642
Change-Id: I86ae8a57c68c8928ac954d594f3bef0fea84c56e
Merged-In: I86ae8a57c68c8928ac954d594f3bef0fea84c56e
2020-03-19 09:46:02 -07:00
Treehugger Robot
d530443e82 Merge "Make RRO packages for system_ext" 2020-03-19 01:47:54 +00:00
Jeongik Cha
d99e77d6d6 Make RRO packages for system_ext
Until now, packages from system_ext don't create RRO packages, instead
it uses static overlay, but to make system_ext common, it should use
RRO.

Bug: 150820813
Test: m && check if there are RRO packages that use from system_ext apps
Change-Id: Id0ddb66adca07a6bb4dda66fbee49fd476ac5342
2020-03-18 00:55:48 +00:00
Yifan Hong
610cbc900e Vendor SKU manifests: define env variables properly
In particular, BOARD_SEPOLICY_VERS may be defined in
system/sepolicy/Android.mk, so defer its evaluation.

Test: build with vendor SKU
Bug: 148601741
Change-Id: Iab3f5dcba4edb65deaab38cc2712d22b89e1a83c
2020-03-17 15:58:07 -07:00
Yifan Hong
352e6a4d18 Merge changes from topic "vendor_sku"
* changes:
  Proper checks for vendor and ODM SKUs
  Rename DEVICE_MANIFEST_<sku>_FILE to FILES
2020-03-16 22:04:56 +00:00
Geoff Lang
6ee4bed4ad Add ANGLE.apk to the base system.
ANGLE has been packaged as a prebuilt library in internal master.  This
CL transitions the library to being built from source in AOSP so it can
be tested and included as a mainline module.

Test: ANGLE is in the developer options/EGL platform can load ANGLE
Bug: 142239747

Change-Id: Ie06dcfccce022ed608c18362e246f6f2a3c6fb1a
2020-03-16 16:57:42 +00:00
Yifan Hong
07ea2c0360 Rename DEVICE_MANIFEST_<sku>_FILE to FILES
Use plural since multiple files can be defined and assembled together.

Test: pass
Bug: 148601741
Change-Id: I82a7aeb68ea26702e63757a41f32840b6186ab88
2020-03-13 18:32:07 -07:00
Roopesh Nataraja
11e776fc32 Build DEVICE manifests and fragments for each SKU
Single vendor can support multiple skus with different
capabilities. Add support to define and build sku
based device manifests.

Specify DEVICE manifests in BoardConfig.mk as below.

  # installed to /vendor/etc/vintf/manifest_{sku}.xml
  DEVICE_MANIFEST_SKUS := sku1 sku2 sku3

  DEVICE_MANIFEST_SKU1_FILE := device/foo/bar/manifest_sku1.xml
  DEVICE_MANIFEST_SKU2_FILE := device/foo/bar/manifest_sku2.xml
  DEVICE_MANIFEST_SKU3_FILE := device/foo/bar/manifest_sku3.xml

Bug: 148601741

Change-Id: Id57d4ad21b0d3edf8d60d07446b6b806c1df20ab
2020-03-09 15:09:08 -07:00
Jooyung Han
93cb9b5b31 Remove vnd*.libraries.txt from /system/etc
These files are moved to VNDK APEX.

Bug: 145184886
Test: bulid && boot
Change-Id: I85ab025e1ad490ee7704e4219c5ee611c83ca429
2020-03-07 04:54:23 +09:00
Automerger Merge Worker
9d5134760c Merge "initial GKI boot.img support" am: 28a7820be2
Change-Id: I620304b97f0ab8f9f440aab1c5dc8e4fe18c4819
2020-03-05 00:43:36 +00:00
Treehugger Robot
28a7820be2 Merge "initial GKI boot.img support" 2020-03-05 00:31:27 +00:00
Steve Muckle
3363a0b8d6 initial GKI boot.img support
The GKI boot.img should be generated alongside the GSI. To make this
possible, define a flag (TARGET_NO_VENDOR_BOOT) that can be used to
disable the generation of the vendor_boot image.

Bug: 138323550
Change-Id: I91181853b26815e68a2fa2216b68579780d034dc
2020-03-04 10:54:56 -08:00
Automerger Merge Worker
f39863dc7a Merge "Remove a redundant setting" am: a7f84831fe
Change-Id: I809890d3de6e5bc11a0a2feb0ced12774993fbb6
2020-03-04 06:25:18 +00:00
Treehugger Robot
a7f84831fe Merge "Remove a redundant setting" 2020-03-04 06:15:11 +00:00
SzuWei Lin
1256ca9eba Fix signing on some GSI targets
GSI targets require enabling chain partition signing, which put the
GSI signing in system.ing directly instead of in vbmeta.img.

Some GSI targets inherit from BoardConfigGsiCommon.mk only, ex.
gsi_arm64-user, do not enable chain partition signing. The patch
add these settings back.

On the other hand, the emulator makefiles still requires the
settings at this time. Hence, we keep these settings in
BoardConfigEmuCommon.mk.

Bug: 150179516
Test: make gsi_arm64-user
Test: make aosp_arm64-user
Change-Id: Id188e4c6a31ce0cf9b134ebae36cbd5bfae19942
Merged-In: Id188e4c6a31ce0cf9b134ebae36cbd5bfae19942
(cherry picked from commit f77e364de0)
2020-03-04 12:28:20 +08:00
Automerger Merge Worker
03e36c8acc Merge "Revert "Set up IRadioConfig 1.3"" am: 817e013a00
Change-Id: Ie6ce31dd011ca2b82e4a1b723d3db7dc18bfdc3e
2020-02-27 06:05:42 +00:00