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
Jooyung Han
f889ac5e21
Merge "Revert "Revert "Revert "Revert "install VNDK APEX instead of VNDK libs"""""
...
am: 85808a8089
Change-Id: I0730811a86a9636b4259c19c05730d11a8ddf517
2019-10-29 21:37:34 -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
08b87efcf8
[automerger skipped] Merge "Adding IRadio1.5 definition." am: c76498a53d
am: 3efc1852f8
...
am: bd670e4d6f
-s ours
am skip reason: change_id I46ab1f095c661d6241ccb8afe907b9d0e78a2786 with SHA1 d461b7102b
is in history
Change-Id: Ibe0a09b74a5d7a3beddca49db746083e4517be9c
2019-10-29 16:08:17 -07: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
3efc1852f8
Merge "Adding IRadio1.5 definition."
...
am: c76498a53d
Change-Id: Ic5e57fecd2faeb970074c88ee4d3e499963a49de
2019-10-29 15:48:23 -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
6972e648be
Merge "Add zygote init script to mainline_system.mk" am: e8d9df122a
am: 7b33d3bcc0
...
am: 5f4ae378ef
Change-Id: Id0eaeb18b16d5f479396770c8784952cb89abe6f
2019-10-28 23:59:19 -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
Justin Yun
7b33d3bcc0
Merge "Add zygote init script to mainline_system.mk"
...
am: e8d9df122a
Change-Id: I1592d2c2d93d68bed578de2be7ac5fab3a74af2b
2019-10-28 23:47:24 -07:00
Treehugger Robot
e8d9df122a
Merge "Add zygote init script to mainline_system.mk"
2019-10-29 06:32:44 +00:00
Jooyung Han
5c2e9f921f
Merge "CleanSpec for symlinks to VNKD APEX" am: 016f3027ed
am: 6f6811bc7c
am: 0acaa1ce23
...
am: 7d4d58b95a
Change-Id: I6902a71a108859034780b790e0fc7ce4312d4164
2019-10-28 22:59:08 -07:00
Jooyung Han
7d4d58b95a
Merge "CleanSpec for symlinks to VNKD APEX" am: 016f3027ed
am: 6f6811bc7c
...
am: 0acaa1ce23
Change-Id: Ib8878ddb8c65ff089b3cac36481d6173a015a386
2019-10-28 22:52:15 -07:00
Jooyung Han
0acaa1ce23
Merge "CleanSpec for symlinks to VNKD APEX" am: 016f3027ed
...
am: 6f6811bc7c
Change-Id: I62c57a32ec41c809b6b5a5e064f28aa6157f2233
2019-10-28 22:45:11 -07:00
Jooyung Han
6f6811bc7c
Merge "CleanSpec for symlinks to VNKD APEX"
...
am: 016f3027ed
Change-Id: Ib1e2a11278cbb6dc5e6f017e58e7d9db4f2ab92f
2019-10-28 22:38:09 -07:00
Treehugger Robot
016f3027ed
Merge "CleanSpec for symlinks to VNKD APEX"
2019-10-29 05:17:37 +00:00
Alistair Delva
a4dce39c6e
Merge "Build rules use private vars" am: 15b5ad2d05
am: 4e6e02ac7b
am: c329243515
...
am: 105510369c
Change-Id: Ibe50e54a0388c6e0504d282423a5eec3e3806efd
2019-10-28 21:35:34 -07:00
Alistair Delva
105510369c
Merge "Build rules use private vars" am: 15b5ad2d05
am: 4e6e02ac7b
...
am: c329243515
Change-Id: I3e702b9adb0dd18dd256682518a4a5debbcaa9aa
2019-10-28 21:28:30 -07:00
Alistair Delva
c329243515
Merge "Build rules use private vars" am: 15b5ad2d05
...
am: 4e6e02ac7b
Change-Id: I9f6ae636be2981fa50bf8d394d664832307f36d8
2019-10-28 21:21:26 -07:00
Alistair Delva
4e6e02ac7b
Merge "Build rules use private vars"
...
am: 15b5ad2d05
Change-Id: I0ad9cefbfb0d975c6dae9c5a5fbbe1dcbc014785
2019-10-28 21:14:25 -07:00
Alistair Delva
15b5ad2d05
Merge "Build rules use private vars"
2019-10-29 02:21:01 +00:00
Jooyung Han
60c493f9c7
CleanSpec for symlinks to VNKD APEX
...
VNDK APEX was reverted.
Bug: 143374795
Test: m
Change-Id: I09fb28b72765dbe5a781001d8ddf53644fc45154
2019-10-29 11:19:06 +09:00
Yifan Hong
cad4596c2f
Merge "Include system_other.img in super.img by default" am: 0fdd73b18f
am: dd8414a5ae
am: 8899c7ce3a
...
am: 5946473c36
Change-Id: I072ac32232f8e4f72e1f288d9e7888900c4f6893
2019-10-28 18:35:27 -07:00
Yifan Hong
5946473c36
Merge "Include system_other.img in super.img by default" am: 0fdd73b18f
am: dd8414a5ae
...
am: 8899c7ce3a
Change-Id: Idde143bae80b63aa6e48a75b3254e711768c63a0
2019-10-28 18:29:25 -07:00
Yifan Hong
8899c7ce3a
Merge "Include system_other.img in super.img by default" am: 0fdd73b18f
...
am: dd8414a5ae
Change-Id: Ie202169775e3bcc96846c3e7ee0173bbb2076f91
2019-10-28 18:23:22 -07:00
Yifan Hong
dd8414a5ae
Merge "Include system_other.img in super.img by default"
...
am: 0fdd73b18f
Change-Id: I72a10d0a9eac2375f4e9e2fc4b5bac0f629662ff
2019-10-28 18:16:49 -07:00
Yifan Hong
0fdd73b18f
Merge "Include system_other.img in super.img by default"
2019-10-29 00:56:21 +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
Ryan Prichard
be0c47941e
Merge "Stop linking libdl.a into static bins" am: fe43a3f2cb
am: e22800852f
am: 0ba1b3f2e8
...
am: dcef27c2ad
Change-Id: I80dec88b7171cdc295dce7975d68a6bb214e35c0
2019-10-28 14:03:27 -07:00
Ryan Prichard
dcef27c2ad
Merge "Stop linking libdl.a into static bins" am: fe43a3f2cb
am: e22800852f
...
am: 0ba1b3f2e8
Change-Id: If381b398740c9aef72072056913b23c348fd6fdd
2019-10-28 13:57:32 -07:00
Ryan Prichard
0ba1b3f2e8
Merge "Stop linking libdl.a into static bins" am: fe43a3f2cb
...
am: e22800852f
Change-Id: I13d4ffc9677d1befc80a1388eeb40d0876e5c6a3
2019-10-28 13:47:13 -07:00
Ryan Prichard
e22800852f
Merge "Stop linking libdl.a into static bins"
...
am: fe43a3f2cb
Change-Id: I9209b793f37ac2a16294a50d2d83a0aa72134d28
2019-10-28 13:35:54 -07:00
Ryan Prichard
fe43a3f2cb
Merge "Stop linking libdl.a into static bins"
2019-10-28 20:14:37 +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
0c486ca724
Merge "Revert "Remove Core Library JARs from /system/framework
."" am: 5ec356acff
am: 8e3afe7ca4
...
am: c895f20422
Change-Id: Iaeefdb61df3e33e56030a0a9e45068630e337fe7
2019-10-28 11:14:38 -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
8e3afe7ca4
Merge "Revert "Remove Core Library JARs from /system/framework
.""
...
am: 5ec356acff
Change-Id: Ia05ace1c23ac8bea2453658948db1e454e323c7a
2019-10-28 10:56:18 -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
216bfed342
Merge "Revert "Revert "Revert "install VNDK APEX instead of VNDK libs"""" am: 35815917ba
am: c443c0b348
...
am: dbaee05a78
Change-Id: I7afff7d4326382091f4e46346052edd7f193818e
2019-10-28 10:32:02 -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
c443c0b348
Merge "Revert "Revert "Revert "install VNDK APEX instead of VNDK libs""""
...
am: 35815917ba
Change-Id: I1a843901f0c97d89f37b90a503c908ee6fe51634
2019-10-28 10:20:01 -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
Jiyong Park
565004663d
[automerger skipped] Merge "Replace framework.jar with framework-minus-apex.jar" am: 21403dc2df
am: 252f3bfbfb
am: 01fcd076fd
...
am: 8eb3787d71
-s ours
am skip reason: change_id I281f841c164a4813ed4c436fb84680f5ade1ee1d with SHA1 219d4ac2b2
is in history
Change-Id: I371ded7e0b3e52189b4ff8ec130d19aa58204971
2019-10-28 05:32:02 -07:00
Jiyong Park
8eb3787d71
Merge "Replace framework.jar with framework-minus-apex.jar" am: 21403dc2df
am: 252f3bfbfb
...
am: 01fcd076fd
Change-Id: Id8a99e59e44b47ba2ee6522452d6e3a5295e07a7
2019-10-28 05:25:49 -07:00
Pete Gillin
c993f9cf89
Merge "Remove support for EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9." am: a466a58bbb
am: 94870cc287
am: d2856b841a
...
am: dbad8e5a2f
Change-Id: I9f602d2fd968372883776008cc1f28998fcb0104
2019-10-28 05:24:59 -07:00