Commit Graph

6070 Commits

Author SHA1 Message Date
Benedict Wong 1023921d76 Merge changes from topics "Create IPsec(IKE) APEX", "Expose IKE ID, TS & SaProposal" am: f81965bdc8 am: 97239f3c3e
am: 582fcc3ad2

Change-Id: Ifd4a1e7d3e387877cc81757417d6ef4154323bbf
2019-11-25 07:16:44 -08:00
Anton Hansson c5ece221b2 Merge "Update references to service jars" 2019-11-25 13:15:57 +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 27367f05c2 Merge "base_system.mk: Support system_server jars from apexes" am: 9dda264619 am: 20cc65daed
am: b318e9931e

Change-Id: I6d005b66cfcae711d12a8facc95ccbcba9c81e6f
2019-11-22 19:21:07 -08: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
Amit Mahajan fd95b73781 Merge "Revert "Add TeleServiceLib along with TeleService to PRODUCT_PACKAGES."" 2019-11-23 01:33:18 +00:00
Amit Mahajan be7f79e75f Revert "Add TeleServiceLib along with TeleService to PRODUCT_PACKAGES."
This reverts commit 49afe97130.

Reason for revert: TeleServiceLib compilation on eng builds goes on indefinitely.

Change-Id: I2ee127595f1f427e9cb92bc4affdabc94af772a0
2019-11-23 01:23:51 +00: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
Amit Mahajan aef794f026 Merge "Add TeleServiceLib along with TeleService to PRODUCT_PACKAGES." 2019-11-22 20:28:13 +00:00
Amit Mahajan 49afe97130 Add TeleServiceLib along with TeleService to PRODUCT_PACKAGES.
Test: basic telephony sanity & atest TeleServiceTests
Bug: 144806641
Change-Id: Id1c1819321fa825151c3a4c505fa43dee37cb2d2
2019-11-22 20:27:25 +00:00
Anton Hansson a2b816616c Update references to service jars
These are being renamed to service-* instead of *-service.

Test: treehugger
Change-Id: Ib8af8ca8eafee7d466d2d3873461bbd9c91a686d
2019-11-22 12:15:32 +00: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 a92d893b7e Merge "Add Keymaster 4.1" am: 394d65b41e am: e18ddbbf82
am: e7003e9f8d

Change-Id: I1d1c7ca04b80a6b5eaa48b92e556464094b4a5a6
2019-11-21 15:01:44 -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
Terry Wang 05b1ea74e7 Merge "Add a new system service for app search management." 2019-11-21 22:43:07 +00:00
Treehugger Robot 394d65b41e Merge "Add Keymaster 4.1" 2019-11-21 22:41:49 +00:00
TreeHugger Robot 52569158cd Merge "gralloc: add libgralloctypes.so to VNDK-SP" 2019-11-21 20:41:22 +00:00
Martin Stjernholm 7dd62a4e2c Merge "Reland "Add libdl_android as a bootstrap library"." am: 675aa4b093 am: 7bf7a0cec2
am: 951411d9e9

Change-Id: I3623c986cf68a1442a23825eab033524c43292a5
2019-11-21 08:40:52 -08: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 8d8ab00016 Merge "Inherit base system_ext.mk files for aosp targets" am: e948114a3d am: 945096110d
am: d3eb960e4e

Change-Id: Ia7a1ccb34bd62ec585c73f4346f59aff5ba84432
2019-11-20 22:31:25 -08: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 eccb973ab6 Merge "bluetooth: V1.1" am: e6c1e50be8 am: 51f99d3879
am: c8305f48e3

Change-Id: Ia27059256636c7549c430ddfe4aefa5957eddc8e
2019-11-20 11:05:35 -08:00
Jakub Pawlowski c8305f48e3 Merge "bluetooth: V1.1" am: e6c1e50be8
am: 51f99d3879

Change-Id: Ib4b68a922b526aabf4f6f8f3237bb800652a0060
2019-11-20 11:01:55 -08:00
TreeHugger Robot f796bed1a1 Merge "Remove legacy idmap binary" 2019-11-20 16:41:38 +00: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
Terry Wang 05f2c27dec Add a new system service for app search management.
This change adds appsearch-service to base system and media system.

Bug: 142567528
Test: atest cts/tests/appsearch/src/com/android/cts/appsearch/AppSearchManagerTest.java
Change-Id: I4c7b2a2fb7e58b6796a4e5f2034f70d0dc706e0f
2019-11-19 10:42:46 -08: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
TreeHugger Robot 1b5bf44bc3 Merge "Add media.c2@1.1" 2019-11-19 02:05:47 +00:00
Marissa Wall 7772f4d6c2 gralloc: add libgralloctypes.so to VNDK-SP
Add libgralloctypes to the VNDK-SP. This library contains functions
that encode and decode buffer metadata. The library will be used by
by vendors and the framework.

Bug: 141632767
Test: Compiles. Gralloc is tested through VTS.
Change-Id: I2da3ae7539353654958eba802e8a6a4ef849d740
2019-11-18 21:26:50 +00:00
TreeHugger Robot f96f2bf05b Merge "graphics/common: stable AIDL support" 2019-11-18 17:22:33 +00:00
Robert Shih b459e1656c base_system: remove mediadrmserver
Bug: 134787536
Test: vendor/google/build/build_test.bash
Change-Id: I743dfa8f1c17b80a8a859d94e8ffc5f38c21eeac
2019-11-16 13:46:41 -08:00
Marissa Wall caf803dfb9 graphics/common: stable AIDL support
Update current.txt to include the new stable AIDL graphics common
library.

Bug: 141632767
Test: Compiles

Change-Id: Ibcbd07e4d3757266671e6845202a47bf6fcc7169
2019-11-15 19:28:16 -08:00
Mårten Kongstad b893bbf0ae Remove legacy idmap binary
The idmap tool has been replaced by idmap2. Remove now obsolete code
related to the old binary.

Bug: 118711077
Test: atest OverlayDeviceTests OverlayHostTests
Change-Id: Ie1b8fe6f53ce5308b3a1ee6b9f4719cd830a2ecf
2019-11-15 07:29:18 -08:00
Justin Yun eaa51be170 Merge "Add /persist symlink to mainline_arm64" am: 0b6de0b173 am: 0a856c6682
am: bf2bb0ae49

Change-Id: I41c85f8d70cbcc267b5716ce684c657aea7d1f53
2019-11-13 23:04:32 -08: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
Jordan Liu 1e6a35c090 Fix comment issue
In makefile when a comment ends with \ the next line becomes part of
the comment. Fix this by removing the comment.

Bug: 144435423
Bug: 135956699
Fixes: 144429950
Test: build and adb shell pm list to confirm the packages are present
Change-Id: Ia182dc871445552ecf265de19836a719a2e88540
2019-11-13 20:02:42 +00:00
Tom Cherry 4f51fba546 Merge "Move init and ueventd scripts from / to /system/etc" 2019-11-13 14:36:47 +00:00
Yu-Han Yang 13a8f98de1 Add GNSS HAL v2.1 to vndk
Bug: 141758837
Bug: 136136192

Test: atest VtsHalGnssV2_1TargetTest
Change-Id: Ia06b38a5f2f5e3ab4eb48b91dc01b47488f85ccf
2019-11-12 18:46:59 -08:00
Steven Moreland b608bd5256 Merge "Remove vibrator@1.4 from VNDK" am: 88d1b62b89 am: fbb38bbf33
am: c1d1c21fb1

Change-Id: Ic51dca48951a2e991cd3e3a8ed8b923e5ef83a23
2019-11-12 14:09:38 -08: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
Chen Xu 556087c4b9 Merge "Create a cellbroadcast apex" 2019-11-12 19:38:27 +00:00
Tom Cherry 24ede38d8d Merge "Move init and ueventd scripts from / to /system/etc" into qt-qpr1-dev-plus-aosp
am: 246dbc1b0b

Change-Id: Ia35a4586889e4c3059674b138135c854939c0a82
2019-11-12 07:57:14 -08: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
Chen Xu 002c77903c Create a cellbroadcast apex
create a single com.android.cellbroadcast apex to pack two apks
together: com.android.cellbroadcastreceiver and
com.android.cellbroadcastservice.

Bug: 135956699
Test: m com.android.cellbroadcast && adb install
com.android.cellbroadcast

Change-Id: I01dd26b12411e79a36be9a579f3ef14d1ee2544b
2019-11-11 21:05:42 -08:00
Justin Yun 8739801f5c Merge "Create *_system_ext.mk for system_ext packages" am: f7b16cad9d am: 80508409e4
am: 0d511712c9

Change-Id: I2af3418fb2e2735f9e5756fe9669f20fb7749126
2019-11-11 15:45:19 -08: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
Remi NGUYEN VAN 674f1708ee Merge "Revert "Revert "Use NetworkStackNext as preinstalled network stack""" am: 6cbbac5cec am: f82fd89eb8
am: afb0ff8fea

Change-Id: I456ccb82deaab2a8fd610cd9a4e26f17783e6d69
2019-11-11 10:25:30 -08:00
Remi NGUYEN VAN 60bb223f41 Merge "Revert "Use NetworkStackNext as preinstalled network stack"" am: 7017d37675 am: af94c1ea25
am: 86783d4e33

Change-Id: I58511fa2ea4f4c71af0ce6c56416e74628292ea5
2019-11-11 10:09:07 -08: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
Henry Fang 7399dae4e2 Merge "Enable cas@1.2" 2019-11-08 19:34:56 +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 45ad40591c Merge "Revert submission of topic 'libdl_android-in-apex'" am: c91616fabd am: aa0cbb18fa
am: 00b4723af8

Change-Id: I81a443ecc57d678e20a1516243c987e65bba9e5b
2019-11-08 04:17:40 -08: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 bfed6bcbde Merge "Use NetworkStackNext as preinstalled network stack" am: 97ed14a7fe am: efe886cb84
am: 2183772eab

Change-Id: I66a5ed204b0a4ed4db238e0e09f03412feab8bb8
2019-11-08 02:37:42 -08: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
Sudheer Shanka 8f7644ee87 Merge "Add a new system service for blob store management." 2019-11-08 04:05: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
Tim Joines 6909cc9f72 Merge "Fix comment on iorapd" 2019-11-07 21:32:38 +00:00
Tim Joines 907e6cf541 Fix comment on iorapd
This property is enabled by default now, just updating the comment to
match.

Exempt-From-Owner-Approval: No behavioral change.

Test: manual, no change to behavior
Bug: 143719868
Change-Id: I10fc05f1165016b569b31ffae0a53d4f1583280e
2019-11-07 21:32:27 +00:00
Ashwini Oruganti 71514b7f9b Merge "Remove the cert for GooglePermissionController" am: 4c98469598 am: 9bfca4ffe4
am: 60e69d3925

Change-Id: Ifddb3d9563d80f0ed12fc8d96b09efae862bc4e7
2019-11-07 12:22:48 -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
Treehugger Robot 4c98469598 Merge "Remove the cert for GooglePermissionController" 2019-11-07 19:59:03 +00:00
Tom Cherry 171185df51 Move init and ueventd scripts from / to /system/etc
There is no reason for these scripts to continue to exist in /, when
they are better suited for /system/etc.  There are problems keeping
them at / as well, particularly that they cannot be updated with
overlayfs.

Bug: 131087886
Bug: 140313207
Test: build/boot
Merged-In: I5aa0332e7f0e3fb6840b60e3d099c2b28d38b7ea
Change-Id: I5aa0332e7f0e3fb6840b60e3d099c2b28d38b7ea
2019-11-07 19:38:34 +00:00
Henry Fang 7df5b71c74 Merge "update build file to include cas@1.2" 2019-11-07 19:33:33 +00:00
Tom Cherry 89eea96fe1 Move init and ueventd scripts from / to /system/etc
There is no reason for these scripts to continue to exist in /, when
they are better suited for /system/etc.  There are problems keeping
them at / as well, particularly that they cannot be updated with
overlayfs.

Bug: 131087886
Bug: 140313207
Test: build/boot
Merged-In: I5aa0332e7f0e3fb6840b60e3d099c2b28d38b7ea
Change-Id: I5aa0332e7f0e3fb6840b60e3d099c2b28d38b7ea
2019-11-07 11:28:56 -08:00
Yuexi Ma bd72ff7711 Revert submission of topic 'libdl_android-in-apex'
Reason for revert: broke numerous major apps in app compat testing
Bug: 144100240

Change-Id: I29d8286c977e357c012392db5ae65ca211f4d2a9
2019-11-07 19:19:44 +00:00
Sarah Chin 97dc04f02a Set up IRadioConfig 1.3
Test: build
Bug: 144101226
Change-Id: Ia5ca23e07eda0d4db8a8c701181c073745abb094
2019-11-07 10:54:20 -08:00
Martin Stjernholm 8b649a56c4 Merge "Add libdl_android as a bootstrap library." am: 65e4ce6ebc am: 67626e7a21
am: 394dce1266

Change-Id: I7f256294295512baa0d8086f9b9c40e220cb4184
2019-11-07 03:22:08 -08:00
Martin Stjernholm 394dce1266 Merge "Add libdl_android as a bootstrap library." am: 65e4ce6ebc
am: 67626e7a21

Change-Id: I689296cd2a9f0fd73c18c1a19d2aa5ec2d375b81
2019-11-07 03:16:27 -08:00
Martin Stjernholm 65e4ce6ebc Merge "Add libdl_android as a bootstrap library." 2019-11-07 11:01:36 +00:00
Pawin Vongmasa 8e7af6c9ce Add media.c2@1.1
Test: Builds

Bug: 136316504

Change-Id: Ie3f579f958b45e712aefacd7489798f6cfc682c6
2019-11-07 03:00:32 -08:00
Henry Fang 3d86a2cf4c Enable cas@1.2
Turn on cas@1.2 service
Test: Manual
bug: 141783130

Change-Id: I4966dcc83d8ab31223b634987726a0a3f0e706ce
2019-11-06 16:48:28 -08:00
Henry Fang d0e1aa4a83 update build file to include cas@1.2
Test: Manual
bug: 141783130
Change-Id: I4692b21a15685cfa4377d3aa3219a4f424530506
Merged-In: I4692b21a15685cfa4377d3aa3219a4f424530506
2019-11-06 22:58:44 +00:00
Martin Stjernholm 88ff58f8a7 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
Change-Id: I5862ba57485bdaffd452aac47c5931863823075d
2019-11-06 20:38:44 +00:00
Remi NGUYEN VAN 7b7af54259 Use NetworkStackNext as preinstalled network stack
NetworkStackNext is the build of the network stack targeted at the
next API, e.g. system_current and not system_29.

While NetworkStack is a mainline module that needs to be built with a
stable SDK (system_29), NetworkStackNext is necessary to test
functionalities that require the in-development SDK (system_current).
Using NetworkStackNext preinstalled on development builds allows for
testing the new APIs and functionalities.

NetworkStackNext is also configured with a mainline module package name
on targets that use mainline modules; but it is not intended to receive
mainline updates.

Once system_current is finalized (system_30 ?), NetworkStack can start
using it, and the system image should switch back to NetworkStack
instead of NetworkStackNext.

Bug: 139269711
Test: Built, phone boots, WiFi working
Change-Id: I885b2c441b99daa3165a4a365738682958478291
2019-11-06 10:27:20 +00:00
Jordan Liu 6f13614189 Merge "Add CellBroadcastServiceModule to mk" am: 2bbfa528b3
am: 3809de215e

Change-Id: I7a9dce44db803c3152cc0ff47e5802004f36a355
2019-11-05 17:06:09 -08:00
Jordan Liu 2bbfa528b3 Merge "Add CellBroadcastServiceModule to mk" 2019-11-06 00:41:51 +00:00
Josh Gao fb5e9beb0c Merge "Build the adbd apex." am: c274348f66 am: c089c339ee
am: d2f79ce86e

Change-Id: I84ebac0c0ed4f4c50fbc2a8cd7faee897c88d126
2019-11-05 16:07:38 -08:00
Josh Gao d2f79ce86e Merge "Build the adbd apex." am: c274348f66
am: c089c339ee

Change-Id: Ifd2235165f4d51ef07b16bb69c3eaf7b4ed8df4a
2019-11-05 15:56:56 -08:00
Josh Gao c274348f66 Merge "Build the adbd apex." 2019-11-05 23:36:39 +00:00
Jordan Liu 382309520d Add CellBroadcastServiceModule to mk
Bug: 135956699
Test: m -j30 (verify that build includes CellBroadcastServiceModule)
Change-Id: Ib2d734ba2ed3608a4255164e6e50dac349eb9a18
Merged-In: Ib2d734ba2ed3608a4255164e6e50dac349eb9a18
2019-11-05 11:28:36 -08:00
Justin Yun 7aecc39136 Create *_system_ext.mk for system_ext packages
The default packages for system_ext partition must be added to
*_system_ext.mk.
We have empty list for now, but will update the files soon.

Bug: 134359158
Bug: 139053989
Test: build and boot
Change-Id: I78c85c3a9ff0437906143c2d4982ecfb0e4d058d
2019-11-05 05:45:15 +00:00
Treehugger Robot 27fe9add1d Merge "Bump PRODUCT_SHIPPING_API_LEVEL to 29 for CSI" 2019-11-04 04:48:12 +00:00
Jooyung Han c18554d06d Merge "Use MakeVar from soong instead of hardcoding" am: 41055047da am: 0ffb433903
am: f0f88382cc

Change-Id: Ib3bf960e840920a768079f1f90a9760709828011
2019-10-31 19:24:58 -07:00
Jooyung Han f0f88382cc Merge "Use MakeVar from soong instead of hardcoding" am: 41055047da
am: 0ffb433903

Change-Id: Ia417176317aea5c87a73357a703fe7a9fcfc1218
2019-10-31 19:19:07 -07:00
Jooyung Han 0ffb433903 Merge "Use MakeVar from soong instead of hardcoding"
am: 41055047da

Change-Id: I50253df8c17f9745b3a026c56cf316c93cd0525f
2019-10-31 19:13:01 -07:00
Jooyung Han 41055047da Merge "Use MakeVar from soong instead of hardcoding" 2019-11-01 01:57:50 +00:00
Yi-yo Chiang e167e0df1f Merge "Bump PRODUCT_SHIPPING_API_LEVEL to 29 for CSI" into qt-qpr1-dev-plus-aosp 2019-11-01 01:26:47 +00:00
Ashwini Oruganti e575157366 Remove the cert for GooglePermissionController
We no longer need to specify seinfo for privapps when defining rules in
seapp_contexts. And so, we also no longer need to have the key here.

Bug: 142672293
Test: Happy builds.
Change-Id: I0d67844db5a59c445f76e2aef0a13446e486a193
2019-10-31 14:12:08 -07:00
TreeHugger Robot 81e3eb8597 Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master 2019-10-31 18:38:43 +00:00
Ashwini Oruganti 5eea75e805 Merge "Add keys for GooglePermissionController" am: 6aaafc4ad4 am: 123ecb97ec
am: 16659c5ab0

Change-Id: I00441a88f1f1e903132deb4ea8edb4fbb1946ba7
2019-10-31 10:01:36 -07:00
Ashwini Oruganti 16659c5ab0 Merge "Add keys for GooglePermissionController" am: 6aaafc4ad4
am: 123ecb97ec

Change-Id: I889a4226362e18d4566db72e15034a477d604b53
2019-10-31 09:54:31 -07:00
Ashwini Oruganti 6aaafc4ad4 Merge "Add keys for GooglePermissionController" 2019-10-31 16:38:56 +00:00
TreeHugger Robot 8549de1bf4 Merge "Bump PRODUCT_SHIPPING_API_LEVEL to 29 for CSI" 2019-10-31 14:08:13 +00:00
Roland Levillain 275adbd65d Merge "Reland "Remove Core Library JARs from `/system/framework`."" am: 3596fc60c8 am: 6dc4d94f1f
am: a3f6fa20aa

Change-Id: I67a86287a3bdc4cc61712ee9e40a0db52f2c8b75
2019-10-31 06:34:11 -07:00
Roland Levillain a3f6fa20aa Merge "Reland "Remove Core Library JARs from `/system/framework`."" am: 3596fc60c8
am: 6dc4d94f1f

Change-Id: I798e74483ad1cf7d85c218e6b184f93f68b04129
2019-10-31 06:28:17 -07:00
Roland Levillain 3596fc60c8 Merge "Reland "Remove Core Library JARs from `/system/framework`."" 2019-10-31 13:07:46 +00:00
Yo Chiang 6276066a02 Bump PRODUCT_SHIPPING_API_LEVEL to 29 for CSI
Bug: 141972143
Test: lunch mainline_system_arm64-userdebug ; m
Test: TH build_test
Merged-In: Iee2ac89586d71d9ab3bb257f2b3b1073710554d5
Change-Id: Iee2ac89586d71d9ab3bb257f2b3b1073710554d5
2019-10-31 11:00:28 +00:00
Yo Chiang 8c1290cbd5 Bump PRODUCT_SHIPPING_API_LEVEL to 29 for CSI
Bug: 141972143
Test: lunch mainline_system_arm64-userdebug ; m
Test: TH build_test
Merged-In: Iee2ac89586d71d9ab3bb257f2b3b1073710554d5
Change-Id: Iee2ac89586d71d9ab3bb257f2b3b1073710554d5
2019-10-31 10:56:49 +00:00
Yo Chiang 2ccc153d42 Bump PRODUCT_SHIPPING_API_LEVEL to 29 for CSI
Bug: 141972143
Test: lunch mainline_system_arm64-userdebug ; m
Test: TH build_test
Change-Id: Iee2ac89586d71d9ab3bb257f2b3b1073710554d5
2019-10-31 14:57:35 +08:00
Jooyung Han 037b3e081c Use MakeVar from soong instead of hardcoding
check-vndk-list target reads the vndk.libraries.txt file from
SOONG_VNDK_LIBRARIES_FILE makevar.

Bug: 142963962
Test: m check-vndk-list
Change-Id: I10f6ad80757ed267b66c9a709b75621e063f3744
2019-10-31 11:37:07 +09:00
Xin Li 5cf7c45d0c DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Bug: 142003500
Change-Id: I635cde495c56988d324aeab6a278f4abfdea16d8
2019-10-30 11:46:29 -07:00
Roland Levillain c7c4a766f0 Reland "Remove Core Library JARs from `/system/framework`."
These JARs are part of the ART APEX, and are now located in
`/apex/com.android.art/javalib`. Remove the supernumerary copies in
`/system/framework` and save ~11 MiB on the system partition.

This change no longer breaks coverage builds, as module
`jacocoagent` has been removed from `TARGET_CORE_JARS` in CL
https://android-review.googlesource.com/c/platform/build/+/1151464.

This reverts commit 7c39368927.

Test: Device boot test
Test: Check that:
        export EMMA_INSTRUMENT=true
        && unset EMMA_INSTRUMENT_STATIC
        && m installclean
        && m systemimage
      generates a system image that contains these files:
        /system/framework/apex-jacocoagent.vdex
        /system/framework/boot-jacocoagent.vdex
        /system/framework/jacocoagent.jar
        /system/framework/<arch>/apex-jacocoagent.art
        /system/framework/<arch>/apex-jacocoagent.oat
        /system/framework/<arch>/apex-jacocoagent.vdex
        /system/framework/<arch>/boot-jacocoagent.art
        /system/framework/<arch>/boot-jacocoagent.oat
        /system/framework/<arch>/boot-jacocoagent.vdex
Test: Run test ATP test avd/avd_boot_health_check on build target
      cf_x86_phone-userdebug_coverage
Bug: 142944799
Bug: 143304991
Change-Id: Ifdb2331c5dcb992adbfd6c5a3983d8b9b13d16b2
2019-10-30 16:25:19 +00:00
Bo Hu dac4bb3700 Merge "emulator: remove vintf and some whitelists" am: 3c9230183d
am: 4febe1e5b3

Change-Id: Id4b86c7244d30e7f64861c787cd38d1f43457167
2019-10-30 07:14:13 -07:00
Bo Hu 3c9230183d Merge "emulator: remove vintf and some whitelists" 2019-10-30 13:20:19 +00:00
Jooyung Han 6aab05dfce Merge "Revert "Revert "Revert "Revert "install VNDK APEX instead of VNDK libs""""" am: 85808a8089 am: f889ac5e21
am: e059bdeb0b

Change-Id: I32cb8216c0bf915d05c2697d54a9ef70c2547fbc
2019-10-29 21:50:28 -07:00
Jooyung Han e059bdeb0b Merge "Revert "Revert "Revert "Revert "install VNDK APEX instead of VNDK libs""""" am: 85808a8089
am: f889ac5e21

Change-Id: I793657fd68426f86cfb8e2f5d60e58b3ccf66d6d
2019-10-29 21:43:59 -07:00
Treehugger Robot 85808a8089 Merge "Revert "Revert "Revert "Revert "install VNDK APEX instead of VNDK libs""""" 2019-10-30 04:29:37 +00:00
Xiangyu/Malcolm Chen bd670e4d6f Merge "Adding IRadio1.5 definition." am: c76498a53d
am: 3efc1852f8

Change-Id: Ie70cf2005a8f97855d15f0d92227707fded6bd99
2019-10-29 16:01:08 -07:00
Sudheer Shanka 24876a7dc2 Add a new system service for blob store management.
This change adds a bare-bones system service, implementation will follow
later.

Bug: 143559646
Test: atest cts/tests/BlobStore/src/com/android/cts/blob/BlobStoreManagerTest.java
Change-Id: I344cc516d364c5148be3b4994d630fad5f73cf27
2019-10-29 15:22:45 -07:00
Xiangyu/Malcolm Chen c76498a53d Merge "Adding IRadio1.5 definition." 2019-10-29 22:22:38 +00:00
Justin Yun 666b2208cc Merge "Add zygote init script to mainline_system.mk" am: e8d9df122a am: 7b33d3bcc0 am: 5f4ae378ef
am: 6972e648be

Change-Id: I57dbb5720925c74eaad79e1a382948d52f0c84ff
2019-10-29 00:06:21 -07:00
Justin Yun 5f4ae378ef Merge "Add zygote init script to mainline_system.mk" am: e8d9df122a
am: 7b33d3bcc0

Change-Id: Iffd2165060f44b303756d9ab0befc0858bb2d80a
2019-10-28 23:52:56 -07:00
Treehugger Robot e8d9df122a Merge "Add zygote init script to mainline_system.mk" 2019-10-29 06:32:44 +00:00
Jooyung Han 93bdc3e734 Revert "Revert "Revert "Revert "install VNDK APEX instead of VNDK libs""""
This reverts commit ec8769762f.

Reason for revert:  Fix b/143374795

Change-Id: I7a9a06cb01e3cac0d15b352da76b6b8e9b45eb63
2019-10-28 21:07:21 +00:00
Ashwini Oruganti 33175af3f3 Add keys for GooglePermissionController
Bug: 142672293
Test: Builds are no longer complaining about missing key file
Change-Id: I9bdeca0225c9218695ce4f4b2dfd5e9cba2b37f4
2019-10-28 14:06:48 -07:00
Roland Levillain e6a11e7351 Merge "Revert "Remove Core Library JARs from `/system/framework`."" am: 5ec356acff am: 8e3afe7ca4 am: c895f20422
am: 0c486ca724

Change-Id: Icbffd8dda7d41fe2e9a140cc70e340558fa83356
2019-10-28 11:21:40 -07:00
Roland Levillain c895f20422 Merge "Revert "Remove Core Library JARs from `/system/framework`."" am: 5ec356acff
am: 8e3afe7ca4

Change-Id: Iea0fbe32dad214044bae722bb85a82bc472c961f
2019-10-28 11:07:36 -07:00
Roland Levillain 5ec356acff Merge "Revert "Remove Core Library JARs from `/system/framework`."" 2019-10-28 17:48:23 +00:00
Greg Kaiser 82a83fd03e Merge "Revert "Revert "Revert "install VNDK APEX instead of VNDK libs"""" am: 35815917ba am: c443c0b348 am: dbaee05a78
am: 216bfed342

Change-Id: Ie841747295a4bfab490f9fc9d1bc583729cf3916
2019-10-28 10:37:52 -07:00
Greg Kaiser dbaee05a78 Merge "Revert "Revert "Revert "install VNDK APEX instead of VNDK libs"""" am: 35815917ba
am: c443c0b348

Change-Id: I8a6328744d4839041a07b1c3db56c564e860aae4
2019-10-28 10:26:00 -07:00
Greg Kaiser 35815917ba Merge "Revert "Revert "Revert "install VNDK APEX instead of VNDK libs"""" 2019-10-28 17:12:33 +00:00
Henry Fang 55cc5d6736 Merge "update build file to include cas@1.2" 2019-10-28 17:12:27 +00:00
bohu d0512cf386 emulator: remove vintf and some whitelists
merge internal first to resolve conflicts from aosp

BUG: 123495142

Change-Id: Ie204f22de49f0593a067f8cb52d3dea371fd2e13
Merged-In: Ie204f22de49f0593a067f8cb52d3dea371fd2e13
2019-10-28 09:20:44 -07:00
Roland Levillain 7c39368927 Revert "Remove Core Library JARs from `/system/framework`."
This reverts commit 3ec9ff6b72.

Reason for revert: This change breaks coverage builds (b/143304991)

Change-Id: Ia1a41ea75d1539efeb33b7cdea84516e402b6e00
Test: Device boot test
Test: Check that:
        export EMMA_INSTRUMENT=true
        && unset EMMA_INSTRUMENT_STATIC
        && m installclean
        && m systemimage
      generates a system image that contains these files:
        /system/framework/apex-jacocoagent.vdex
        /system/framework/boot-jacocoagent.vdex
        /system/framework/jacocoagent.jar
        /system/framework/<arch>/apex-jacocoagent.art
        /system/framework/<arch>/apex-jacocoagent.oat
        /system/framework/<arch>/apex-jacocoagent.vdex
        /system/framework/<arch>/boot-jacocoagent.art
        /system/framework/<arch>/boot-jacocoagent.oat
        /system/framework/<arch>/boot-jacocoagent.vdex
Test: Test: Run test ATP test avd/avd_boot_health_check on build target
      cf_x86_phone-userdebug_coverage
Bug: 142944799
Bug: 143304991
2019-10-28 15:00:31 +00:00
TreeHugger Robot f066c0e491 Merge "emulator: remove vintf and some whitelists" 2019-10-28 12:21:28 +00:00