Commit Graph

5549 Commits

Author SHA1 Message Date
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 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
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 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 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 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
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 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 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
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 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