Yifan Hong
9de8d673d5
Merge "dynamic partition update order is deterministic." am: 47b53c4136
am: 983dd182c7
...
am: 52fb92e735
Change-Id: Ia4b31a6394c0a4f49bfcbfc1f4c19f4fc2838a1c
2019-01-28 23:05:00 -08:00
Yifan Hong
52fb92e735
Merge "dynamic partition update order is deterministic." am: 47b53c4136
...
am: 983dd182c7
Change-Id: I6c145d56d8b31da607361d2f7f9808cecbd36d7d
2019-01-28 22:18:33 -08:00
Yifan Hong
983dd182c7
Merge "dynamic partition update order is deterministic."
...
am: 47b53c4136
Change-Id: I4e2c00bc8cfd158e8da454d5bae879c29404cb3f
2019-01-28 20:52:08 -08:00
Yifan Hong
1d9f2bbaaa
Merge "Add product_compatibitility_matrix.xml to base_product." am: bf21932408
am: ba52952af3
...
am: 0316dd616a
Change-Id: I46beb08c1702eb56ab3202cbc1d69b73e3773cf5
2019-01-28 20:50:50 -08:00
Yifan Hong
0316dd616a
Merge "Add product_compatibitility_matrix.xml to base_product." am: bf21932408
...
am: ba52952af3
Change-Id: Ifcfd78916a206ef464ce43b3965f1228f711d708
2019-01-28 20:36:31 -08:00
Yifan Hong
ba52952af3
Merge "Add product_compatibitility_matrix.xml to base_product."
...
am: bf21932408
Change-Id: Iec4393644b1221a4c5d5c34f66e836a35f86dbab
2019-01-28 19:36:12 -08:00
TreeHugger Robot
9e882dd360
Merge "Add android.hardware.input.common HAL"
2019-01-29 01:19:11 +00:00
Yifan Hong
47b53c4136
Merge "dynamic partition update order is deterministic."
2019-01-28 18:44:59 +00:00
Yifan Hong
bf21932408
Merge "Add product_compatibitility_matrix.xml to base_product."
2019-01-28 18:08:44 +00:00
Anton Hansson
90bd77071e
Merge "Move mainline_arm64 over to use mainline device" am: ad9ee4b504
am: 2b219b051f
...
am: bd57a28943
Change-Id: I415e70e6e42eb0ccf11fdca8a8205965f1795af5
2019-01-28 03:07:58 -08:00
Anton Hansson
ee25fc7a63
Merge "Add recovery_refresh to mainline_system" am: 8fbdd25457
am: 628e7ff762
...
am: b5ca00950b
Change-Id: I3555941bb1840ed400ccfb786695239da14f5d87
2019-01-28 03:07:00 -08:00
Anton Hansson
bd57a28943
Merge "Move mainline_arm64 over to use mainline device" am: ad9ee4b504
...
am: 2b219b051f
Change-Id: Idf769e5d1965a445704bdb88ded8012b09995aef
2019-01-28 03:02:40 -08:00
Anton Hansson
b5ca00950b
Merge "Add recovery_refresh to mainline_system" am: 8fbdd25457
...
am: 628e7ff762
Change-Id: If09775db0f2371cc631d1d0b1a825a41395bbc86
2019-01-28 03:01:52 -08:00
Anton Hansson
2b219b051f
Merge "Move mainline_arm64 over to use mainline device"
...
am: ad9ee4b504
Change-Id: If66d50f5eb603099877abe94951a8d54da976275
2019-01-28 02:57:19 -08:00
Anton Hansson
628e7ff762
Merge "Add recovery_refresh to mainline_system"
...
am: 8fbdd25457
Change-Id: I3cd215b54a4673a325ba88080e0dc0a5d3778b0f
2019-01-28 02:56:40 -08:00
Anton Hansson
ad9ee4b504
Merge "Move mainline_arm64 over to use mainline device"
2019-01-28 10:49:32 +00:00
Anton Hansson
8fbdd25457
Merge "Add recovery_refresh to mainline_system"
2019-01-28 10:49:16 +00:00
Anton Hansson
a8b60940c5
Merge "Auto-include device_manifest.xml when necessary" am: 096b88bf90
am: 1cff5df789
...
am: 7c1890f536
Change-Id: I436dc97b1a1b9531017963e98d5b8ccd7cc01b6a
2019-01-28 02:00:22 -08:00
Nicolas Geoffray
5f3ef9dbcc
Merge "Move remaining libcore JNI libraries to APEX." am: 93626d9616
am: 8b227ab6d9
...
am: 07c2c7c837
Change-Id: I9adba89837ed8c91626dc38a70b8067f6be95a07
2019-01-28 01:57:05 -08:00
Anton Hansson
7c1890f536
Merge "Auto-include device_manifest.xml when necessary" am: 096b88bf90
...
am: 1cff5df789
Change-Id: I919a87d53824a7af5ddcba6253d657d149f9a35f
2019-01-28 01:41:29 -08:00
Nicolas Geoffray
07c2c7c837
Merge "Move remaining libcore JNI libraries to APEX." am: 93626d9616
...
am: 8b227ab6d9
Change-Id: Ie99f9a759b867ce5eb5827009638021ddbb0035d
2019-01-28 01:39:46 -08:00
Anton Hansson
1cff5df789
Merge "Auto-include device_manifest.xml when necessary"
...
am: 096b88bf90
Change-Id: I446db799a7529fa074451582911d3db989a9fce4
2019-01-28 01:30:58 -08:00
Nicolas Geoffray
8b227ab6d9
Merge "Move remaining libcore JNI libraries to APEX."
...
am: 93626d9616
Change-Id: Id031131da1fcfd27ecdbf7e9da95bba2ade3ff36
2019-01-28 01:28:53 -08:00
Anton Hansson
096b88bf90
Merge "Auto-include device_manifest.xml when necessary"
2019-01-28 09:18:34 +00:00
Nicolas Geoffray
93626d9616
Merge "Move remaining libcore JNI libraries to APEX."
2019-01-28 09:16:21 +00:00
Pete Bentley
b8b08bdd02
Move remaining libcore JNI libraries to APEX.
...
Test: Flash and boot on Taimen
Test: atest CtsLibcoreTestCases CtsJniTestCases
Bug: 119090773
Change-Id: Ia9e7077327d2abc3f637c09acc5933b9c1682d5a
Exempt-From-Owner-Approval: Simple clean steps rule
2019-01-28 09:14:12 +00:00
Colin Cross
09a3d7c132
Merge "Remove obsolete proguard flags" am: 8a508cbc0b
am: 80e86c8ff8
...
am: 70323e8e21
Change-Id: Icc549c3a8ea8eb1aca4788051845f0f3fcc66325
2019-01-25 18:48:53 -08:00
Colin Cross
70323e8e21
Merge "Remove obsolete proguard flags" am: 8a508cbc0b
...
am: 80e86c8ff8
Change-Id: I1becd4c650be4f19a0286b23dd114e29b5fec84d
2019-01-25 18:44:41 -08:00
Colin Cross
80e86c8ff8
Merge "Remove obsolete proguard flags"
...
am: 8a508cbc0b
Change-Id: Ib6fa2150c3f1b7da148e8a1a1271b1b2ea1d719b
2019-01-25 18:40:34 -08:00
Colin Cross
8a508cbc0b
Merge "Remove obsolete proguard flags"
2019-01-26 02:30:55 +00:00
Joe Onorato
4abc14b9ed
Merge "When using inherit-package for a test, also allow specifying a new test suite." am: c51c523b88
am: ac00ab680e
...
am: f1847c0a18
Change-Id: Ibac629980c5794b00f0c2e31b9c4c27aef132e55
2019-01-25 17:20:45 -08:00
Joe Onorato
f1847c0a18
Merge "When using inherit-package for a test, also allow specifying a new test suite." am: c51c523b88
...
am: ac00ab680e
Change-Id: I13bc3b38e4f359515b1e70c45c49f31ac3ec5fe2
2019-01-25 17:16:36 -08:00
Joe Onorato
ac00ab680e
Merge "When using inherit-package for a test, also allow specifying a new test suite."
...
am: c51c523b88
Change-Id: I4cdb982aacdcdf3842b9f4619e431ca010af0adf
2019-01-25 17:11:24 -08:00
Treehugger Robot
c51c523b88
Merge "When using inherit-package for a test, also allow specifying a new test suite."
2019-01-26 00:57:14 +00:00
Colin Cross
2ac9c6219a
Remove obsolete proguard flags
...
R8 now warns:
Warning in ./build/make/core/proguard_basic_keeps.flags:
Ignoring option: -optimizations
Remove the flags, they are not used by R8.
Fixes: 123401079
Test: m checkbuild
Change-Id: I8b0c558be8bcf943652dddb71802ddc145ae42c1
2019-01-25 21:30:13 +00:00
Yifan Hong
79997e5a18
dynamic partition update order is deterministic.
...
Use an OrderedDict.
Test: builds
Change-Id: Ic3782c1961f0c2a735540b054eb3cace720c50bd
2019-01-25 12:36:17 -08:00
Jiyong Park
54f1d8e052
Merge "Add APK container signing key/cert pairs for APEXes" am: 1ff476e216
am: 8bb658cb89
...
am: 60beb2863a
Change-Id: Iaf087514d7ffdef038dd94fab5cd34b89c54dbf4
2019-01-25 12:07:44 -08:00
Jiyong Park
60beb2863a
Merge "Add APK container signing key/cert pairs for APEXes" am: 1ff476e216
...
am: 8bb658cb89
Change-Id: I2830ea9e6e38a8536f872a6b1c535abd514fb7d3
2019-01-25 11:59:09 -08:00
Jiyong Park
8bb658cb89
Merge "Add APK container signing key/cert pairs for APEXes"
...
am: 1ff476e216
Change-Id: Ieaee6753e8ece81a04657773d6b2d8fc358de706
2019-01-25 11:54:57 -08:00
Treehugger Robot
1ff476e216
Merge "Add APK container signing key/cert pairs for APEXes"
2019-01-25 19:46:08 +00:00
Nicolas Geoffray
d55dbbae62
Merge "Revert "Revert "Differentiate between runtime apex jars and framework jars.""" am: 1174b010f6
am: cdd640e40e
...
am: 6c10f21f5a
Change-Id: If29ff578f92b86d9249ea61b96d4b9c97347b7db
2019-01-25 11:27:26 -08:00
Nicolas Geoffray
6c10f21f5a
Merge "Revert "Revert "Differentiate between runtime apex jars and framework jars.""" am: 1174b010f6
...
am: cdd640e40e
Change-Id: Ifcc2c79b01d4ab747be890f89f80105aa283c16f
2019-01-25 11:21:58 -08:00
Nicolas Geoffray
cdd640e40e
Merge "Revert "Revert "Differentiate between runtime apex jars and framework jars."""
...
am: 1174b010f6
Change-Id: If615caeab26258b213a1847ca9575623543e97f5
2019-01-25 11:16:33 -08:00
Nicolas Geoffray
1174b010f6
Merge "Revert "Revert "Differentiate between runtime apex jars and framework jars."""
2019-01-25 19:02:13 +00:00
Anton Hansson
5279362994
Merge "Fix typo of PRODUCT_BUILD_PRODUCT_SERVICES_IMAGE" am: 18977ff3a9
am: 7004e33836
...
am: ff7f7e61f8
Change-Id: Ib87eb5f222f5668e2dfe2523811033d626ad6803
2019-01-25 10:48:22 -08:00
TreeHugger Robot
9e5c79841c
Merge "Use go_handheld_core_hardware.xml for Go builds"
2019-01-25 18:46:28 +00:00
Anton Hansson
ff7f7e61f8
Merge "Fix typo of PRODUCT_BUILD_PRODUCT_SERVICES_IMAGE" am: 18977ff3a9
...
am: 7004e33836
Change-Id: Ie56dfc190475f6a3e9129ce925dc2c9648ea1e8b
2019-01-25 10:33:48 -08:00
Anton Hansson
7004e33836
Merge "Fix typo of PRODUCT_BUILD_PRODUCT_SERVICES_IMAGE"
...
am: 18977ff3a9
Change-Id: I77fcb7807b98b3511ec32c603dd8be9bd41c1ecb
2019-01-25 10:28:35 -08:00
Treehugger Robot
18977ff3a9
Merge "Fix typo of PRODUCT_BUILD_PRODUCT_SERVICES_IMAGE"
2019-01-25 18:19:11 +00:00
Suren Baghdasaryan
7bfa7eacf6
[automerger skipped] Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup into VNDK""" am: 6d2ae0b628
-s ours am: e8e28870da
-s ours
...
am: f49c0ce49c
-s ours
am skip reason: subject contains skip directive
Change-Id: I31fb4fb8d113b5d717cdbf0a8d6e77851eef6b60
2019-01-25 09:40:19 -08:00