Commit graph

4430 commits

Author SHA1 Message Date
Henry Fang
55cc5d6736 Merge "update build file to include cas@1.2" 2019-10-28 17:12:27 +00:00
TreeHugger Robot
f066c0e491 Merge "emulator: remove vintf and some whitelists" 2019-10-28 12:21:28 +00:00
TreeHugger Robot
3be97bcd7b Merge "Replace framework.jar with framework-minus-apex.jar" 2019-10-28 05:56:11 +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
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
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
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