Commit graph

5569 commits

Author SHA1 Message Date
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
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
Treehugger Robot
ec77036a4e Merge "Introduce audio V6 HAL" 2019-11-08 17:31:42 +00:00
Martin Stjernholm
c91616fabd Merge "Revert submission of topic 'libdl_android-in-apex'" 2019-11-08 11:51:39 +00: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
Treehugger Robot
4c98469598 Merge "Remove the cert for GooglePermissionController" 2019-11-07 19:59:03 +00:00
Henry Fang
7df5b71c74 Merge "update build file to include cas@1.2" 2019-11-07 19:33:33 +00: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
Martin Stjernholm
65e4ce6ebc Merge "Add libdl_android as a bootstrap library." 2019-11-07 11:01:36 +00: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
2bbfa528b3 Merge "Add CellBroadcastServiceModule to mk" 2019-11-06 00:41:51 +00: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
Treehugger Robot
27fe9add1d Merge "Bump PRODUCT_SHIPPING_API_LEVEL to 29 for CSI" 2019-11-04 04:48:12 +00:00
Jooyung Han
41055047da Merge "Use MakeVar from soong instead of hardcoding" 2019-11-01 01:57:50 +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
Ashwini Oruganti
6aaafc4ad4 Merge "Add keys for GooglePermissionController" 2019-10-31 16:38:56 +00: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
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
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
3c9230183d Merge "emulator: remove vintf and some whitelists" 2019-10-30 13:20:19 +00: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
c76498a53d Merge "Adding IRadio1.5 definition." 2019-10-29 22:22:38 +00: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
5ec356acff Merge "Revert "Remove Core Library JARs from /system/framework."" 2019-10-28 17:48:23 +00:00
Greg Kaiser
35815917ba Merge "Revert "Revert "Revert "install VNDK APEX instead of VNDK libs"""" 2019-10-28 17:12:33 +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
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
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
Xin Li
f699737282 Merge "Merge Coral/Flame into AOSP master" 2019-10-27 04:44:29 +00: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
df518833b4 Merge "Revert "Revert "install VNDK APEX instead of VNDK libs""" 2019-10-25 08:21:13 +00: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
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
30427892d7 Merge "Revert "VNDK library list uses installed name""
am: 82e8d28d03

Change-Id: I67478e03cd823106788f4ba1050cc42794edded2
2019-10-23 15:20:43 -07:00