Commit Graph

5911 Commits

Author SHA1 Message Date
Yifan Hong 2e4f20f540 Merge "device_(manifest|matrix).xml -> vendor_*" 2020-01-16 04:09:08 +00:00
Hsin-Yi Chen 62de555119 Compare existing ABI dump list with LSDUMP_PATHS
This commit fixes the check for redundant files in prebuilts/abi-dumps.
Some ABI dump file names are different from the module names. The list
of existing files should be compared with LSDUMP_PATHS which are the
files generated by soong.

This commit also adds the check for the files in
prebuilts/abi-dumps/platform.

Bug: 147409497
Test: make
Change-Id: If304afb116e9b5d3cb7ceaf74822d5a19ebe1a35
2020-01-16 10:46:30 +08:00
Xin Li 6764f473a5 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
Bug: 146167222
Change-Id: I5adf4130f45200f3abfa2d65178a1640918e5a06
2020-01-15 15:56:28 -08:00
Yifan Hong 975474a5b8 Remove BUILT_VENDOR_MANIFEST variable.
This was used by BUILT_SYSTEM_MATRIX and BUILT_ASSEMBLED_VENDOR_MANIFEST, but they
are deleted now.

Test: builds
Change-Id: Ie7e242dce9c6511b90fcf06ae4b6926b230b9873
2020-01-14 14:25:38 -08:00
Yifan Hong 51be69f063 device_(manifest|matrix).xml -> vendor_*
Building device_manifest.xml or device_compatibility_matrix.xml only
builds vendor manifest / matrices, but not all device manifest /
matrices (e.g. vintf_fragments, ODM manifest, etc.). Make the name more
accurate.

Test: m check-vintf-all

Change-Id: Ib017507c421355263d53a9e5b357f169c77da36d
2020-01-14 14:24:51 -08:00
David Zeuthen dcc85ca5dd Add Identity Credential 1.0
Bug: 111446262
Test: VtsHalIdentityCredentialTargetTest
Test: android.hardware.identity-support-lib-test
Test: CtsIdentityTestCases
Change-Id: I91bf3a0551c4c0358d5f0de066739dcc05de1642
2020-01-14 11:21:03 -05:00
Wei Wang 6231592500 Add stable aidl power HAL
Test: build
Change-Id: Ia3edaf6df52d2725cd6c2d34e5985b1dc16e8f3c
2020-01-10 14:18:23 -08:00
SzuWei Lin 95bdc96175 Remove a redundant setting
All settings above inheriting aosp_x86.mk are configured in
aosp_x86.mk. Removes inheriting aosp_x86.mk to fit the
makefile convention.

Change-Id: I73eb693915440ceb9d49ac2b6b72d173adf16df3
2020-01-10 01:29:41 +00:00
Automerger Merge Worker 63c8e0382e Merge "Revert "unbreak sdk_phone_x86 boot"" am: c30b734f42 am: 30a5c0cf8b
Change-Id: Icd73510d6e002622188788c68db527f08df7c42d
2020-01-09 17:32:00 +00:00
Bo Hu c30b734f42 Merge "Revert "unbreak sdk_phone_x86 boot"" 2020-01-09 16:56:35 +00:00
Automerger Merge Worker 4b482e337e Merge "Update references to sdkext" am: b9e912dc9d am: 2bba9827af
Change-Id: I3716fa082509f3ee2a94c5a3ab3c78a444da0cd9
2020-01-09 09:19:39 +00:00
Bo Hu 08a2677fe7 Revert "unbreak sdk_phone_x86 boot"
This reverts commit 70c96c7f11.

Reason for revert: root cause fixed

Bug: 146580512
Change-Id: I5d841637d5ca0ae8df8f5499a8b3f02488b4814e
2020-01-09 02:35:07 +00:00
Anton Hansson ea711c2418 Update references to sdkext
The module is getting renamed to sdkextensions.

Bug: 137191822
Test: presubmit
Change-Id: I628fc555b82e9bd931c8f0cce2222b02efad6036
Merged-In: I628fc555b82e9bd931c8f0cce2222b02efad6036
(cherry picked from commit 37e998ac31)
2020-01-08 11:42:03 +00:00
Automerger Merge Worker 950604f8da Merge "vibrator: use package as name" am: c8b0187c8b am: e819518de8
Change-Id: If810c6606b9e40150f74848874b01152addf7b73
2020-01-07 23:07:40 +00:00
Steven Moreland c8b0187c8b Merge "vibrator: use package as name" 2020-01-07 22:43:01 +00:00
Automerger Merge Worker 9a0acae5e9 Merge "Revert submission 1182953-1576003954286-8455af5a" am: 42f2c761bf am: 7da11edb71
Change-Id: Ife36d7f71d16943e0044ab8e1155aeb74edfb6c6
2020-01-07 20:29:39 +00:00
Chen Xu 42f2c761bf Merge "Revert submission 1182953-1576003954286-8455af5a" 2020-01-07 19:29:08 +00:00
Automerger Merge Worker ea31abaf4f Merge "Clean up TARGET_FLATTEN_APEX lines in mainline products" am: 3ac9a12f5f am: 2eee2cd593
Change-Id: I1a634deadbbad49cfabf4ead80c0f0581e34ce82
2020-01-07 09:17:41 +00:00
Yo Chiang 3ac9a12f5f Merge "Clean up TARGET_FLATTEN_APEX lines in mainline products" 2020-01-07 08:41:53 +00:00
Automerger Merge Worker a93eac7c3f Merge "Revert "Add boringssl_self_test to PRODUCT_PACKAGES"" am: ee83e2d2c8 am: 44e7c20968
Change-Id: I607fded6b55a3470fa705be224ffb19ef35d2380
2020-01-07 04:19:39 +00:00
Treehugger Robot ee83e2d2c8 Merge "Revert "Add boringssl_self_test to PRODUCT_PACKAGES"" 2020-01-07 03:51:29 +00:00
Automerger Merge Worker 4c5e852883 Merge "update-vndk-list.sh delinated with ticks in error" am: 0fe0eda502 am: 81e3cfa8a3
Change-Id: I0b00593d9a43f21093cb41fe02af536b3c7ec17b
2020-01-07 02:07:59 +00:00
Steven Moreland 7e2ec0e5af update-vndk-list.sh delinated with ticks in error
People have asked me on several occassions how to fix this error. It's
somewhat confusing since scripts aren't usually on a path. However, in
this case, the script is added to the path on host. Hopefully, using
tick marks here will make that more clear.

Bug: N/A
Test: N/A
Change-Id: I8601a5a9eb348b2e358875b45eae57ec910c9a06
2020-01-06 15:05:07 -08:00
Steven Moreland af96f5ff4e vibrator: use package as name
In order to provide a more descriptive name, and to be consistent
with HIDL, the stable AIDL package names are switching from
vintf-vibrator format to the package format
(android.hardware.vibrator).

Bug: N/A
Test: all build time
Change-Id: I382074d66b06669876d8f9fa4fc95b8a9c4dbf2a
Merged-In: I382074d66b06669876d8f9fa4fc95b8a9c4dbf2a
2020-01-06 14:08:00 -08:00
Josh Gao 552b3f96b2 Add libfdtrack to base_system.
Bug: http://b/140703823
Test: manual
Change-Id: I6015946b85a4564b82eb57a0a0a9bb1e058b100a
2020-01-02 12:44:52 -08:00
Yo Chiang 4a5ff18a01 Clean up TARGET_FLATTEN_APEX lines in mainline products
Remove redundant TARGET_FLATTEN_APEX lines from mainline board configs.
Remove redundant "inherit updatable_apex.mk" lines from
mainline_system_$arch makefiles.
mainline_system.mk now always install APEX into /system partition.
Products who need flattened APEXes would have their flattened APEXes
installed into /system_ext.

Test: Build mainline_system_arm64 and validate noop
Change-Id: I9ee4af529a4bd554cb8707cfc260d6b912fd5fff
2019-12-30 16:19:28 +08:00
Jiyong Park aeda4b267b Revert "Add boringssl_self_test to PRODUCT_PACKAGES"
This reverts commit ac4a35f017.

The change is not required because the conscrypt APEX now has
'boringssl_self_test' as its required modules.

Bug: 146549048
Test: m && device boots
2019-12-30 16:58:34 +09:00
Automerger Merge Worker f037120754 Merge "Add Multidisplay App and so to whitelist" into qt-qpr1-dev am: dd82625f27
Change-Id: Ic853e3d5fd0e9f4725062995ce34b06feb09a8f2
2019-12-27 16:01:39 +00:00
Automerger Merge Worker 1785dcfe52 Merge "Do not build ld.config.txt" am: f1ef5591f1 am: 63e1d4d899
Change-Id: I1bb0689958d9af85e9b78a8c832f13887a889197
2019-12-27 00:25:03 +00:00
Kiyoung Kim f1ef5591f1 Merge "Do not build ld.config.txt" 2019-12-27 00:08:06 +00:00
Jeff Davidson 4c443e1d4e Revert submission 1182953-1576003954286-8455af5a
Reason for revert: Crashes telephony process when saving XML config from carrier apps (b/146727232)
Reverted Changes:
Ieaeec41f1: Whitelist telephony-common, ims-common.
I5588f7615: Add telephony-common, ims-common to telephony apex...
I81e922c0d: Add telephony-common, ims-common to telephony apex...

Change-Id: Ia64b73682fcc77db63e220867c66c4319c417582
Merged-In: Ia64b73682fcc77db63e220867c66c4319c417582
2019-12-26 23:27:33 +00:00
Automerger Merge Worker 541c3e98cf Merge "unbreak sdk_phone_x86 boot" am: 7c18a37147 am: d3e86cfd66
Change-Id: Ifca20d9e9d56b9dcda8e498f82cf50e04fb94823
2019-12-26 16:13:58 +00:00
Treehugger Robot 7c18a37147 Merge "unbreak sdk_phone_x86 boot" 2019-12-26 15:51:49 +00:00
Jiyong Park 70c96c7f11 unbreak sdk_phone_x86 boot
Bug: 146580512
Test: choosecombo 1 sdk_phone_x86 userdebug; m; emulator
Change-Id: I8227291c89e1cafc35e63eccd2f5ca34ecbd5434
2019-12-23 23:46:55 +09:00
Automerger Merge Worker 2958b05847 Merge "Move group_system_ext and passwd_system_ext to base_system_ext.mk" am: 6e487404ed am: beb44e1d01
Change-Id: I23460fe9675d3f92444135b39a46a34ebbe91f67
2019-12-23 11:17:35 +00:00
Justin Yun cc1e4cfb6e Move group_system_ext and passwd_system_ext to base_system_ext.mk
As we have base_system_ext.mk for the packages in system_ext
partition, move the group and passwd files for system_ext partition
to base_system_ext.mk.

Bug: 141658360
Test: mainline checks pass
Change-Id: Iff50482b90ff9877a58c54c8149014e8c103a3c6
2019-12-23 10:31:54 +09:00
Automerger Merge Worker 1d3b5b73e4 Merge "[Tether16] Build Tethering package" am: b516ddd539 am: b1dd6eb60d
Change-Id: I0eb011e685fff2d479b26ab9524a2fb7afadb636
2019-12-20 14:00:26 +00:00
Mark Chien b516ddd539 Merge "[Tether16] Build Tethering package" 2019-12-20 13:43:46 +00:00
Kiyoung Kim 63d6d96653 Do not build ld.config.txt
Remove ld.config.txt from build target as it will be replaced with
generated linker config.

Bug: 139638519
Test: m -j passed
Change-Id: Idc3742df74f27d71d7f65bd7f0f518b31ca7970c
2019-12-20 18:30:07 +09:00
Automerger Merge Worker 6ae6a3e422 Merge changes from topic "art_apex_available" am: 3977cb4f75 am: ca423af91d
Change-Id: I17c9555073ddd043b16ec3f0b8dc01b6f8fd5d09
2019-12-20 01:43:05 +00:00
Treehugger Robot 3977cb4f75 Merge changes from topic "art_apex_available"
* changes:
  Add boringssl_self_test to PRODUCT_PACKAGES
  Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR
2019-12-20 01:17:43 +00:00
Huihong Luo dd82625f27 Merge "Add Multidisplay App and so to whitelist" into qt-qpr1-dev 2019-12-20 00:29:14 +00:00
Automerger Merge Worker ff9ebf7705 Merge "Add userspace_reboot.mk and include it in mainline_system.mk" am: 58fa00583c am: e42f12a376
Change-Id: I22eece89788abed73b3ee06f4766d42d23db0af5
2019-12-20 00:26:19 +00:00
Nikita Ioffe 58fa00583c Merge "Add userspace_reboot.mk and include it in mainline_system.mk" 2019-12-19 23:44:06 +00:00
Jiyong Park ac4a35f017 Add boringssl_self_test to PRODUCT_PACKAGES
boringssl_self_test is a required module of the conscrypt.jar.
Therefore, it was installed along with the conscrypt.jar. However,
conscrypt.jar is no longer available for the platform but only for the
conscrypt APEX. The problem here is that the conscrypt APEX having
conscrypt.jar doesn't carry its 'required' property. As a result,
boringssl_self_test is missing. This is b/146549048.

Until the bug is fixed, manually adding the test binary to
PRODUCT_PACKAGES to ensure that it is installed always.

Bug: 146549048
Test: m, device boots

Change-Id: I72dbc51c267f8d8683b70c07ae726c3a3eba0aea
2019-12-19 21:45:42 +09:00
Nikita Ioffe 1d0f32f6a6 Add userspace_reboot.mk and include it in mainline_system.mk
The intention of userspace_reboot.mk is to provide a default
configuration (e.g. userspace reboot watchdog timeout) for devices that
are supporting userspace reboot feature. So far it only contains one
property that tells whenever device supports userspace reboot, more to
follow in separate CLs.

Test: flashed blueline, checked that property is set to true
Bug: 135984674
Change-Id: I32e6281ccc36236ec4fa5cde299753b6e0ece181
2019-12-18 13:33:27 +00:00
markchien bf4be9b5b8 [Tether16] Build Tethering package
Create com.android.tethering apex to pack Tethering.apk and
framework-tethering.jar together.
For go devices, tethering would run in system server process by
InProcessTethering.apk

Bug: 144320246
Test: -build, boot
Change-Id: Id2d68117e99173682908168e99ee28670bd71871
Merged-In: Id2d68117e99173682908168e99ee28670bd71871
2019-12-18 13:05:30 +00:00
Automerger Merge Worker 91aaca279e Merge "Do not include linkerconfig for recovery" am: b80f88f424 am: 7fbd89d0de
Change-Id: If98266257509dbaae2b2fb6ce51c37aa156fbf5a
2019-12-18 01:13:41 +00:00
Kiyoung Kim b80f88f424 Merge "Do not include linkerconfig for recovery" 2019-12-18 00:55:03 +00:00
Automerger Merge Worker 3b9b4ffc95 Merge "Move CtsShim and CtsPrivShim APKs out of system." am: 20d1b7d966 am: 6b0308921b
Change-Id: If7799ae7bd9e6613b3ff5eb06801b7c31b17ff97
2019-12-17 20:19:49 +00:00
Dario Freni d5ed6019c9 Move CtsShim and CtsPrivShim APKs out of system.
These packages are now available in the shim apex package, which is made
available in both flattened and unflattened apex configurations.

Bug: 138429615
Test: atest CtsPrivilegedUpdateTests CtsPermissionTestCases
CtsStagedInstallHostTestCases; (on both flattened and unflattened
configurations)
Merged-In: I03939f6c3e711d5887da201e32173f86a6b0289e
Change-Id: I03939f6c3e711d5887da201e32173f86a6b0289e
2019-12-17 13:47:17 +00:00
Jack Yu 7f00905643 Add android.hardware.secure_element@1.2
Test: build pass
Bug: 142495673
Change-Id: I26e63a960afa721454aee9000d57655068b11a7f
2019-12-17 09:25:50 +00:00
Kiyoung Kim 2cf6c27240 Do not include linkerconfig for recovery
Linkerconfig should be built as static, but recovery does not have
enough space for static binary. As recovery linker configuration is
quite static and simple, this can be generated from build time. As a
first step linkerconfig binary should be removed from recovery.

Bug: 146384333
Test: m -j passed && crosshatch recovery worked with this change
Change-Id: Ie82da787424c5d1ddd2724808aa2323ea881f75b
2019-12-17 15:27:02 +09:00
Automerger Merge Worker 0c081b6d76 Merge "Revert "Revert "Remove ro.apex.updatable=false in GSI""" am: 2f4a8bb534 am: 23886a3c4d
Change-Id: I89e5e260944124823c3098ee42e693545c9c0aba
2019-12-17 06:14:22 +00:00
Treehugger Robot 2f4a8bb534 Merge "Revert "Revert "Remove ro.apex.updatable=false in GSI""" 2019-12-17 05:51:34 +00:00
Automerger Merge Worker dd779885eb Merge "Define PRODUCT_SYSTEM_* props for mainline_system" am: de5b0d2a73 am: 0ea258ae16
Change-Id: I341b3baed1b0e97b1fdb8f924d290c500b19428a
2019-12-17 05:13:12 +00:00
Treehugger Robot de5b0d2a73 Merge "Define PRODUCT_SYSTEM_* props for mainline_system" 2019-12-17 04:57:10 +00:00
Automerger Merge Worker 423d1b9d7d Merge "Add com.android.cronet APEX and org.chromium.net.cronet to base_system." am: ced27c4c60 am: 132c0346e2
Change-Id: Ib344bdc3dd9f3c1bd8816630adf16768ddc9bd12
2019-12-16 15:00:33 +00:00
Luke Huang ced27c4c60 Merge "Add com.android.cronet APEX and org.chromium.net.cronet to base_system." 2019-12-16 14:39:02 +00:00
Luke Huang 723ff8274d Add com.android.cronet APEX and org.chromium.net.cronet to base_system.
com.android.cronet will be shipped as a mainline
module in APEX format.

org.chromium.net.cronet is a java_sdk_library used to provide
Cronet API to apps.

Bug: 139397529
Test: Built and installed apex on device
Change-Id: Icff7ded02e360f2df9dfe3ac7185cf7f0034d014
2019-12-16 20:57:05 +08:00
Yo Chiang 3bbbe2d5b9 Revert "Revert "Remove ro.apex.updatable=false in GSI""
This reverts commit c7f63dfeda.

Reason for revert: b/145963716

Change-Id: I0f6a9c26b342a27dfebc0494a255492c838c09f5
2019-12-16 08:38:59 +00:00
Bowgo Tsai 851f144d90 Adding developer_gsi_keys.mk
OEMs who are willing to support booting the public Developer-GSI
in locked state can add the following line into a device.mk to include
the corresponding public keys into their first-stage ramdisk.

   $(call inherit-product, $(SRC_TARGET_DIR)/product/developer_gsi_keys.mk)

Bug: 144399552
Test: make checks $OUT/ramdisk/avb/.
Change-Id: I8fdefa0fb26c2d385dda1f72503d12e6fc306694
Merged-In: I8fdefa0fb26c2d385dda1f72503d12e6fc306694
(cherry picked from commit 01c6f6f215)
2019-12-16 14:49:42 +08:00
Yo Chiang 96949d3904 Define PRODUCT_SYSTEM_* props for mainline_system
These properties, namely:

- PRODUCT_SYSTEM_NAME
- PRODUCT_SYSTEM_BRAND
- PRODUCT_SYSTEM_MANUFACTURER
- PRODUCT_SYSTEM_MODEL
- PRODUCT_SYSTEM_DEVICE

propagate into /system/build.prop as ro.product.system.* and can
identify if the /system partition is mainline_system.
These don't modify other ro.product.* properties that are defined in
partitions other than /system.

Bug: 110206836
Bug: 146191296
Test: lunch mainline_system_arm64-userdebug; m
Test: lunch aosp_arm64-userdebug; m
Test: Two products must have same PRODUCT_SYSTEM_* props
Change-Id: I300579d555d269481635237fb02aab5db71a510d
2019-12-15 15:11:53 +00:00
Automerger Merge Worker 4f1b16f6aa Merge "Revert "Remove ro.apex.updatable=false in GSI"" am: 565bb632c7 am: 6d349fe4cc
Change-Id: I0331be1cf5112d10a5defba3d138a0e99c35bbb9
2019-12-14 00:09:07 +00:00
Treehugger Robot 565bb632c7 Merge "Revert "Remove ro.apex.updatable=false in GSI"" 2019-12-13 23:15:51 +00:00
Automerger Merge Worker 5feb2e79a3 Merge changes from topic "gsi-with-flattened-apexes" am: b3bff1d203 am: 66ee21cedd
Change-Id: I5a1c446abab9e0e8dec7dca027bc757f8b34d14b
2019-12-13 21:56:16 +00:00
Treehugger Robot b3bff1d203 Merge changes from topic "gsi-with-flattened-apexes"
* changes:
  Enable updatable-apex.mk for mainline_system
  Add PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES
2019-12-13 21:10:56 +00:00
Automerger Merge Worker 8afcfa3877 Merge "Add mainline_system_x86_64 product" am: 078b1598ff am: c47de5cb83
Change-Id: Ic138d068d98da417b6bc808e579b5741307600c4
2019-12-13 06:25:03 +00:00
Yo Chiang 078b1598ff Merge "Add mainline_system_x86_64 product" 2019-12-13 05:22:15 +00:00
Automerger Merge Worker 6686dfe7d9 Merge "Adding developer_gsi_keys.mk" am: dad976ffcb am: c58307824a
Change-Id: Ic2d30adc0868990bce0d417d7c3557e5334ba7f5
2019-12-13 03:41:03 +00:00
Treehugger Robot dad976ffcb Merge "Adding developer_gsi_keys.mk" 2019-12-13 03:13:02 +00:00
Automerger Merge Worker b960782c52 Merge "Add linkerconfig to recovery" am: 0542582560 am: 3701950613
Change-Id: If0bf79bfe405a6db525fb9eb3de0bf44caad5b0b
2019-12-13 01:59:36 +00:00
Kiyoung Kim 0542582560 Merge "Add linkerconfig to recovery" 2019-12-13 01:09:58 +00:00
Dario Freni 99f5e40137 Enable updatable-apex.mk for mainline_system
Test: presubmit passes
Bug: 145791146
Change-Id: I87fb58c4d8d3d02d46af467d62222782658e73dc
2019-12-12 17:21:17 +00:00
Bowgo Tsai 01c6f6f215 Adding developer_gsi_keys.mk
OEMs who are willing to support booting the public Developer-GSI
in locked state can add the following line into a device.mk to include
the corresponding public keys into their first-stage ramdisk.

   $(call inherit-product, $(SRC_TARGET_DIR)/product/developer_gsi_keys.mk)

Bug: 144399552
Test: make checks $OUT/ramdisk/avb/.
Change-Id: I8fdefa0fb26c2d385dda1f72503d12e6fc306694
2019-12-12 21:32:49 +08:00
Jooyung Han 9efe534ef1 Add PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES
For GSI targets, this variable is set true, and Soong will install both
"flattened" and "unflattened" APEXes together in /system_ext and /system
respectively.

Bug: 137802149
Test: lunch aosp_arm64-userdebug && m
  resulting apex images under /system/apex
  and flattened apexes under /system/system_ext/apex

Change-Id: Ib72d1b9dbd59727942da39323ee7e60ac6e14882
2019-12-12 02:04:43 +09:00
SzuWei Lin c7f63dfeda Revert "Remove ro.apex.updatable=false in GSI"
This reverts commit d24bc21f06.

Reason for revert: Waiting relative feature done.

Change-Id: I455bcaaba567260197d8ebe88175a9d40fb49195
2019-12-11 07:07:46 +00:00
Automerger Merge Worker ec95588134 Merge "Change all cf_common paths to cuttlefish paths" am: 3b500a7ec3 am: 85f60f8307
Change-Id: I18b7021f769b0adc775d622912aa773ff8874312
2019-12-11 04:22:02 +00:00
Ram Muthiah ed9d7bf9e1 Change all cf_common paths to cuttlefish paths
Merging cuttlefish_common master into cuttlefish master

Bug: 143774116
Test: Treehugger
Exempt-From-Owner-Approval: cf-only change
Change-Id: I9911ba93e642ac1909be45334a5f45fc95a4ab48
Merged-In: I9911ba93e642ac1909be45334a5f45fc95a4ab48
2019-12-11 00:06:30 +00:00
Automerger Merge Worker b5144d4c59 Merge "Add telephony-common, ims-common to telephony apex." am: 52df8f5154 am: 5d2a05f5a1
Change-Id: I1d718255fc30b255fc83ac79233ec440074084c4
2019-12-10 19:00:39 +00:00
Amit Mahajan 13bc18a3ec Add telephony-common, ims-common to telephony apex.
Test: basic telephony sanity
Test: m com.android.telephony && adb install com.android.telephony.apex
Bug: 145555313
Change-Id: I5588f7615c45aac00eb00f436e15e8a1746d9ac6
2019-12-09 14:07:05 -08:00
Amit Mahajan 69a527d108 Merge "Create telephony apex." am: 1b9fd38513
am: c1ddc3adbc

Change-Id: I27b705b64d3c455fe68f4fdf34c50b620d4b92f1
2019-12-09 11:00:58 -08:00
Kiyoung Kim d7c866cd45 Add linkerconfig to recovery
Add linkerconfig to recovery so it can be executed to generate
ld.config.txt in recovery mode

Bug: 139638519
Test: Tested from crosshatch recovery
Change-Id: I8dd2a8833332c8e583632700d1ba46d9a3b1fc94
2019-12-09 14:59:15 +09:00
Amit Mahajan 8c7ca1bc05 Create telephony apex.
Initial version includes StkLib. Other components will be added in
subsequent CLs.

Test: m com.android.telephony && adb install com.android.telephony.apex
Bug: 145555313
Change-Id: Ifa38d36ba36dbfa613bff9ac168af82b7d6886ee
2019-12-05 23:38:50 -08:00
Jooyung Han 9fff19978f Merge "Remove ro.apex.updatable=false in GSI" am: 39048511c2
am: 14bfaec086

Change-Id: Ib67ba51e1daccca650ade0483ee4ea54357bbb0b
2019-12-05 20:03:31 -08:00
Jooyung Han 39048511c2 Merge "Remove ro.apex.updatable=false in GSI" 2019-12-06 03:49:01 +00:00
Jooyung Han c5d7892dcb Merge "Move extra VNDKs to /system_ext" am: 79961687db
am: 1fba30a983

Change-Id: Ie8ad9ad0856f38ac35e2fbc21071ecb3cbdefb58
2019-12-05 01:09:34 -08:00
Jooyung Han 79961687db Merge "Move extra VNDKs to /system_ext" 2019-12-05 08:55:31 +00:00
Anton Hansson 2e36b2a95d Merge "Add sdkext module" am: 5685159a7c
am: c1bad39da1

Change-Id: I0c2b05729514bf8665954935e23f07f66bdf0028
2019-12-03 08:42:49 -08:00
Anton Hansson c982aecdb1 Add sdkext module
Add the module to the build, and its jar to the bootclasspath.

Bug: 137191822
Test: m
Change-Id: I11700ac6da3fe031692b792d2975c5eec5414e09
2019-12-03 13:32:15 +00:00
Roshan Pius e2b081d273 Merge "base_system.mk: Align formatting for updatable boot jar variable" am: 78560b2049
am: 41e679308d

Change-Id: I58fd0ced83422d4767f24e4c44f0f0b8107509ed
2019-12-02 16:50:04 -08:00
Roshan Pius 78560b2049 Merge "base_system.mk: Align formatting for updatable boot jar variable" 2019-12-03 00:43:17 +00:00
Mark Chien 2fd7f8e202 Merge "[Tether08] build InProcessTethering package" am: 05c8db112a
am: d8c7549b22

Change-Id: I62ba4c5f16abd8db0228ac74f28cc8934a0216c0
2019-11-30 04:31:14 -08:00
Mark Chien 05c8db112a Merge "[Tether08] build InProcessTethering package" 2019-11-30 12:17:47 +00:00
markchien ef83b80ec3 [Tether08] build InProcessTethering package
Build tethering package which is running the same process as system
server.
Since tethering still have some dependency with system server which
need to run in system server process(e.g. use LocalService), we
need to use InProcessTethering for all first. After cutting off
the dependency, Go devices would keep use "InProcessTethering" and
other non-Go devices would be switched to use "Tethering" package.

Bug: 136040414
Test: -build, flash, boot
Change-Id: I680273a3ee8fed3af843a829da17ca84b130f475
Merged-In: I680273a3ee8fed3af843a829da17ca84b130f475
2019-11-29 13:50:54 +00:00
Roshan Pius 626f6371dc base_system.mk: Align formatting for updatable boot jar variable
Migrate PRODUCT_UPDATABLE_BOOT_MODULES &
PRODUCT_UPDATABLE_BOOT_LOCATIONS to a new PRODUCT_UPDATABLE_BOOT_JARS.
This new variable uses the same format as
PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS, i.e <apex>:<jar> pair.

Test: Compiles & flashed device. Ensured that the bootclasspath & system_server class
paths remain the same.

Change-Id: I1cb26d5ec825cd1f5282a6e0255094ddf2fe046a
2019-11-28 12:59:08 +00:00
SzuWei Lin d24bc21f06 Remove ro.apex.updatable=false in GSI
Originally, GSI forced disable APEX and always contains apex
packages in flattern format. This patch remove the enforcement,
and APEX updateble is enabled according to ro.apex.updatable in
vendor.

Bug: 145245545
Test: build aosp_arm64-userdebug, check the property in system
Change-Id: I9cc943d7b2a30d037a2c1c137dad1233c1e3f57e
2019-11-28 12:57:05 +08:00
Jooyung Han fe15dd1eb7 Move extra VNDKs to /system_ext
Extra VNDKs are now installed under /system_ext in APEX format with
a phony target "vndk_apex_snapshot_package".

There are still files remained in /system/etc(*.libraries.<VER>.txt)
which are installed with "vndk_snapshot_packages".

These files are already packaged into VNDK APEXes, but linkerconfig and
libnativeloader still use them from /system/etc.(b/145184886)

Bug: 137802149
Test: lunch aosp_arm64
  && flash system.img on Q device
  && boot

Change-Id: I94c340d6f1c1af6ab1ae93c22b0a98fd4c10262e
2019-11-27 22:16:16 +09:00
Sarah Chin c147f40b77 Merge "Set up IRadioConfig 1.3" am: bdb8b6cf20
am: dd02481cee

Change-Id: Ibcd2011a6cc83e4b8a2eaeb390073fafd5653f0d
2019-11-26 12:06:54 -08:00
Sarah Chin bdb8b6cf20 Merge "Set up IRadioConfig 1.3" 2019-11-26 18:52:26 +00:00
Sarah Chin 86167418b7 Set up IRadioConfig 1.3
Test: build
Bug: 144101226
Change-Id: Ia5ca23e07eda0d4db8a8c701181c073745abb094
Merged-In: Ia5ca23e07eda0d4db8a8c701181c073745abb094
2019-11-25 16:26:18 -08:00
Steven Moreland aa614c7d59 Merge "vintf vibrator vndk" am: fcd0862632
am: 3c0a874fbf

Change-Id: Id482abff67c242852cf3904130ff2d14db568957
2019-11-25 09:46:05 -08:00
Steven Moreland fcd0862632 Merge "vintf vibrator vndk" 2019-11-25 17:31:26 +00:00
Benedict Wong 582fcc3ad2 Merge changes from topics "Create IPsec(IKE) APEX", "Expose IKE ID, TS & SaProposal" am: f81965bdc8
am: 97239f3c3e

Change-Id: Ia36051827a05e1fb09e4dcef7cf43953ceb24d1b
2019-11-22 20:18:30 -08:00
Benedict Wong f81965bdc8 Merge changes from topics "Create IPsec(IKE) APEX", "Expose IKE ID, TS & SaProposal"
* changes:
  Add ike.jar to bootclasspath to expose IKE API
  Add com.android.ipsec APEX to base makefile
2019-11-23 03:45:53 +00:00
Roshan Pius b318e9931e Merge "base_system.mk: Support system_server jars from apexes" am: 9dda264619
am: 20cc65daed

Change-Id: Ic97d9b992b06c6d0c34f21dd31e6783e1a06206d
2019-11-22 19:18:01 -08:00
Roshan Pius d6e239fc35 base_system.mk: Support system_server jars from apexes
Allow system_server jars delivered via apex. Regular system_server
jars are located in /system/framework folder. But, jars delivered via
apex are mounted at /apex/<module_name>/javalib. Also, not all the
libraries in /apex/<module_name>/javalib will be a system_server jar,
so adding a mechanism to list out the jar file explicitly within the
apex module.

Bug: 144722612
Bug: 141785760
Test: Compiles (both with empty & non-empty PRODUCT_SYSTEM_SERVER_APEX_JARS
value set)

Change-Id: Ia181ab22fdf2da575bfd532c1cd90a2f54742528
2019-11-22 12:48:09 -08:00
evitayan 8ac6463155 Add ike.jar to bootclasspath to expose IKE API
IKE will be a mainline module. This commit adds ike.jar to
bootpathclass so that IKE API is accessible to apps.

Bug: 143983419
Test: make update-api && make
Change-Id: I1dbb249f3109f45ce32c34bcb398108d61bc06cc
2019-11-21 16:21:14 -08:00
Shawn Willden e7003e9f8d Merge "Add Keymaster 4.1" am: 394d65b41e
am: e18ddbbf82

Change-Id: I7b1fc711e12972d1bc90f7daeb5adb88e3633bf6
2019-11-21 14:57:33 -08:00
Treehugger Robot 394d65b41e Merge "Add Keymaster 4.1" 2019-11-21 22:41:49 +00:00
Martin Stjernholm 951411d9e9 Merge "Reland "Add libdl_android as a bootstrap library"." am: 675aa4b093
am: 7bf7a0cec2

Change-Id: I7c6c9e4c40ffe75bbb1a04f3f3161ba23a4b896d
2019-11-21 08:36:49 -08:00
evitayan 5bc08b7bdd Add com.android.ipsec APEX to base makefile
com.android.ipsec will be shipped as a mainline
module in APEX format

Bug: 143905344
Test: Built and installed apex on device
Change-Id: I70da069146e8d9a7be38ab603c6bdaa9d6d9ba84
2019-11-21 08:25:01 -08:00
Martin Stjernholm 675aa4b093 Merge "Reland "Add libdl_android as a bootstrap library"." 2019-11-21 16:17:42 +00:00
Justin Yun d3eb960e4e Merge "Inherit base system_ext.mk files for aosp targets" am: e948114a3d
am: 945096110d

Change-Id: Ie845e05c84c0b780b16abd7a84521c60e0710bfd
2019-11-20 22:27:54 -08:00
Justin Yun e58ffe4681 Inherit base system_ext.mk files for aosp targets
Make aosp targets inherit handheld_system_ext.mk and
telephony_system_ext.mk files.
Devices that have /system_ext or /system/system_ext must inherit any
of *_system_ext.mk files to install mandatory packages for system_ext
partition.

Bug: 144542478
Test: Build aosp targets
Change-Id: Ibdbf0000ac4aa98c8485d67827f52208f9a827c5
2019-11-20 22:58:42 +00:00
Shawn Willden 8e2b776def Add Keymaster 4.1
Bug: 140193672
Bug: 140192237
Bug: 140824829
Test: Will be in a future CL
Change-Id: I1dccdf1ba06dc834e31d20c782523c92666847be
2019-11-20 12:14:36 -07:00
Jakub Pawlowski c8305f48e3 Merge "bluetooth: V1.1" am: e6c1e50be8
am: 51f99d3879

Change-Id: Ib4b68a922b526aabf4f6f8f3237bb800652a0060
2019-11-20 11:01:55 -08:00
Yo Chiang db38b8ae62 Add mainline_system_x86_64 product
Bug: 141972143
Test: lunch mainline_system_x86_64-userdebug; m
Change-Id: I9ff5fc9d9a873d49008675b5907eb62872712200
2019-11-20 18:01:22 +08:00
Steven Moreland 86c9d855b3 vintf vibrator vndk
Bug: 141828236
Test: build
Change-Id: Ia1826058e67a3b817beeafc153dae54c1afa4423
2019-11-19 18:31:00 -08:00
Jakub Pawlowski 777d38b5a6 bluetooth: V1.1
Add ISO

Bug: 144413056
Change-Id: Ice792cf552b0c494499fb855eee711b518850918
2019-11-20 00:48:24 +01:00
Martin Stjernholm 15ca2ffbb2 Reland "Add libdl_android as a bootstrap library".
Necessary after moving it into the Runtime APEX, as several framework
libraries loaded during early boot depends on it, e.g. libvndksupport.so,
libvulkan.so, and libgraphicsenv.so.

Test: build & boot
Bug: 135753770
Bug: 144343305
Change-Id: Ia95349e377605d709fae74d966bd4f2324eaf604
2019-11-19 16:35:47 +00:00
Justin Yun bf2bb0ae49 Merge "Add /persist symlink to mainline_arm64" am: 0b6de0b173
am: 0a856c6682

Change-Id: I067bfad7384cb6ea12cf1ff79049997c2debdb01
2019-11-13 23:01:00 -08:00
Justin Yun 0b6de0b173 Merge "Add /persist symlink to mainline_arm64" 2019-11-14 06:48:53 +00:00
Chen Xu e07cea80ed Merge "switch to updatable cellbroadcast apk" am: fac1f8f78d
am: 59ee409588

Change-Id: I631c890ab1370b11361522126e7d496c0bfd6995
2019-11-13 18:15:51 -08:00
Chen Xu fac1f8f78d Merge "switch to updatable cellbroadcast apk" 2019-11-14 01:56:16 +00:00
Chen Xu 8dd20bb69b switch to updatable cellbroadcast apk
Bug: 135956699
Test: Build & Manual
Change-Id: I30ac57d1f3dc259142d3354fdb4f14fc5f9ec02d
(cherry picked from commit ad5ab25f1c)
Merged-in: I30ac57d1f3dc259142d3354fdb4f14fc5f9ec02d
2019-11-14 01:08:41 +00:00
Justin Yun 8d17b05fe0 Add /persist symlink to mainline_arm64
Since /persist is a SoC specfic symlink, it must not be included in
the root directory. For this reason, we already moved the directory
under /mnt/vendor. However, there are still many modules that are
using the old path /persist.
Until we clear all these violations, we need to have the symlink in
the root directory.

Bug: 143732851
Test: build and check boot and basic functions
Change-Id: Iaee28ba29f79f1c286e090f97173e3196d2fc823
2019-11-14 00:49:03 +00:00
Tom Cherry 4f51fba546 Merge "Move init and ueventd scripts from / to /system/etc" 2019-11-13 14:36:47 +00:00
Steven Moreland c1d1c21fb1 Merge "Remove vibrator@1.4 from VNDK" am: 88d1b62b89
am: fbb38bbf33

Change-Id: I004d1aba1d0ddf249e35ca3803113001f6354473
2019-11-12 14:04:54 -08:00
Steven Moreland 88d1b62b89 Merge "Remove vibrator@1.4 from VNDK" 2019-11-12 21:39:26 +00:00
Tom Cherry 246dbc1b0b Merge "Move init and ueventd scripts from / to /system/etc" into qt-qpr1-dev-plus-aosp 2019-11-12 15:46:21 +00:00
Justin Yun 0d511712c9 Merge "Create *_system_ext.mk for system_ext packages" am: f7b16cad9d
am: 80508409e4

Change-Id: I8fb5983f5f1e216602de653eecbc6e43a29d024a
2019-11-11 15:40:18 -08:00
Treehugger Robot f7b16cad9d Merge "Create *_system_ext.mk for system_ext packages" 2019-11-11 23:19:24 +00:00
huans 874d35bc29 Add Multidisplay App and so to whitelist
Add Multidisplay App to top makefile for sdk_phone

Bug: 114842496 131702523

Test: Build
Change-Id: If1958d2d9e4783438b2fd7cf04de02e64c710564
(cherry picked from commit ff37e043f2)
Merged-In: If1958d2d9e4783438b2fd7cf04de02e64c710564
2019-11-11 19:57:41 +00:00
Remi NGUYEN VAN afb0ff8fea Merge "Revert "Revert "Use NetworkStackNext as preinstalled network stack""" am: 6cbbac5cec
am: f82fd89eb8

Change-Id: Ida055fc50bd363e010dea837637963567cab32c1
2019-11-11 09:23:22 -08:00
Remi NGUYEN VAN 86783d4e33 Merge "Revert "Use NetworkStackNext as preinstalled network stack"" am: 7017d37675
am: af94c1ea25

Change-Id: I0783b7266b747fe5fa3ecdd931e03de91f0b1cc3
2019-11-11 09:11:00 -08:00
Remi NGUYEN VAN 6cbbac5cec Merge "Revert "Revert "Use NetworkStackNext as preinstalled network stack""" 2019-11-11 14:00:49 +00:00
Remi NGUYEN VAN d6e2bb6f8b Revert "Revert "Use NetworkStackNext as preinstalled network stack""
This reverts commit a60d3c0dc1.

Reason for revert: Roll forward after fixing tests in b/144168912

Change-Id: Ibe68f086f10bbef7590ac4b721be4e1709e154dc
2019-11-11 03:53:01 +00:00
Steven Moreland ea5e5e5102 Remove vibrator@1.4 from VNDK
Since this HAL was converted to AIDL.

Bug: 141828236
Test: N/A
Change-Id: I77ce9b07084774295f64579200ee36f4c05c5a71
2019-11-11 02:32:45 +00:00
Remi NGUYEN VAN 7017d37675 Merge "Revert "Use NetworkStackNext as preinstalled network stack"" 2019-11-09 00:37:17 +00:00
Remi NGUYEN VAN a60d3c0dc1 Revert "Use NetworkStackNext as preinstalled network stack"
This reverts commit 7b7af54259.

Reason for revert: Broke tests in b/144168912

Change-Id: I01d7b76350aba6a902c89d357e0f30b28a1c03c4
2019-11-09 00:28:25 +00:00
Mikhail Naganov 8f581c1de4 Merge "Introduce audio V6 HAL" am: ec77036a4e
am: e994ca1ea9

Change-Id: I3f8da45b08d0eb8022e4615477f5d5652f2061a3
2019-11-08 10:07:36 -08:00
Treehugger Robot ec77036a4e Merge "Introduce audio V6 HAL" 2019-11-08 17:31:42 +00:00
Martin Stjernholm 00b4723af8 Merge "Revert submission of topic 'libdl_android-in-apex'" am: c91616fabd
am: aa0cbb18fa

Change-Id: Ifa9a387e1d1f13f6139b7ac6c9f7fa1da3b47625
2019-11-08 04:11:52 -08:00
Martin Stjernholm c91616fabd Merge "Revert submission of topic 'libdl_android-in-apex'" 2019-11-08 11:51:39 +00:00
Remi NGUYEN VAN 2183772eab Merge "Use NetworkStackNext as preinstalled network stack" am: 97ed14a7fe
am: efe886cb84

Change-Id: I89a5527e81f2e69b66f5da105608a164d0c8f229
2019-11-08 02:31:37 -08:00
Remi NGUYEN VAN 97ed14a7fe Merge "Use NetworkStackNext as preinstalled network stack" 2019-11-08 10:06:35 +00:00
Mikhail Naganov 0ee9b3edc9 Introduce audio V6 HAL
Test: push V6 to device and check audio works fine
Bug: 134940862
Change-Id: I761d05708d99287b9fe255c55724f92c8a3388e7
Merged-In: I761d05708d99287b9fe255c55724f92c8a3388e7
Signed-off-by: Kevin Rocard <krocard@google.com>
2019-11-07 14:44:52 -08:00
Ashwini Oruganti 60e69d3925 Merge "Remove the cert for GooglePermissionController" am: 4c98469598
am: 9bfca4ffe4

Change-Id: Ideb622a642836df92a45f4a8ac41012d6c168971
2019-11-07 12:16:46 -08:00
Henry Fang 53b27f3316 Merge "update build file to include cas@1.2" am: 7df5b71c74
am: 641db1083c

Change-Id: I172ccd7b0d0fa0ba9d62187f500f00e842788838
2019-11-07 11:59:18 -08:00