Commit Graph

5911 Commits

Author SHA1 Message Date
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
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
Automerger Merge Worker 03e36c8acc Merge "Revert "Set up IRadioConfig 1.3"" am: 817e013a00
Change-Id: Ie6ce31dd011ca2b82e4a1b723d3db7dc18bfdc3e
2020-02-27 06:05:42 +00:00
Sarah Chin 817e013a00 Merge "Revert "Set up IRadioConfig 1.3"" 2020-02-27 05:46:08 +00:00
Automerger Merge Worker bc2383c481 Merge "Revert "Create telephony apex."" am: 71b4252b20
Change-Id: I514f180126c53ac750ebef4f36b9ffc4ef65382f
2020-02-26 18:14:07 +00:00
Amit Mahajan 71b4252b20 Merge "Revert "Create telephony apex."" 2020-02-26 18:01:30 +00:00
Amit Mahajan ce7c9a70bd Revert "Create telephony apex."
This reverts commit 8c7ca1bc05.

Reason for revert: b/148821604

Merged-in: I12defd7fe6aba01a381f8ad014475941e58d21d3
Change-Id: I12defd7fe6aba01a381f8ad014475941e58d21d3
2020-02-26 00:46:14 +00:00
Sarah Chin bd1fd8eb32 Revert "Set up IRadioConfig 1.3"
This reverts commit 86167418b7.

Reason for revert: Change will not be supported by vendor, so HAL for RadioConfig is no longer necessary.

Change-Id: Iea50dcf86076a72b16276496410e8a658e9a7ce5
Merged-In: Ifc3323584a01a8636d4cf30da37d29b297252d26
2020-02-25 00:52:44 +00:00
Automerger Merge Worker e4d9c62b0d Merge "Load ike in system server classpath instead of bootclasspath" am: 77001add05
Change-Id: I8449124d6ec7a9d90386c25abb247db975277c3a
2020-02-20 19:00:03 +00:00
Yan Yan 77001add05 Merge "Load ike in system server classpath instead of bootclasspath" 2020-02-20 18:38:55 +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
evitayan 781145ee4c Load ike in system server classpath instead of bootclasspath
Module IPsec(IKE) will be built as a java_sdk_library and will not
be in bootclasspath anymore. It will be loaded in system sevrer
classpath so that it can be used by VPN.

Bug: 145995723
Test: build, flash, boot
Test: atest FramewokrsIkeTests (passed)
Test: m mts && mts-tradefed run mts-ipsec (passed)
Test: manually tested that it is loaded in system server
Change-Id: I3126605613202b1e981b4e7f594acb6edbb7d635
Merged-In: I3126605613202b1e981b4e7f594acb6edbb7d635
2020-02-20 05:51:12 +00:00
Automerger Merge Worker 7785e7a030 Merge "Add a module for VNDK library lists" am: 63c28a8bd9
Change-Id: I7888acfb4282a6f20fb5c83215bda546aace734d
2020-02-20 02:22:25 +00:00
Hsin-Yi Chen 63c28a8bd9 Merge "Add a module for VNDK library lists" 2020-02-20 02:09:44 +00:00
Automerger Merge Worker ba58fe13b6 Merge "Port IdentityCredential HAL to AIDL." am: 0bb795c9d7
Change-Id: Ieb49fe2a2e49fccec9672c88f81e6ba307e639cb
2020-02-19 22:23:13 +00:00
David Zeuthen 0bb795c9d7 Merge "Port IdentityCredential HAL to AIDL." 2020-02-19 21:14:40 +00:00
Hsin-Yi Chen 0aed272b24 Add a module for VNDK library lists
This commit adds a file group which consists of all VNDK library lists.
VTS depends on the file group.

Bug: 147454897
Test: make vts_vndk_dependency_test
Change-Id: Id9e98e070879cd9126f2bfb940b6b0c0f5fb97ba
2020-02-19 16:59:21 +08:00
Bowgo Tsai 3c739746b3 Adding new GSI public keys
Adding two new public keys for R-Developer-GSI and S-Developer-GSI,
respectively.

Bug: 149805495
Test: build then checks $OUT/recovery/root/first_stage_ramdisk/avb/.
Change-Id: I69dd00dbb0046c681758068b8bbea0c08b9e2c91
2020-02-19 08:50:38 +00:00
Automerger Merge Worker 79c12922e4 Merge "Shipping >= API Level 30: no vndservicemanager." am: e05c4c8729
Change-Id: I38a067c4edac03282bfd7d7eeb5058158074b70d
2020-02-18 23:39:49 +00:00
Steven Moreland e05c4c8729 Merge "Shipping >= API Level 30: no vndservicemanager." 2020-02-18 23:18:20 +00:00
Steven Moreland 2bf4726f18 Shipping >= API Level 30: no vndservicemanager.
Make this device configuration instead. Vendor implementations can
choose to use this, but it's not required.

Bug: 148807371
Test: TH will test CF boots
Change-Id: Ic144b1aa36e35295fccd9fa7f7f911587bf39bee
2020-02-14 16:57:08 -08:00
Treehugger Robot 1d18ae8e7d Merge "Move packages from *_product.mk to *_system_ext.mk" am: ae541174cc
Change-Id: I462fe07fb4d90fa58f1042adcc8fb2a94caf41fe
2020-02-14 22:11:52 +00:00
Treehugger Robot ae541174cc Merge "Move packages from *_product.mk to *_system_ext.mk" 2020-02-14 21:56:40 +00:00
Automerger Merge Worker 0296ecb601 Merge "Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint." am: 0445b496c1
Change-Id: I21b704bfee4d8b9b49cc4b06444001bcf0e97f58
2020-02-13 13:48:33 +00:00
Ulyana Trafimovich 0445b496c1 Merge "Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint." 2020-02-13 13:36:25 +00:00
Ulya Trafimovich 36101543e9 Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint.
This is to unify boot jars with system server jars:
PRODUCT_SYSTEM_SERVER_JARS and PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS
do not overlap.

Test: aosp_walleye-userdebug boots

Exempt-From-Owner-Approval: cherry-pick.
Bug: 146363577
Change-Id: Ief8994cc34cb6f7951051313dd66a1334a3a73b4
Merged-In: Ief8994cc34cb6f7951051313dd66a1334a3a73b4
(cherry picked from commit 19ed3a0db7)
2020-02-13 13:36:11 +00:00
Automerger Merge Worker d3a28a3676 Merge "Implement BOARD_VNDK_VERSION" am: b21ca5795e
Change-Id: I103d0e3a580ef3a7665502a3dd1dc95612045efc
2020-02-13 11:17:02 +00:00
Treehugger Robot b21ca5795e Merge "Implement BOARD_VNDK_VERSION" 2020-02-13 11:01:10 +00:00
Automerger Merge Worker a026dfb5dc Merge "rm libbinderthreadstate" am: 6bf4a7d0be
Change-Id: I403d91e9b1de2c4cad020708f1576a8adccd88fa
2020-02-12 21:12:32 +00:00
Steven Moreland 6bf4a7d0be Merge "rm libbinderthreadstate" 2020-02-12 21:10:48 +00:00
David Zeuthen 361ca8fd81 Port IdentityCredential HAL to AIDL.
Bug: 111446262
Test: atest android.security.identity.cts
Test: VtsHalIdentityTargetTest
Test: android.hardware.identity-support-lib-test
Change-Id: I471569a6db9311171faf7520697cd7f67f80078c
2020-02-12 09:57:41 -05:00
Automerger Merge Worker bfb27d2a25 Merge "Remove UseApexImage and GenerateApexImage." am: 1dffdf84d1
Change-Id: I7b58e16d9c0ec0784ba86ee0ed102b6a49d661cf
2020-02-09 23:17:22 +00:00
Nicolas Geoffray 1dffdf84d1 Merge "Remove UseApexImage and GenerateApexImage." 2020-02-09 22:53:56 +00:00