Hai Zhang
15fd20f873
Remove PermissionController from base_system after moving into APEX.
...
Bug: 136503238
Test: m mts && mts-tradefed run mts-permission
Change-Id: Ic6194402adfa1d0b8bd55e337e3b573ea37f7fba
2020-01-09 12:39:30 -08:00
Automerger Merge Worker
3205b4807e
Merge "Revert "unbreak sdk_phone_x86 boot"" am: c30b734f42 am: 30a5c0cf8b am: 63c8e0382e
...
Change-Id: I1e9aa93cd0df43def35ae05ce5b930838363d030
2020-01-09 17:53:03 +00:00
Automerger Merge Worker
63c8e0382e
Merge "Revert "unbreak sdk_phone_x86 boot"" am: c30b734f42 am: 30a5c0cf8b
...
Change-Id: Icd73510d6e002622188788c68db527f08df7c42d
2020-01-09 17:32:00 +00:00
Bo Hu
30a5c0cf8b
Merge "Revert "unbreak sdk_phone_x86 boot""
...
am: c30b734f42
2020-01-09 08:59:42 -08:00
Bo Hu
c30b734f42
Merge "Revert "unbreak sdk_phone_x86 boot""
2020-01-09 16:56:35 +00:00
Automerger Merge Worker
2f3cb44b28
[automerger skipped] Merge "Update references to sdkext" am: b9e912dc9d am: 2bba9827af am: 4b482e337e -s ours
...
am skip reason: Change-Id I628fc555b82e9bd931c8f0cce2222b02efad6036 with SHA-1 37e998ac31
2020-01-09 09:38:56 +00:00
Automerger Merge Worker
4b482e337e
Merge "Update references to sdkext" am: b9e912dc9d am: 2bba9827af
...
Change-Id: I3716fa082509f3ee2a94c5a3ab3c78a444da0cd9
2020-01-09 09:19:39 +00:00
Anton Hansson
2bba9827af
Merge "Update references to sdkext"
...
am: b9e912dc9d
2020-01-09 01:01:45 -08:00
Anton Hansson
b9e912dc9d
Merge "Update references to sdkext"
2020-01-09 08:46:08 +00:00
Bo Hu
08a2677fe7
Revert "unbreak sdk_phone_x86 boot"
...
This reverts commit 70c96c7f11
2020-01-09 02:35:07 +00:00
Automerger Merge Worker
bf4f7acb17
Merge "jacoco-report-classes-all.jar includes jar from other partitions" am: 3801c82e33 am: bf9e4cdd81 am: cccefb9901
...
Change-Id: I3b3f60fd7f81972c99198859b04fba76c6b336b8
2020-01-09 01:17:28 +00:00
Automerger Merge Worker
cccefb9901
Merge "jacoco-report-classes-all.jar includes jar from other partitions" am: 3801c82e33 am: bf9e4cdd81
...
Change-Id: I6adf59d2188289165034d7374fe50ad1f32dda54
2020-01-09 01:05:03 +00:00
Jiyong Park
bf9e4cdd81
Merge "jacoco-report-classes-all.jar includes jar from other partitions"
...
am: 3801c82e33
2020-01-08 16:53:09 -08:00
Treehugger Robot
3801c82e33
Merge "jacoco-report-classes-all.jar includes jar from other partitions"
2020-01-09 00:45:11 +00:00
Automerger Merge Worker
e632c14f98
[automerger skipped] Merge "DO NOT MERGE - Merge January 2020 Security Release into master" am: 2cfd952682 am: 155e70d596 am: ac89c0a8c5 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I30cf7e992de7dfcb0c9549ecef1643fafca2092a
2020-01-08 18:26:31 +00:00
Automerger Merge Worker
5660a6b4ae
[automerger skipped] DO NOT MERGE - Merge January 2020 Security Release into master am: c4dd701883 am: 03d08753b8 am: e6796f7a36 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic1cfcc510813193cc88dcb64e174b8e97e8839bc
2020-01-08 18:25:05 +00:00
Automerger Merge Worker
ac89c0a8c5
Merge "DO NOT MERGE - Merge January 2020 Security Release into master" am: 2cfd952682 am: 155e70d596
...
Change-Id: I90ba297df1494ef769f760105efa2532928c1ff2
2020-01-08 18:09:54 +00:00
Automerger Merge Worker
e6796f7a36
DO NOT MERGE - Merge January 2020 Security Release into master am: c4dd701883 am: 03d08753b8
...
Change-Id: I2187c64fb6b8577fedbc84f351b13b6e481a4652
2020-01-08 18:08:50 +00:00
Xin Li
155e70d596
Merge "DO NOT MERGE - Merge January 2020 Security Release into master"
...
am: 2cfd952682
2020-01-08 10:02:39 -08:00
Xin Li
03d08753b8
DO NOT MERGE - Merge January 2020 Security Release into master
...
am: c4dd701883
2020-01-08 09:46:48 -08:00
Xin Li
2cfd952682
Merge "DO NOT MERGE - Merge January 2020 Security Release into master"
2020-01-08 17:39:17 +00:00
Anton Hansson
923ef1dec9
Merge "Update references to sdkext"
2020-01-08 12:55:48 +00:00
Automerger Merge Worker
983ea7ea96
Merge "Remove generation of the dexpreopt tool paths from make." am: 2e31874c7a am: ee786b748d am: fd21bc3523
...
Change-Id: Ic8a60bdeba07ed1439e0d39248e4d3c10f02d786
2020-01-08 11:46:21 +00:00
Anton Hansson
ea711c2418
Update references to sdkext
...
The module is getting renamed to sdkextensions.
Bug: 137191822
Test: presubmit
Change-Id: I628fc555b82e9bd931c8f0cce2222b02efad6036
Merged-In: I628fc555b82e9bd931c8f0cce2222b02efad6036
(cherry picked from commit 37e998ac31
2020-01-08 11:42:03 +00:00
Automerger Merge Worker
fd21bc3523
Merge "Remove generation of the dexpreopt tool paths from make." am: 2e31874c7a am: ee786b748d
...
Change-Id: If26967a4a119f201f1525e02cc4a8b68b20bd655
2020-01-08 11:30:38 +00:00
Martin Stjernholm
ee786b748d
Merge "Remove generation of the dexpreopt tool paths from make."
...
am: 2e31874c7a
2020-01-08 03:02:19 -08:00
Martin Stjernholm
2e31874c7a
Merge "Remove generation of the dexpreopt tool paths from make."
2020-01-08 10:40:28 +00:00
Anton Hansson
37e998ac31
Update references to sdkext
...
The module is getting renamed to sdkextensions.
Bug: 137191822
Test: presubmit
Change-Id: I628fc555b82e9bd931c8f0cce2222b02efad6036
2020-01-08 09:51:31 +00:00
Jiyong Park
bee946e8eb
jacoco-report-classes-all.jar includes jar from other partitions
...
jacoco-report-classes-all.jar now depends on all installed files
including apks in /apex. Previously, it depended only on files under
system.img and as a result jacoco for other partitions were missing.
Bug: 147296855
Test: m
Change-Id: I755de1205ebc43c197af36a13cca5f4b49e275e8
2020-01-08 14:41:45 +09:00
Automerger Merge Worker
a362ae5e3d
Merge "Add system_ext to VINTF search paths." am: 620a2f2366 am: da4b88148c am: bf85f8c9df
...
Change-Id: I4b0c9014dfc0f117e027bfdef94ac13c3e51c75d
2020-01-07 23:46:35 +00:00
Automerger Merge Worker
bf85f8c9df
Merge "Add system_ext to VINTF search paths." am: 620a2f2366 am: da4b88148c
...
Change-Id: I047a068abe35fe836dea481cd1716b4188a0dba0
2020-01-07 23:34:20 +00:00
Xin Li
c4dd701883
DO NOT MERGE - Merge January 2020 Security Release into master
...
Bug: 147314974
Change-Id: I1d6098643e9d3711e663b521dca875254008e787
2020-01-07 15:25:06 -08:00
Automerger Merge Worker
6416a96bda
[automerger skipped] Merge "vibrator: use package as name" am: c8b0187c8b am: e819518de8 am: 950604f8da -s ours
...
am skip reason: Change-Id I382074d66b06669876d8f9fa4fc95b8a9c4dbf2a with SHA-1 a31e24a799
2020-01-07 23:18:26 +00:00
Yifan Hong
da4b88148c
Merge "Add system_ext to VINTF search paths."
...
am: 620a2f2366
2020-01-07 15:12:20 -08:00
Automerger Merge Worker
950604f8da
Merge "vibrator: use package as name" am: c8b0187c8b am: e819518de8
...
Change-Id: If810c6606b9e40150f74848874b01152addf7b73
2020-01-07 23:07:40 +00:00
Treehugger Robot
620a2f2366
Merge "Add system_ext to VINTF search paths."
2020-01-07 23:04:54 +00:00
Steven Moreland
e819518de8
Merge "vibrator: use package as name"
...
am: c8b0187c8b
2020-01-07 14:48:32 -08:00
Steven Moreland
c8b0187c8b
Merge "vibrator: use package as name"
2020-01-07 22:43:01 +00:00
Automerger Merge Worker
13fcfe37a2
Merge "Add new compiler warning patterns" am: 3a59a5f66a am: c2c765a00a am: 3acd797b9f
...
Change-Id: I717c0072f019799d1d4acc9d941bfd4a601ced2f
2020-01-07 22:37:16 +00:00
Automerger Merge Worker
3acd797b9f
Merge "Add new compiler warning patterns" am: 3a59a5f66a am: c2c765a00a
...
Change-Id: I226787304e8a6e77c9ebeaeab9c72aa32e0fd5f4
2020-01-07 22:25:21 +00:00
Chih-hung Hsieh
c2c765a00a
Merge "Add new compiler warning patterns"
...
am: 3a59a5f66a
2020-01-07 14:04:47 -08:00
Steven Moreland
7f684a0029
Merge "*common: use package as name"
2020-01-07 21:49:22 +00:00
Chih-hung Hsieh
3a59a5f66a
Merge "Add new compiler warning patterns"
2020-01-07 21:49:01 +00:00
Automerger Merge Worker
b7f4b8c3ba
[automerger skipped] Merge "Revert submission 1182953-1576003954286-8455af5a" am: 42f2c761bf am: 7da11edb71 am: 9a0acae5e9 -s ours
...
am skip reason: Change-Id Ia64b73682fcc77db63e220867c66c4319c417582 with SHA-1 9ae31126ea
2020-01-07 20:46:28 +00:00
Automerger Merge Worker
9a0acae5e9
Merge "Revert submission 1182953-1576003954286-8455af5a" am: 42f2c761bf am: 7da11edb71
...
Change-Id: Ife36d7f71d16943e0044ab8e1155aeb74edfb6c6
2020-01-07 20:29:39 +00:00
Chen Xu
7da11edb71
Merge "Revert submission 1182953-1576003954286-8455af5a"
...
am: 42f2c761bf
2020-01-07 12:07:13 -08:00
Chen Xu
42f2c761bf
Merge "Revert submission 1182953-1576003954286-8455af5a"
2020-01-07 19:29:08 +00:00
Automerger Merge Worker
38419cc7b0
Merge "Use symlinks in the build graph for jni libs" am: 7d44f2d01d am: 13f8dc992e am: 2b626d5038
...
Change-Id: Ic512a1b03138912d6001c94395c8217c24afafdf
2020-01-07 15:12:47 +00:00
Automerger Merge Worker
2b626d5038
Merge "Use symlinks in the build graph for jni libs" am: 7d44f2d01d am: 13f8dc992e
...
Change-Id: I51e3fcab757299acb45a8cd3393cead8ee14f7f9
2020-01-07 15:01:30 +00:00
Dan Willemsen
13f8dc992e
Merge "Use symlinks in the build graph for jni libs"
...
am: 7d44f2d01d
2020-01-07 06:47:56 -08:00
