Commit graph

6359 commits

Author SHA1 Message Date
TreeHugger Robot
04735a8ef2 Merge changes I465ea6c9,I57b77d7c,I536a286d,Ie16a7bf7 into rvc-dev
* changes:
  generate multiple boot.img files in aosp_arm64
  create emulator_arm64 device for sdk_phone_arm64 to use
  support multiple boot.img files in release tools
  multi boot.img support cleanups
2020-04-23 23:20:16 +00:00
TreeHugger Robot
c0f3be1309 Merge "Make RRO packages for system_ext" into rvc-dev 2020-04-23 01:25:48 +00:00
Steve Muckle
4b6b2003a9 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
Merged-In: I465ea6c98d52e839284d51b246203f6b8dfb5566
2020-04-22 11:48:52 -07:00
Steve Muckle
4bfa078008 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
Merged-In: I57b77d7cbf503afffa8db45ad8b5ae635b4f4444
2020-04-22 11:48:14 -07:00
Victor Hsieh
f17840d885 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
Merged-In: I6d8f4af6b1b0c023b668e81b7a1c71c7583d93d9
2020-04-21 15:03:41 -07:00
Jeongik Cha
a92ecd46cd 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
Merged-In: Id0ddb66adca07a6bb4dda66fbee49fd476ac5342
2020-04-20 13:59:52 +00:00
Martijn Coenen
bdd91a0c68 Merge changes from topic "emulated_storage_props" into rvc-dev
* changes:
  Rename ro.emulated_storage properties.
  Move ro.emulated_storage properties to PRODUCT_PROPERTY_OVERRIDES.
2020-04-17 07:59:26 +00:00
Maciej Żenczykowski
364844c369 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
Merged-In: I94709a7450d0c41a64951c592b54de4b2956eae9
2020-04-16 13:54:51 +00:00
Martijn Coenen
7b9fef4a75 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
Merged-In: Id893ce19025ded1ee1521081f7fc722dfee8e662
2020-04-16 12:56:57 +00:00
Martijn Coenen
5afd62fb91 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
Merged-In: I1e69d5c203d4f7480a6651ca780fbd307ce71c23
2020-04-16 12:56:39 +00:00
Jiyong Park
086c5238ad 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.

Exempt-From-Owner-Approval: cherry-pick from AOSP

Bug: 151303316
Test: m
Merged-In: I7106ac236770b55b147c8a7f524bc2eddbddedb1
(cherry picked from commit 0b7b97bfc3)
Change-Id: I7106ac236770b55b147c8a7f524bc2eddbddedb1
2020-04-13 13:08:31 +09:00
Vladimir Marko
433ab54fef Pass /system/etc/updatable-bcp-packages.txt to dex2oat.
(cherry picked from commit 09e885dc6d)

Test: aosp_taimen-userdebug boots.
Test: Check logcat for the new argument in the dex2oat
      invocations that happen on first boot.
Bug: 151314205
Merged-In: Id2a14c3810897ead213238b63aee5ff180b56397
Change-Id: I68c85dc008d6be072686c5699e276c630cf0113a
2020-04-07 09:36:36 +01:00
Nikita Ioffe
8e12e1be21 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
Merged-In: Ie3604b315a5d2a846037064ad9a29258f2cad9d0
(cherry picked from commit bb9699c2e1)
2020-04-01 18:28:52 +01:00
Dan Shi
60e8ff4d0d Merge "Rename VTS to VTS10" am: 916be61b91 am: ed51dee98e am: 474ebdd3e9 am: 371d7b5194
Bug: 151896491
Test: none

Change-Id: I6fc0004682299ac14d9d4f0e898eb9326812061f
Merged-In: I4ac161769068887e7575bb1f51a186a4efbe51d6
Merged-In: I6fc0004682299ac14d9d4f0e898eb9326812061f
(cherry picked from commit e8d9f8cd06)
2020-03-31 23:20:06 +00:00
TreeHugger Robot
9aa8dababd Merge "Add ANGLE.apk to the base system." into rvc-dev 2020-03-27 17:16:34 +00:00
Ilya Matyukhin
64002db4f6 Merge "Revert "Add biometrics.face@1.1 to gsi"" into rvc-dev 2020-03-25 05:35:05 +00:00
Yifan Hong
cc62281ba7 Merge "Add system_ext_manifest.xml" into rvc-dev 2020-03-24 20:34:54 +00:00
Geoff Lang
d4e1856626 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
Bug: 152296261

Merged-in: Ie06dcfccce022ed608c18362e246f6f2a3c6fb1a
Change-Id: I65f9b1d3832422acdce7364c0173b3fd4e48d868
2020-03-24 17:37:44 +00:00
Ulya Trafimovich
c282ece044 Get rid of obsolete Make variable TARGET_CORE_JARS.
Test: aosp_walleye-userdebug boots.

Bug: 147579140

Change-Id: Ibed8c8479b9c1f3ac333c66aeddea4f5f06c9aad
Merged-In: Ibed8c8479b9c1f3ac333c66aeddea4f5f06c9aad
(cherry picked from commit c46e0673d0)
2020-03-24 17:09:47 +00:00
Ilya Matyukhin
de2cd1f08c Revert "Add biometrics.face@1.1 to gsi"
This reverts commit 1677505a8f.

Reason for revert: this interface is untested in R.

Bug: 151331855
Change-Id: I77c12a26132dbf310f95b2824070b00ffc7d9f9f
2020-03-24 02:39:46 -07:00
Roshan Pius
8188a9c10d Merge "media_system.mk: Rename wifi-service to service-wifi" into rvc-dev 2020-03-23 23:06:22 +00:00
Roshan Pius
fa756a8b1f media_system.mk: Rename wifi-service to service-wifi
Bug: 145195135
Test: Device boots up and connects to wifi networks.
Change-Id: I8ce4f53fc2bc0194040fd0fd7d50eeefbdde7192
2020-03-23 10:02:15 -07:00
Yifan Hong
27d40c0cb1 Add system_ext_manifest.xml
Bug: 147915920
Test: m check-vintf-all -j
Change-Id: I38d4861f433b307574a1b3fae0d912833dfa35e3
Merged-In: I38d4861f433b307574a1b3fae0d912833dfa35e3
2020-03-20 19:22:17 -07:00
Malcolm Chen
129b8f292b Move telephony framework sources as part of non-update framework.
This allows us to hide Telehony APIs and framework can still use
them.

Bug: 151667108
Test: build
Change-Id: I85626d8a427624264747eae56a6d7b5b4e537045
Merged-In: I85626d8a427624264747eae56a6d7b5b4e537045
2020-03-20 21:09:37 +00:00
Ulyana Trafimovich
c26cfa1c5a Merge "Put com.android.location.provider before services on the system server classpath." into rvc-dev 2020-03-20 11:00:35 +00:00
TreeHugger Robot
79875a125e Merge "initial GKI boot.img support" into rvc-dev 2020-03-20 00:50:28 +00:00
Steve Muckle
e0c2dde572 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
Merged-In: I91181853b26815e68a2fa2216b68579780d034dc
Change-Id: I91181853b26815e68a2fa2216b68579780d034dc
2020-03-19 15:35:23 -07:00
Ulya Trafimovich
db088602f5 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
2020-03-19 18:06:23 +00:00
Yifan Hong
21ceb57057 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
Merged-In: Iab3f5dcba4edb65deaab38cc2712d22b89e1a83c
2020-03-18 17:58:52 -07:00
Yifan Hong
1c146a617d 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
Merged-In: I82a7aeb68ea26702e63757a41f32840b6186ab88
2020-03-16 15:06:11 -07:00
Yifan Hong
18f3e2d04b Merge "Build DEVICE manifests and fragments for each SKU" into rvc-dev 2020-03-11 18:44:36 +00:00
Roopesh Nataraja
202d4c8db4 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
Merged-In: Id57d4ad21b0d3edf8d60d07446b6b806c1df20ab
2020-03-10 12:22:31 -07:00
Jooyung Han
f5e53004cd Remove vnd*.libraries.txt from /system/etc
These files are moved to VNDK APEX.

Bug: 145184886
Test: bulid && boot
Merged-In: I85ab025e1ad490ee7704e4219c5ee611c83ca429
Change-Id: I85ab025e1ad490ee7704e4219c5ee611c83ca429
(cherry picked from commit 93cb9b5b31)
2020-03-08 13:11:24 +09:00
TreeHugger Robot
ba17b04741 Merge "DO NOT MERGE: Remove AppSearch from Android R." into rvc-dev 2020-03-05 21:08:59 +00:00
Luke Huang
9fb9f8f870 Merge "DO NOT MERGE: Delete com.android.cronet from base_system." into rvc-dev 2020-03-04 03:45:40 +00:00
TreeHugger Robot
3eeca14b80 Merge "Fix signing on some GSI targets" into rvc-dev 2020-03-03 21:45:56 +00:00
Luke Huang
8640960329 DO NOT MERGE: Delete com.android.cronet from base_system.
Cronet module won't be in Android R.

Bug: 148046438
Test: Build
Change-Id: Ib20788edf9f94dcc03e0e5ff4c0ecb3c7042aee5
2020-03-03 11:31:24 +00:00
SzuWei Lin
f77e364de0 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
2020-03-02 16:06:02 +08:00
Songchun Fan
d20531a537 remove NativeAdbDataLoader from system image
Fixes build

Test: builds
BUG: 150476291
Change-Id: I5b5d6588fda4664bac9adce35adac92696d1d7f6
(cherry picked from commit 65c9699b70)
2020-02-28 20:56:12 +00:00
Alexander Dorokhine
75c5773187 DO NOT MERGE: Remove AppSearch from Android R.
Test: presubmit
Bug: 150249538
Change-Id: I98774c8e8686b6d8fcb058ab0f1d5d4ecfa314cb
2020-02-25 17:24:36 -08:00
David Su
7b285149a3 Merge "Remove OsuLogin app from system image" 2020-02-21 19:11:08 +00:00
Haoxiang Li
0ea8dc1cb4 [SV HIDL] Update VNDK library list
Bug: 148618804

Test: Build passed.

Change-Id: Iff0738ffc4827a9713f3a82da05eb8adf47f87fe
2020-02-21 06:28:40 +00:00
Roshan Pius
af116f56bd base_system.mk: Package wifi.rc separately into the build
These contain a bunch of action triggers for setting some kernel flags
for wifi driver logging. Apex'es don't support .rc with action triggers,
so package it separately into the build.

Bug: 149909892
Test: Device boots up and connects to wifi networks.
Test: Manually verified that the .rc file is run on bootup.
Change-Id: I05f055ec68d47a1d158135f5454389a786884f9b
2020-02-20 07:51:02 -08:00
Howard Ro
ac79359a25 Merge "Remove statsd binary from base_system.mk" 2020-02-20 08:00:53 +00:00
Automerger Merge Worker
ba2170d59d Merge "Adding new GSI public keys" am: 1f82728d94 am: 84a1838b46 am: 4da91bcafd
Change-Id: Id5d5df0b0ea015aeec32c59b315d850dfb366f10
2020-02-20 06:52:30 +00:00
Yan Yan
4d19b14e7b Merge "Load ike in system server classpath instead of bootclasspath" 2020-02-20 06:42:22 +00:00
Automerger Merge Worker
84a1838b46 Merge "Adding new GSI public keys" am: 1f82728d94
Change-Id: I877229f94a92dc8c794b9df9c2a5b21676c66d72
2020-02-20 06:28:03 +00:00
Treehugger Robot
1f82728d94 Merge "Adding new GSI public keys" 2020-02-20 06:18:41 +00:00
Howard Ro
26490fb2b4 Remove statsd binary from base_system.mk
Now that statsd binary is moving to the apex, we should remove it from
base_system.mk. Also, we noticed that the statsd apex name is defined
twice. So we also removed the duplicate line.

Test: make
Bug: 145923087
Change-Id: Ic974ac1506e4dafa310fcd4727852d3188eb2885
2020-02-19 20:52:16 -08:00
Automerger Merge Worker
a86e4852e1 Merge "Add a module for VNDK library lists" am: 63c28a8bd9 am: 7785e7a030 am: f89db1e188
Change-Id: Iceb13ec74613b60075e23d5bbf1f77e6557ef5b7
2020-02-20 02:50:16 +00:00