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
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
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
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