Commit graph

4664 commits

Author SHA1 Message Date
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
Jiyong Park
01fcd076fd Merge "Replace framework.jar with framework-minus-apex.jar" am: 21403dc2df
am: 252f3bfbfb

Change-Id: I6bccea8011b3248bbfefc8b36d5d67f53b4a7822
2019-10-28 05:19:51 -07:00
Jiyong Park
44d357e1ff Replace framework.jar with framework-minus-apex.jar
Bug: 139391334
Test: m, device is bootable
Exempt-From-Owner-Approval: Approved internally
Merged-In: I281f841c164a4813ed4c436fb84680f5ade1ee1d
(cherry picked from commit 219d4ac2b2)
Change-Id: I281f841c164a4813ed4c436fb84680f5ade1ee1d
2019-10-28 09:55:33 +00:00
TreeHugger Robot
3be97bcd7b Merge "Replace framework.jar with framework-minus-apex.jar" 2019-10-28 05:56:11 +00:00
Justin Yun
c0b883fe77 Add zygote init script to mainline_system.mk
We may add all possible scripts to "root" to clean up the whitelists
of mainline devices.
One of the zygote init scripts is selected by "ro.zygote" property.

Bug: 143121605
Test: build test for all device targets
Change-Id: I4435f1c48a306c3a8d42522ed780d405a32780b4
2019-10-28 14:31:24 +09:00
Jooyung Han
ec8769762f Revert "Revert "Revert "install VNDK APEX instead of VNDK libs"""
This reverts commit 6851a27604.

Reason for revert: b/143374795

Change-Id: Iff04cb2a500b4d624abeec4dbc5dcfb5a6e03397
2019-10-28 05:09:13 +00:00
bohu
4d2511e0d0 emulator: remove vintf and some whitelists
merge internal first to resolve conflicts from aosp

BUG: 123495142

Change-Id: Ie204f22de49f0593a067f8cb52d3dea371fd2e13
2019-10-28 04:04:06 +00:00
Xin Li
f699737282 Merge "Merge Coral/Flame into AOSP master" 2019-10-27 04:44:29 +00:00
Jooyung Han
5861d536c5 Merge "Use soong-generated vndk.libraries.txt" am: 6b1be377a5 am: 4ca744212c am: 75630cb12d
am: da827a0fd6

Change-Id: I0f4ddc0b3dd3c7324cd3e13b5bb8c6c738848236
2019-10-25 19:34:57 -07:00
Jooyung Han
75630cb12d Merge "Use soong-generated vndk.libraries.txt" am: 6b1be377a5
am: 4ca744212c

Change-Id: I723ec3777f719100880d9f135740ab1def90b986
2019-10-25 19:22:20 -07:00
Jooyung Han
4ca744212c Merge "Use soong-generated vndk.libraries.txt"
am: 6b1be377a5

Change-Id: I7472da62ec2a98a482a6bcba77d0dd7e19eefa0e
2019-10-25 19:15:51 -07:00
Treehugger Robot
6b1be377a5 Merge "Use soong-generated vndk.libraries.txt" 2019-10-26 01:52:39 +00:00
Malcolm Chen
e12c3bb24f Adding IRadio1.5 definition.
Bug: 141995149
Test: build
Change-Id: I46ab1f095c661d6241ccb8afe907b9d0e78a2786
Merged-In: I46ab1f095c661d6241ccb8afe907b9d0e78a2786
2019-10-25 16:08:05 -07:00
Xin Li
a76973dcbf Merge Coral/Flame into AOSP master
Bug: 141248619
Change-Id: Iffa21efaa08e8b067dfa2857bd2951208c756395
Merged-In: If1543d20656d99205debad84e169ac14c53b6e10
2019-10-25 10:27:44 -07:00
Jooyung Han
49a5a84857 Merge "Revert "Revert "install VNDK APEX instead of VNDK libs""" am: df518833b4 am: 016181ab3f am: bf188fdf31
am: 82d8994dad

Change-Id: Iac152806110178def3c08351a893253b7ccb2db9
2019-10-25 02:02:35 -07:00
Jooyung Han
bf188fdf31 Merge "Revert "Revert "install VNDK APEX instead of VNDK libs""" am: df518833b4
am: 016181ab3f

Change-Id: Ia3f539a524e1ad935491e099c5f062308d812c1e
2019-10-25 01:43:05 -07:00
Jooyung Han
016181ab3f Merge "Revert "Revert "install VNDK APEX instead of VNDK libs"""
am: df518833b4

Change-Id: I861ec1e245fb5caf4a9d497d2ee117e5c3a8d7c6
2019-10-25 01:30:29 -07:00
Jooyung Han
df518833b4 Merge "Revert "Revert "install VNDK APEX instead of VNDK libs""" 2019-10-25 08:21:13 +00:00
Jiyong Park
219d4ac2b2 Replace framework.jar with framework-minus-apex.jar
Bug: 139391334
Test: m, device is bootable
Change-Id: I281f841c164a4813ed4c436fb84680f5ade1ee1d
2019-10-25 12:27:16 +09:00
Xiangyu/Malcolm Chen
1b247042b1 Merge "Adding IRadio1.5 definition." 2019-10-24 23:33:37 +00:00
Josh Gao
17ecd9e592 Merge "Use adbd_system_binaries to track adbd's dependencies." am: 3322f6ec35 am: e3a278b5c6 am: c63162c0e4
am: a3a9dec14c

Change-Id: I1fb975cbe6bacc2118e08543e41ca18a81a39086
2019-10-24 14:52:12 -07:00
Josh Gao
c63162c0e4 Merge "Use adbd_system_binaries to track adbd's dependencies." am: 3322f6ec35
am: e3a278b5c6

Change-Id: Ibe95c4799847ac2a7ed2e24957a1553b5b094117
2019-10-24 14:39:13 -07:00
Josh Gao
e3a278b5c6 Merge "Use adbd_system_binaries to track adbd's dependencies."
am: 3322f6ec35

Change-Id: If1543d20656d99205debad84e169ac14c53b6e10
2019-10-24 14:31:13 -07:00
Josh Gao
3322f6ec35 Merge "Use adbd_system_binaries to track adbd's dependencies." 2019-10-24 20:29:25 +00:00
Jooyung Han
a0158d8327 Use soong-generated vndk.libraries.txt
check-vndk-list target should use 'filename's not 'modulename's.
But retrieving(or calculation) of filename from modulename doesn't work
when target module is not installed. That's why builds of some targets
fail given that libprotobuf-cpp-full's name is changed.

Now soong generates vndk.libraries.txt with filenames of VNDK libs.

And, check-vndk-list target is disabled now for targets with no vndk
libs. (BOARD_VNDK_VERSION is not set)

Bug: 142963962
Bug: 141019581
Test: m check-vndk-list
Test: lunch qemu_trusty_arm64-userdebug; m check-vndk-list (no check)
Change-Id: I680deb1a7af37c32a9e6932d52e8d87e5a3534b9
2019-10-25 02:15:48 +09:00
Yifan Hong
85843193b8 Merge "VNDK-core += health@2.1" am: 0d07c944ae am: fd914c0232 am: 8d6d24632e
am: 7ef7566f27

Change-Id: I1305cc9d8506b92896a68314345954eb4759c1db
2019-10-23 18:51:14 -07:00
Yifan Hong
8d6d24632e Merge "VNDK-core += health@2.1" am: 0d07c944ae
am: fd914c0232

Change-Id: I006e005c0f2e54c62a12a5a8021a6515f9462b13
2019-10-23 18:37:12 -07:00
Yifan Hong
fd914c0232 Merge "VNDK-core += health@2.1"
am: 0d07c944ae

Change-Id: I50f5a9f8414a7d946c27c07c2a0b5989f3b7877c
2019-10-23 18:30:11 -07:00
Yifan Hong
0d07c944ae Merge "VNDK-core += health@2.1" 2019-10-24 01:03:09 +00:00
Winson Chiu
43d4c85314 Merge "Revert "VNDK library list uses installed name"" am: 82e8d28d03 am: 30427892d7 am: d72b3289a5
am: 38a07e17ca

Change-Id: I3df637685551c2d85c7439ffa30b1c1f4f1324e2
2019-10-23 16:24:06 -07:00
Winson Chiu
d72b3289a5 Merge "Revert "VNDK library list uses installed name"" am: 82e8d28d03
am: 30427892d7

Change-Id: I9a0beadf85ccf4fdf615a7e587c21cd2568d80d5
2019-10-23 15:39:53 -07:00
Winson Chiu
30427892d7 Merge "Revert "VNDK library list uses installed name""
am: 82e8d28d03

Change-Id: I67478e03cd823106788f4ba1050cc42794edded2
2019-10-23 15:20:43 -07:00
Winson Chiu
82e8d28d03 Merge "Revert "VNDK library list uses installed name"" 2019-10-23 21:35:41 +00:00
Winson Chiu
3d5eba2be4 Revert "VNDK library list uses installed name"
This reverts commit b808592783.

Reason for revert: potentially broke build b/143233626

Change-Id: I1458cb687923833010f3de1277092f8ead744ea3
2019-10-23 21:24:40 +00:00
Josh Gao
4b7f73c0da Build the adbd apex.
Test: adb shell "su 0 readlink /proc/\`pidof adbd\`/exe"
Change-Id: I29227a79765fca8f0f2601f0fefa6f01232fbc6f
2019-10-23 13:27:51 -07:00
Josh Gao
56db7393ce Use adbd_system_binaries to track adbd's dependencies.
required doesn't propagate from apexes, so we need a separate phony
target to track adbd's dependenecies.

Test: m
Change-Id: Ic9fd19570987c5c3d96d3a35f2d3e2c7ea4642d9
2019-10-23 13:27:48 -07:00
Yo Chiang
633e2321df Merge "VNDK library list uses installed name" am: 885cf6b565 am: 4c0eae4f3f am: 4d797c1aaa
am: 560b81a8b6

Change-Id: I797b7c7488b933d620f5d534e830b646413b4a13
2019-10-23 12:47:52 -07:00
Yo Chiang
4d797c1aaa Merge "VNDK library list uses installed name" am: 885cf6b565
am: 4c0eae4f3f

Change-Id: I8a5b25f29618924830e9a3b855ef3a9489442731
2019-10-23 12:07:16 -07:00
Yo Chiang
4c0eae4f3f Merge "VNDK library list uses installed name"
am: 885cf6b565

Change-Id: If7b4a28183348535e8166193f3c990dc3b4d7d43
2019-10-23 11:46:53 -07:00
Treehugger Robot
885cf6b565 Merge "VNDK library list uses installed name" 2019-10-23 18:02:00 +00:00
Roland Levillain
c0bcc522fa Merge "Remove Core Library JARs from /system/framework." am: 047f2fd43e
am: e517577a45

Change-Id: Ib054fdf555f14dc64eaa430bc2544ab991ed2bdb
2019-10-22 10:56:40 -07:00
Roland Levillain
e517577a45 Merge "Remove Core Library JARs from /system/framework."
am: 047f2fd43e

Change-Id: Ic25531c16a71452e659776765185adf8feac5eac
2019-10-22 10:51:10 -07:00
Roland Levillain
3ec9ff6b72 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.

(cherry picked from commit d4f09f7752)

Test: Device boot test
Bug: 142944799
Change-Id: Ia6f58d858ecdb80c9701696b8f20d5fa2de0c2c7
Merged-In: Ia6f58d858ecdb80c9701696b8f20d5fa2de0c2c7
2019-10-22 16:42:53 +00:00
Roland Levillain
1121ffd97c Merge "Remove Core Library JARs from /system/framework." 2019-10-22 16:39:56 +00:00
Henry Fang
3595e31105 update build file to include cas@1.2
Test: Manual
bug: 141783130
Change-Id: I4692b21a15685cfa4377d3aa3219a4f424530506
2019-10-21 15:49:03 -07:00
Roland Levillain
d4f09f7752 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.

Test: Device boot test
Bug: 142944799
Change-Id: Ia6f58d858ecdb80c9701696b8f20d5fa2de0c2c7
2019-10-21 15:22:51 +01:00
Chen Xu
ad5ab25f1c switch to updatable cellbroadcast apk
Bug: 135956699
Test: Build & Manual
Change-Id: I30ac57d1f3dc259142d3354fdb4f14fc5f9ec02d
2019-10-20 20:51:39 -07:00
Jooyung Han
6851a27604 Revert "Revert "install VNDK APEX instead of VNDK libs""
This reverts commit 376c613085.

Bug: 141451661
Test: m && boot (tested with cuttlefish)
2019-10-19 02:24:09 +09:00
Inseob Kim
7c74ee1393 Merge changes from topic "fix_treble_sysprop_neverallow" am: 8de0013551 am: 44090a3b54 am: 1a848ab39a
am: 2434110f21

Change-Id: I45272cece3077e41d6737cceb619d03a240dd5b9
2019-10-17 20:22:43 -07:00
Inseob Kim
1a848ab39a Merge changes from topic "fix_treble_sysprop_neverallow" am: 8de0013551
am: 44090a3b54

Change-Id: I5e9af10ae17a0399f827cc6efe2b51a72d702ad0
2019-10-17 20:09:47 -07:00
Inseob Kim
44090a3b54 Merge changes from topic "fix_treble_sysprop_neverallow"
am: 8de0013551

Change-Id: Ie1c29edbdeca210697b9332beb52faade5431b5c
2019-10-17 20:03:20 -07:00
Treehugger Robot
8de0013551 Merge changes from topic "fix_treble_sysprop_neverallow"
* changes:
  Revert "Do not initialize BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW"
  Revert "Set BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW on sdk and full"
2019-10-18 02:39:48 +00:00
Lev Proleev
49cd5afa8e Merge "Add NeuralNetworks HAL v1.3"
am: 44eea14988

Change-Id: Ie55f3f0614131030dad4c444956ef0a76813568e
2019-10-17 15:59:50 -07:00
Treehugger Robot
44eea14988 Merge "Add NeuralNetworks HAL v1.3" 2019-10-17 22:47:15 +00:00
Tianjie Xu
e023b919c3 Merge "Stop creating update_engine_payload_key" am: 526b8563a5 am: 7a3304a0a4 am: 50fa4907cd
am: 7cb5ee1418

Change-Id: Id2a9dedfe1aaa608a19e64195f4cf3090d24e4f0
2019-10-17 14:28:06 -07:00
Tianjie Xu
50fa4907cd Merge "Stop creating update_engine_payload_key" am: 526b8563a5
am: 7a3304a0a4

Change-Id: Ia4e786f83c55b4a4c8517055f756b575bc36643e
2019-10-17 14:15:40 -07:00
Tianjie Xu
7a3304a0a4 Merge "Stop creating update_engine_payload_key"
am: 526b8563a5

Change-Id: I3417831ccd1e065f03062aad36388699ddf0136d
2019-10-17 14:09:39 -07:00
Tianjie Xu
526b8563a5 Merge "Stop creating update_engine_payload_key" 2019-10-17 20:59:51 +00:00
Josh Gao
157ef8c062 Merge "Move remount to PRODUCT_PACKAGES_DEBUG." am: 7228fcf19a am: 0ad32182a0 am: ee0756bade
am: 7ab3ca8d42

Change-Id: I83360e832b96908792e15f71a981708f995e2450
2019-10-17 13:45:56 -07:00
Mikhail Naganov
46d240e6e5 Merge "Add libaudiohal to mainline system image" am: b410d98c0a
am: 4c086e7be7

Change-Id: I888794e10011b9122c398dac62e17fb124a0d8ee
2019-10-17 13:45:47 -07:00
Mikhail Naganov
4c086e7be7 Merge "Add libaudiohal to mainline system image"
am: b410d98c0a

Change-Id: Ia274b609cd60db0c86c257e4967ef37cfa5d1c63
2019-10-17 13:39:48 -07:00
Treehugger Robot
b410d98c0a Merge "Add libaudiohal to mainline system image" 2019-10-17 20:23:21 +00:00
Josh Gao
ee0756bade Merge "Move remount to PRODUCT_PACKAGES_DEBUG." am: 7228fcf19a
am: 0ad32182a0

Change-Id: If0009041b752e5f22ba2148d61b1f5c9ebaf4de2
2019-10-17 13:23:18 -07:00
Josh Gao
0ad32182a0 Merge "Move remount to PRODUCT_PACKAGES_DEBUG."
am: 7228fcf19a

Change-Id: I40733d1cf74d6fdb19c3b5abea214cef8726b6ec
2019-10-17 13:15:00 -07:00
Mikhail Naganov
4fc7e410fc Add libaudiohal to mainline system image
32-bit libaudiohal is used by 3rd party modules on the system
partition which get loaded by client apps. In the long term,
this dependency has to be eliminated, see b/142811260.

Bug: 141989952
Bug: 142811260
Test: vendor/google/build/build_test.bash
Merged-In: I41241922c7e48c5d8bf95363944932569cb20c0a
Change-Id: I41241922c7e48c5d8bf95363944932569cb20c0a
2019-10-17 12:36:42 -07:00
Josh Gao
7228fcf19a Merge "Move remount to PRODUCT_PACKAGES_DEBUG." 2019-10-17 19:14:26 +00:00
Mikhail Naganov
5fa1da645d Merge changes from topic "audio-v6"
* changes:
  Add libaudiohal to mainline system image
  Introduce audio V6 HAL
2019-10-17 18:59:40 +00:00
Jordan Liu
9a9361c37b Merge "Add CellBroadcastServiceModule to mk" 2019-10-17 18:38:55 +00:00
Mikhail Naganov
69140f3eff Add libaudiohal to mainline system image
32-bit libaudiohal is used by 3rd party modules on the system
partition which get loaded by client apps. In the long term,
this dependency has to be eliminated, see b/142811260.

Bug: 141989952
Bug: 142811260
Test: vendor/google/build/build_test.bash
Change-Id: I41241922c7e48c5d8bf95363944932569cb20c0a
2019-10-17 08:39:15 -07:00
Jooyung Han
13783a7c61 Merge "Revert "install VNDK APEX instead of VNDK libs"" am: e925923af3 am: 7701ecb0a4 am: 67d3695964
am: a1c20ed5c8

Change-Id: Ifcaccd722ba9f8604cfea51ad44a23d01c3dbfbb
2019-10-17 05:36:58 -07:00
Jooyung Han
67d3695964 Merge "Revert "install VNDK APEX instead of VNDK libs"" am: e925923af3
am: 7701ecb0a4

Change-Id: Id245bbb71a1e3a9d0d8ed488992d57d14199ee59
2019-10-17 05:19:01 -07:00
Jooyung Han
7701ecb0a4 Merge "Revert "install VNDK APEX instead of VNDK libs""
am: e925923af3

Change-Id: I6033c86172e87b1fabfc1a86967f7995f640694f
2019-10-17 05:07:58 -07:00
Treehugger Robot
e925923af3 Merge "Revert "install VNDK APEX instead of VNDK libs"" 2019-10-17 11:50:47 +00:00
Inseob Kim
ba36f4c139 Revert "Set BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW on sdk and full"
This reverts commit 9856889381.

Reason for revert: The fix aosp/1145211 has been merged.

Change-Id: I70b37bbee69ac3df6a603e2641f52f6025fb9584
2019-10-17 10:30:35 +00:00
Kevin Rocard
74e377afba Introduce audio V6 HAL
Test: push V6 to device and check audio works fine
Bug: 134940862
Change-Id: I761d05708d99287b9fe255c55724f92c8a3388e7
Signed-off-by: Kevin Rocard <krocard@google.com>
2019-10-16 18:08:44 -07:00
Jooyung Han
376c613085 Revert "install VNDK APEX instead of VNDK libs"
This reverts commit 172c8e6de0.

Reason for revert: some targets are broken

Bug: 142773030
Change-Id: Ic35b19c7973946658365ecd7de4846f3175054b5
2019-10-16 23:45:38 +00:00
Tianjie Xu
2df23d7f41 Stop creating update_engine_payload_key
Now the update_engine is able to read public keysfrom otacerts directly.
So the update_engine_payload_key is no longer needed.

Also remove the key replace in sign_target_files_apks.py. So we should
not use the new script to sign the old target files.

Bug: 116660991
Test: build the system image, unit tests pass
Change-Id: I9dae1f8b397f2b5efafed66a8faac1cb9087c741
2019-10-16 18:27:22 +00:00
Lev Proleev
d67cdd3bd2 Add NeuralNetworks HAL v1.3
Bug: 139120468
Test: m check-vndk-list
Test: m
Change-Id: I2f5d1a66c12509440293c7b5916c337ff1bbe88c
Merged-In: I2f5d1a66c12509440293c7b5916c337ff1bbe88c
(cherry picked from commit fde53f4e3e)
2019-10-16 14:00:40 +01:00
Martin Brabham
47f46c8b1f Merge changes Ie9de9576,I14f7cd06 am: 14fcfb8a9a am: a42177adc4 am: b709c612db
am: c864066cf4

Change-Id: Ibb9224e531d0a1205e8df1f0b570e586d3319478
2019-10-15 15:35:17 -07:00
Martin Brabham
b709c612db Merge changes Ie9de9576,I14f7cd06 am: 14fcfb8a9a
am: a42177adc4

Change-Id: Ie3cb3a5f1d150d8c8305c51a43bc6f928c044ddb
2019-10-15 15:21:34 -07:00
Martin Brabham
a42177adc4 Merge changes Ie9de9576,I14f7cd06
am: 14fcfb8a9a

Change-Id: I9d8688f9681a5821d91c5e1b4105fc6a67cd5c40
2019-10-15 15:15:30 -07:00
Martin Brabham
14fcfb8a9a Merge changes Ie9de9576,I14f7cd06
* changes:
  Set BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW on sdk and full
  Do not initialize BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW
2019-10-15 21:50:42 +00:00
Jooyung Han
999b7194b3 Merge "install VNDK APEX instead of VNDK libs" am: 75d8a47039 am: 97684d7a89 am: 72d9b320bb
am: e7e7079657

Change-Id: I5e87d18796b13d6277cc5a16f094b7903ab9939d
2019-10-15 11:16:28 -07:00
Lev Proleev
12c2d85662 Merge "Add NeuralNetworks HAL v1.3" into qt-r1-dev-plus-aosp 2019-10-15 18:08:35 +00:00
Jooyung Han
72d9b320bb Merge "install VNDK APEX instead of VNDK libs" am: 75d8a47039
am: 97684d7a89

Change-Id: Iaf34f97a5b4299b470ff12e37b99db690a964928
2019-10-15 10:35:12 -07:00
Jooyung Han
97684d7a89 Merge "install VNDK APEX instead of VNDK libs"
am: 75d8a47039

Change-Id: Ic560981bf41a5da9f084f6c26d21041174b4b2e3
2019-10-15 02:43:30 -07:00
Jooyung Han
75d8a47039 Merge "install VNDK APEX instead of VNDK libs" 2019-10-15 09:21:19 +00:00
Inseob Kim
9856889381 Set BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW on sdk and full
This temporariliy turns off treble sysprop neverallow rules which
enforces marking the owner and accessibility to each system property.

Bug: 131162102
Bug: 142684203
Test: m sepolicy_tests
Change-Id: Ie9de9576fcf28c432543ab8f8971c1d048c55819
2019-10-15 17:32:10 +09:00
Jordan Liu
8c8e302de9 Add CellBroadcastServiceModule to mk
Bug: 135956699
Test: m -j30 (verify that build includes CellBroadcastServiceModule)
Change-Id: Ib2d734ba2ed3608a4255164e6e50dac349eb9a18
2019-10-14 12:22:08 -07:00
Jooyung Han
172c8e6de0 install VNDK APEX instead of VNDK libs
VNDK APEX replaces VNDK libs under /system/libs/vndk[-sp].

For current VNDK (vndk_package), com.android.vndk.current APEX is
installed instead of VNDK libraries.

For older versions of VNDK (vndk_snapshot_package),
com.android.vndk.v## APEXes are installed along with prebuilt VNDK libs.
The reason why phony targets of VNDK prebuilts are still installed is
that phony targets install the required *.libraries.##.txt files to
/system/etc.

After those .txt files are moved to APEXes, then we can remove those phony
targets.(b/141450808)

Bug: 141451661
Test: m && boot (tested with cuttlefish)

Change-Id: Ibfa06d42ec0081fa7010091ef097bb940bacf8d6
2019-10-13 04:18:05 +09:00
Steven Moreland
3b9d2dc689 Merge "mainline_system: libhwbinder/libhidltransport" am: 2ce54fa76a
am: a84540e557

Change-Id: I74d9e246243ff2c93ab60b92b61aee1ae6b6dd43
2019-10-11 13:56:23 -07:00
Steven Moreland
a84540e557 Merge "mainline_system: libhwbinder/libhidltransport"
am: 2ce54fa76a

Change-Id: Icf8f192120bbd9f8ee186a52f90f336700cd1704
2019-10-11 13:49:24 -07:00
Steven Moreland
2ce54fa76a Merge "mainline_system: libhwbinder/libhidltransport" 2019-10-11 20:19:13 +00:00
Roshan Pius
da2153126c base_system.mk: Switch back to InProcessWifiStack
Until we fix the RAM usage increase with the out of process version, use
the system_server version.

Bug: 140564146
Test: Device boots up and connects to wifi networks.
Change-Id: I8ebfba7e2ce8fcb7383ce05336dbc0ae7d7a2947
2019-10-11 11:32:04 -07:00
Lev Proleev
e4f453394b Add NeuralNetworks HAL v1.3
Bug: 139120468
Test: m check-vndk-list
Test: m
Change-Id: I2f5d1a66c12509440293c7b5916c337ff1bbe88c
Merged-In: I2f5d1a66c12509440293c7b5916c337ff1bbe88c
(cherry picked from commit fde53f4e3e)
2019-10-11 12:54:46 +01:00
Harpreet "Eli" Sangha
0838439f88 Merge "Add Vibrator HAL 1.4" am: 0ffe0c6248
am: 4a27b4e3fe

Change-Id: Ia79ced4513561f3324f6825e6dadd31ef5d16eca
2019-10-10 17:49:14 -07:00
Harpreet "Eli" Sangha
4a27b4e3fe Merge "Add Vibrator HAL 1.4"
am: 0ffe0c6248

Change-Id: Icc4968fb4f33b173484c5e3ecc028b65fcb0279f
2019-10-10 17:43:10 -07:00
Colin Cross
00caec196a Revert "Merge "Revert "Add NeuralNetworks HAL v1.3"" am: f5f487be03 am: 176c4afae7 am: a163c720ed"
This reverts commit 23405c1565.

Reason for revert: revert of a cherry-pick broke master

Change-Id: I2f5d1a66c12509440293c7b5916c337ff1bbe88c
2019-10-10 22:58:01 +00:00
Lev Proleev
23405c1565 Merge "Revert "Add NeuralNetworks HAL v1.3"" am: f5f487be03 am: 176c4afae7 am: a163c720ed
am: ddc799744d

Change-Id: Iada764ac0a62f8130dd70623bc13912ba9483e54
2019-10-10 14:54:24 -07:00
Josh Gao
5f96f5ce35 Move remount to PRODUCT_PACKAGES_DEBUG.
required seems to conflict with apex with the following error:

    build/make/core/main.mk:1338: warning: build/make/target/product/aosp_x86_64.mk produces files inside build/make/target/product/mainline_system.mks artifact path requirement.

Test: treehugger
Change-Id: Ifb1072b4585a94355909b33e3b8129455c35714a
2019-10-10 13:12:13 -07:00
Steven Moreland
bf4fd54cee mainline_system: libhwbinder/libhidltransport
Bug: 135686713
Test: artifact whitelist requirement no longer complaining
Change-Id: Ia142f8e67c31f66f86386b65e009d4faee502c11
Merged-In: Ia142f8e67c31f66f86386b65e009d4faee502c11
2019-10-10 19:51:46 +00:00
Lev Proleev
a163c720ed Merge "Revert "Add NeuralNetworks HAL v1.3"" am: f5f487be03
am: 176c4afae7

Change-Id: Ia864ea8826543b42990f3af4f7b2915c1363b36f
2019-10-10 07:26:49 -07:00
Lev Proleev
176c4afae7 Merge "Revert "Add NeuralNetworks HAL v1.3""
am: f5f487be03

Change-Id: Iaa860c79d101168b73c8ee867c3259758fbffc6d
2019-10-10 07:20:00 -07:00
Lev Proleev
f5f487be03 Merge "Revert "Add NeuralNetworks HAL v1.3"" 2019-10-10 14:06:42 +00:00
Lev Proleev
f1cec4b4a4 Revert "Add NeuralNetworks HAL v1.3"
This reverts commit bace8c091c.

Reason for revert: the topic breaks git_qt-dev-plus-aosp

Change-Id: Idf87926dd40b56b9d6acc2e207be785463f6830a
2019-10-10 13:54:21 +00:00
Lev Proleev
165a75575f Merge "Add NeuralNetworks HAL v1.3" am: 4b49e75a40
am: 5195c4cf99

Change-Id: I24075ca160667b2edfdd0465fbae25857f35235a
2019-10-10 05:20:52 -07:00
Lev Proleev
5195c4cf99 Merge "Add NeuralNetworks HAL v1.3"
am: 4b49e75a40

Change-Id: I62a994d9f8eec83e42623836b9eed269b889f2a3
2019-10-10 05:07:25 -07:00
Lev Proleev
4b49e75a40 Merge "Add NeuralNetworks HAL v1.3" 2019-10-10 10:25:21 +00:00
Steven Moreland
1d2c1bf212 Merge "mainline_system: libhwbinder/libhidltransport" 2019-10-09 17:25:43 +00:00
Steven Moreland
3dbd647da5 mainline_system: libhwbinder/libhidltransport
Bug: 135686713
Test: artifact whitelist requirement no longer complaining
Change-Id: Ia142f8e67c31f66f86386b65e009d4faee502c11
2019-10-09 12:28:24 +00:00
Yo Chiang
b808592783 VNDK library list uses installed name
For example, module libprotobuf-cpp-lite has installed library name
libprotobuf-cpp-lite-3.9.1.so.
VNDK library list should use this installed name instead of module name.

Bug: 141019581
Test: m $ANDROID_PRODUCT_OUT/obj/PACKAGING/vndk_intermediates/libs.txt
Change-Id: I7f19fedafdd2809e0b8738bbab6ad513ddb30ea0
2019-10-09 18:12:49 +08:00
Harpreet "Eli" Sangha
a0e253ef0e Add Vibrator HAL 1.4
Test: Build
Change-Id: I8de47f2914cd89a0521c520504ff0dc8000205df
Signed-off-by: Harpreet \"Eli\" Sangha <eliptus@google.com>
2019-10-09 13:49:17 +09:00
David Anderson
c24146981a Merge "Add IBootControl HAL 1.1." am: a8b633d181
am: 0c61e14227

Change-Id: I62d2a316ce3586e856c0b42ac9534596436643f3
2019-10-08 12:35:17 -07:00
David Anderson
0c61e14227 Merge "Add IBootControl HAL 1.1."
am: a8b633d181

Change-Id: Ia78800744ef04a877b062631cc3444f29d9a35bd
2019-10-08 12:28:49 -07:00
David Anderson
a8b633d181 Merge "Add IBootControl HAL 1.1." 2019-10-08 19:03:05 +00:00
Lev Proleev
bace8c091c Add NeuralNetworks HAL v1.3
Bug: 139120468
Test: m check-vndk-list
Test: m
Change-Id: Id1baae2c00a38e5327ab144db76189f53bcb04cf
Merged-In: Id1baae2c00a38e5327ab144db76189f53bcb04cf
(cherry picked from commit fde53f4e3e)
2019-10-08 16:57:59 +01:00
David Anderson
b9e8d8cac8 Add IBootControl HAL 1.1.
Bug: 138861550
Test: m check-vndk-list
Test: m
Change-Id: If09d031e5acf1178fce942526782a41426c5180b
Merged-In: If09d031e5acf1178fce942526782a41426c5180b
2019-10-07 17:13:11 -07:00
Yifan Hong
5154d3f4d7 VNDK-core += health@2.1
Test: builds
Bug: 137670450

Change-Id: Idbbe5c8a4d5060061514d428de0a38a233ffd8b8
2019-10-07 16:54:04 -07:00
David Anderson
fe1523d068 Add IBootControl HAL 1.1.
Bug: 138861550
Test: m check-vndk-list
Test: m
Change-Id: If09d031e5acf1178fce942526782a41426c5180b
2019-10-07 13:53:57 -07:00
Nikita Ioffe
1c8a111a0b Merge "Unconditionally install shim apex on system partition" am: 42b2b54c2b am: e542a799c8 am: 1faa3ffe94
am: 50196498d6

Change-Id: If3663f1d5e0523eff3255c8a3a06fb21ea454b5a
2019-10-07 09:14:51 -07:00
Nikita Ioffe
1faa3ffe94 Merge "Unconditionally install shim apex on system partition" am: 42b2b54c2b
am: e542a799c8

Change-Id: I112f4eb54236c7bb636b1ea5243c892deb0b7243
2019-10-07 08:42:10 -07:00
Nikita Ioffe
e542a799c8 Merge "Unconditionally install shim apex on system partition"
am: 42b2b54c2b

Change-Id: I303417bee4f5143abfda29eadfb997203c0cb168
2019-10-07 08:36:15 -07:00
Nikita Ioffe
42b2b54c2b Merge "Unconditionally install shim apex on system partition" 2019-10-07 15:10:10 +00:00