Automerger Merge Worker
d747661d5f
Merge "Allow java_system_modules_import to replace java_system_modules" am: 1876a76216
am: b51bc93c26
am: 6a0ba5b023
...
Change-Id: I3e9f9c066750a032b96a573b27e44dec7aa64ef2
2020-02-19 23:00:56 +00:00
Automerger Merge Worker
3e7d321b56
Merge "Allow vts config to be packaged in other test suites" am: 24f3c99af8
am: b8acf86cda
am: 97c0686199
...
Change-Id: I240c0b0b5744ee859bba5393620b56de5b69435a
2020-02-19 22:45:03 +00:00
Automerger Merge Worker
6a0ba5b023
Merge "Allow java_system_modules_import to replace java_system_modules" am: 1876a76216
am: b51bc93c26
...
Change-Id: I33de58799d75671c9a000598a31a72eb7bc6db66
2020-02-19 22:38:07 +00:00
Automerger Merge Worker
97c0686199
Merge "Allow vts config to be packaged in other test suites" am: 24f3c99af8
am: b8acf86cda
...
Change-Id: Idf504399548dd83a1040d2a40a77889ed17d7f83
2020-02-19 22:29:52 +00:00
Automerger Merge Worker
b51bc93c26
Merge "Allow java_system_modules_import to replace java_system_modules" am: 1876a76216
...
Change-Id: I6e092eb8999fbe68d98c3330e96967a3de12e590
2020-02-19 22:22:50 +00:00
Automerger Merge Worker
b8acf86cda
Merge "Allow vts config to be packaged in other test suites" am: 24f3c99af8
...
Change-Id: Id9a1b3b875ddcacc465d854cce08980c05780abe
2020-02-19 22:21:58 +00:00
Treehugger Robot
1876a76216
Merge "Allow java_system_modules_import to replace java_system_modules"
2020-02-19 21:08:57 +00:00
Dan Shi
24f3c99af8
Merge "Allow vts config to be packaged in other test suites"
2020-02-19 21:05:55 +00:00
Paul Duffin
83a2d967de
Allow java_system_modules_import to replace java_system_modules
...
Previously, there were some places where a java_system_module_import
could not be used in place of a java_system_module. That was because
the code assumed a *SystemModules type not a *systemModulesImport type.
This change introduces a SystemModulesProvider interface that is used
instead and is implemented on both types.
Bug: 142940300
Test: m nothing
ran new tests before changes to make sure they detected the issue
and after to make sure the changes fixed the issue.
Change-Id: I7b16ac5708880bdf61e6f5b1e6616c986f0ed763
2020-02-19 14:24:15 +00:00
Automerger Merge Worker
2a93a35752
Merge "Revert "Another round of no-vendor-variant VNDK whitelist cleanup"" am: ae83ce656d
am: ab231ee744
am: 2d0fe41f83
...
Change-Id: I9b46a3708408aef10313bf23615052997428c874
2020-02-19 12:21:20 +00:00
Automerger Merge Worker
2d0fe41f83
Merge "Revert "Another round of no-vendor-variant VNDK whitelist cleanup"" am: ae83ce656d
am: ab231ee744
...
Change-Id: I9f72ae78b8341b1b20250c0f8090513db6e77e7a
2020-02-19 12:08:06 +00:00
Automerger Merge Worker
ab231ee744
Merge "Revert "Another round of no-vendor-variant VNDK whitelist cleanup"" am: ae83ce656d
...
Change-Id: Icd37145b42d562a22c2eaf8dcda8c8603aacee34
2020-02-19 11:50:25 +00:00
Automerger Merge Worker
5a993174dc
Merge "Add support for cc_binary in module_exports" am: 23be2bf941
am: 3114b0fc94
am: ae41b77938
...
Change-Id: I4a3aaff388fe15da9b804981fa0c2bd75899c3b6
2020-02-19 11:41:47 +00:00
Treehugger Robot
ae83ce656d
Merge "Revert "Another round of no-vendor-variant VNDK whitelist cleanup""
2020-02-19 11:33:48 +00:00
Automerger Merge Worker
ae41b77938
Merge "Add support for cc_binary in module_exports" am: 23be2bf941
am: 3114b0fc94
...
Change-Id: Ia30a6aacbe6d3d9a6dd7ca115905166f66d98320
2020-02-19 11:28:59 +00:00
Automerger Merge Worker
3114b0fc94
Merge "Add support for cc_binary in module_exports" am: 23be2bf941
...
Change-Id: I0560729fe3370ed011cd8bddaba7527babd9d33a
2020-02-19 11:14:04 +00:00
Treehugger Robot
23be2bf941
Merge "Add support for cc_binary in module_exports"
2020-02-19 10:56:38 +00:00
Automerger Merge Worker
6d2ff7f539
Merge "Add system server jars expressed in make in the system server classpath." am: cbeaab2974
am: dfb9525065
am: 77aafce45a
...
Change-Id: I2e3a61e1da81613886feab8f3ddaa078dce8addf
2020-02-19 08:18:44 +00:00
Automerger Merge Worker
77aafce45a
Merge "Add system server jars expressed in make in the system server classpath." am: cbeaab2974
am: dfb9525065
...
Change-Id: If051c37e9ff734907307ee2a365bef4a17f8cec8
2020-02-19 08:07:53 +00:00
Automerger Merge Worker
dfb9525065
Merge "Add system server jars expressed in make in the system server classpath." am: cbeaab2974
...
Change-Id: I179a61f8f66393022c9302a6dd30676273555f99
2020-02-19 07:50:23 +00:00
Nicolas Geoffray
cbeaab2974
Merge "Add system server jars expressed in make in the system server classpath."
2020-02-19 07:40:19 +00:00
Albal Tai
7667b62920
Revert "Another round of no-vendor-variant VNDK whitelist cleanup"
...
This reverts commit 77def87329
.
Reason for revert: <cop revert, broken build 6217456 on git_master on cf_x86_phone-userdebug_coverage>
Change-Id: Iaf64cfe8fdfe62d397719f7ca5cc7679e5858d91
2020-02-19 06:17:51 +00:00
Automerger Merge Worker
2b350f8f47
[automerger skipped] Merge "Enable tautological-bitwise-compare warning" am: 252d7449ca
am: 38fda9cf88
am: a56edc6e4c
-s ours
...
am skip reason: Change-Id I9d1ba8ef50630e40d59e402c37ad1366a8e25ea6 with SHA-1 45709ee8f1
is in history
Change-Id: I2b24e6c57cfe9f39b0c5cdf8944050b2a59b86cd
2020-02-19 05:47:23 +00:00
Automerger Merge Worker
a56edc6e4c
Merge "Enable tautological-bitwise-compare warning" am: 252d7449ca
am: 38fda9cf88
...
Change-Id: I09609767f0c17072306fb1f35fdf47023e2eef81
2020-02-19 05:30:17 +00:00
Automerger Merge Worker
38fda9cf88
Merge "Enable tautological-bitwise-compare warning" am: 252d7449ca
...
Change-Id: I941286e4d4162af8304dd51351e7bf335db0f35e
2020-02-19 05:09:01 +00:00
Chih-hung Hsieh
252d7449ca
Merge "Enable tautological-bitwise-compare warning"
2020-02-19 04:50:11 +00:00
Automerger Merge Worker
aaeb2930b6
Merge "Do not add ccWrapper to ccNoDeps rule" am: 8a2d1b4d86
am: d90c0b9136
am: 0090db54d6
...
Change-Id: Ib887df74bf1cd7e6b917029002333bec6631bffb
2020-02-19 03:24:15 +00:00
Automerger Merge Worker
0090db54d6
Merge "Do not add ccWrapper to ccNoDeps rule" am: 8a2d1b4d86
am: d90c0b9136
...
Change-Id: I3a89df879967f6cd72f449279856cc32e9c69b0d
2020-02-19 03:09:16 +00:00
Automerger Merge Worker
d90c0b9136
Merge "Do not add ccWrapper to ccNoDeps rule" am: 8a2d1b4d86
...
Change-Id: I1b2cc7644c84ceb7d018c3250684cb6f1f08f6eb
2020-02-19 02:52:51 +00:00
Treehugger Robot
8a2d1b4d86
Merge "Do not add ccWrapper to ccNoDeps rule"
2020-02-19 02:34:33 +00:00
Automerger Merge Worker
af7dd22e6f
Merge "Another round of no-vendor-variant VNDK whitelist cleanup" am: e6c44dc8be
am: 0ac6055a39
am: 80cb25a798
...
Change-Id: I3152d7bbd2cbe245ff54cacad46e1ce15232c351
2020-02-19 00:31:47 +00:00
Automerger Merge Worker
80cb25a798
Merge "Another round of no-vendor-variant VNDK whitelist cleanup" am: e6c44dc8be
am: 0ac6055a39
...
Change-Id: I043384537c8fcacd70ba59c0a3559a21949e6ed4
2020-02-19 00:05:57 +00:00
Automerger Merge Worker
f656517c6e
Merge "Allow for setting a logging_parent for an Android App." am: 2f94e85f14
am: 2fd8cbe67b
am: 0e84cf3a1f
...
Change-Id: I6dc2c0caee088037c2adc96d000225712141d4a7
2020-02-19 00:04:48 +00:00
Automerger Merge Worker
0ac6055a39
Merge "Another round of no-vendor-variant VNDK whitelist cleanup" am: e6c44dc8be
...
Change-Id: Ia70ace39ced78529ef21bf91ec4cd823740f7fd5
2020-02-18 23:53:45 +00:00
Automerger Merge Worker
0e84cf3a1f
Merge "Allow for setting a logging_parent for an Android App." am: 2f94e85f14
am: 2fd8cbe67b
...
Change-Id: I1683c6ba457e4f76ccf3305b1267d6b496399ae4
2020-02-18 23:39:33 +00:00
Vic Yang
e6c44dc8be
Merge "Another round of no-vendor-variant VNDK whitelist cleanup"
2020-02-18 23:29:08 +00:00
Chih-Hung Hsieh
15631dce8a
Enable tautological-bitwise-compare warning
...
Bug: 148831363
Test: make
Change-Id: I31285fec578a87e0d35c177cd599dcd6a66cf934
Merged-In: I9d1ba8ef50630e40d59e402c37ad1366a8e25ea6
2020-02-18 15:14:03 -08:00
Automerger Merge Worker
2fd8cbe67b
Merge "Allow for setting a logging_parent for an Android App." am: 2f94e85f14
...
Change-Id: I9ea9337569380dbf9bce1508f1d42e7a563afc1e
2020-02-18 23:08:29 +00:00
Chih-hung Hsieh
d7af130c2e
Merge "Enable tautological-bitwise-compare warning"
2020-02-18 22:58:23 +00:00
Treehugger Robot
2f94e85f14
Merge "Allow for setting a logging_parent for an Android App."
2020-02-18 22:57:31 +00:00
Automerger Merge Worker
0980f9a3ed
Merge "Switch from clang-r377782 to clang-r377782b" am: 207b18ca35
am: 8fe9f07eef
am: c00ad77dd8
...
Change-Id: Ib8082e47221d53e3084483f7c3c15d35f30a19c9
2020-02-18 22:37:19 +00:00
Automerger Merge Worker
c00ad77dd8
Merge "Switch from clang-r377782 to clang-r377782b" am: 207b18ca35
am: 8fe9f07eef
...
Change-Id: Idf0d4034c1d1c86671cd67718b0275a8ef8a38a6
2020-02-18 22:24:06 +00:00
Automerger Merge Worker
8fe9f07eef
Merge "Switch from clang-r377782 to clang-r377782b" am: 207b18ca35
...
Change-Id: Id23bcebfc2d5892a5622143294c9bf909e3defcc
2020-02-18 22:11:51 +00:00
Chih-hung Hsieh
207b18ca35
Merge "Switch from clang-r377782 to clang-r377782b"
2020-02-18 21:59:06 +00:00
Automerger Merge Worker
e81fff6889
Merge "Statically link the unwinder into binaries packaged into an unbundled APEX with legacy_android10_support: true." am: d8b80bc683
am: 4b20d12832
am: 7fe957e171
...
Change-Id: Ic27432ee08f3acd6052ceeacb56249077a5edf65
2020-02-18 21:48:42 +00:00
Automerger Merge Worker
7fe957e171
Merge "Statically link the unwinder into binaries packaged into an unbundled APEX with legacy_android10_support: true." am: d8b80bc683
am: 4b20d12832
...
Change-Id: I1148976f41eab035cc6f8705eb731259d1955010
2020-02-18 21:23:03 +00:00
Automerger Merge Worker
c09d834be8
Merge "Enable bool-operation warning" am: ab392f613e
am: ca4375f54b
am: 3f0bd0b32a
...
Change-Id: Ic2a5fe1809658a52856eeb627b8ce145df9c3611
2020-02-18 21:13:50 +00:00
Peter Collingbourne
4b20d12832
Merge "Statically link the unwinder into binaries packaged into an unbundled APEX with legacy_android10_support: true." am: d8b80bc683
...
Change-Id: Ie0cfa3841ce93ee166bab27befbde1505beca583
2020-02-18 21:09:00 +00:00
Chih-hung Hsieh
3f0bd0b32a
Merge "Enable bool-operation warning" am: ab392f613e
am: ca4375f54b
...
Change-Id: Ida4cc7c97644987b6532ff929f028e061d45dbb8
2020-02-18 21:01:27 +00:00
Chih-hung Hsieh
ca4375f54b
Merge "Enable bool-operation warning" am: ab392f613e
...
Change-Id: Ie0226f7313c89878f14f92455d6e01edbdc5e7bb
2020-02-18 20:47:56 +00:00