TreeHugger Robot
e49a8dd2cc
Merge "Add incident-helper-cmd build target"
2020-01-17 00:57:34 +00:00
Automerger Merge Worker
c6e9f75834
Merge "Add strict module check to package-modules.mk" am: 951ae30d56 am: a9d2208cb1 am: bc491a64a3
...
Change-Id: I3b5f49f2dfd2d7078a757d1a4c4fd743c00b3128
2020-01-17 00:31:00 +00:00
Automerger Merge Worker
bc491a64a3
Merge "Add strict module check to package-modules.mk" am: 951ae30d56 am: a9d2208cb1
...
Change-Id: I1d4097235ff74c996bf314feafee70e49c436098
2020-01-17 00:21:26 +00:00
Dan Willemsen
a9d2208cb1
Merge "Add strict module check to package-modules.mk"
...
am: 951ae30d56
2020-01-16 16:07:49 -08:00
Treehugger Robot
951ae30d56
Merge "Add strict module check to package-modules.mk"
2020-01-17 00:03:07 +00:00
Automerger Merge Worker
b165bab09b
Merge "Add stable aidl power HAL" am: add214cdee am: 91e8905596 am: ce121b7a88
...
Change-Id: Ia357fdd22df3bf4d0003f2b0caa38cc4833a0f40
2020-01-16 23:09:09 +00:00
Xiangyu/Malcolm Chen
aca3495708
Merge "move telephony-framework from framework.jar"
2020-01-16 23:05:25 +00:00
Automerger Merge Worker
ce121b7a88
Merge "Add stable aidl power HAL" am: add214cdee am: 91e8905596
...
Change-Id: I80f4f3cf5d3b20b51e5f7e20fea0e564e58965b3
2020-01-16 22:57:07 +00:00
Wei Wang
91e8905596
Merge "Add stable aidl power HAL"
...
am: add214cdee
2020-01-16 14:40:00 -08:00
Wei Wang
add214cdee
Merge "Add stable aidl power HAL"
2020-01-16 22:35:42 +00:00
Automerger Merge Worker
ba760b0723
[automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master am: 2f0743483b am: d69b3524ac -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2038ea26afc1bfd271d355bed87216bea6ec7226
2020-01-16 19:05:45 +00:00
Automerger Merge Worker
d69b3524ac
Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master am: 2f0743483b
...
Change-Id: Ifac6dc31c7d999426e4d421ada36c3c1bb00f585
2020-01-16 19:01:45 +00:00
Automerger Merge Worker
071e29666d
[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 6764f473a5 am: c00db42b17 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I27902cc5bff4f8474f366b678f53b74d9c009411
2020-01-16 19:01:00 +00:00
Automerger Merge Worker
c00db42b17
DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 6764f473a5
...
Change-Id: I606e2ca7b75446b45159654f78d548bcdc2a645f
2020-01-16 18:34:41 +00:00
TreeHugger Robot
2f0743483b
Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master
2020-01-16 18:29:25 +00:00
TreeHugger Robot
1bf3835efd
Merge "Allow adding framework and service java code into permission APEX."
2020-01-16 11:15:45 +00:00
Dan Willemsen
09c11073ac
Add strict module check to package-modules.mk
...
The test lists keep getting out of date. Add a per-caller option so that
once they're clean on all builds we can stop them from regressing.
Test: add my_modules_strict := {true,false,,foo} to user
Change-Id: I3e09a8cbe5a07bbbff042b26cea7041c331dde96
2020-01-15 20:54:13 -08:00
Automerger Merge Worker
1df6d79a0b
Merge "device_(manifest|matrix).xml -> vendor_*" am: 2e4f20f540 am: fe1bb53543 am: 9a33bc10bc
...
Change-Id: I355ece2b39df76de7b82ba65805ea7cf561b7f75
2020-01-16 04:32:31 +00:00
Automerger Merge Worker
9a33bc10bc
Merge "device_(manifest|matrix).xml -> vendor_*" am: 2e4f20f540 am: fe1bb53543
...
Change-Id: I07c65054fe5a569b557b10fb885c0efe735841a3
2020-01-16 04:23:03 +00:00
Yifan Hong
fe1bb53543
Merge "device_(manifest|matrix).xml -> vendor_*"
...
am: 2e4f20f540
2020-01-15 20:10:10 -08:00
Yifan Hong
2e4f20f540
Merge "device_(manifest|matrix).xml -> vendor_*"
2020-01-16 04:09:08 +00:00
Xin Li
6764f473a5
DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
...
Bug: 146167222
Change-Id: I5adf4130f45200f3abfa2d65178a1640918e5a06
2020-01-15 15:56:28 -08:00
Automerger Merge Worker
9700c5ff3a
Merge "Add Identity Credential 1.0" am: 4026911ba1 am: 04c33dab31 am: e192131331
...
Change-Id: I708ebc8092ecaa570a376a3a71ae8135bc52ffff
2020-01-15 23:43:10 +00:00
Automerger Merge Worker
e192131331
Merge "Add Identity Credential 1.0" am: 4026911ba1 am: 04c33dab31
...
Change-Id: I2bf40d3eb0d877009c63f3015aef67f6eeae1f09
2020-01-15 23:32:39 +00:00
David Zeuthen
04c33dab31
Merge "Add Identity Credential 1.0"
...
am: 4026911ba1
2020-01-15 15:22:12 -08:00
Treehugger Robot
4026911ba1
Merge "Add Identity Credential 1.0"
2020-01-15 23:19:03 +00:00
Automerger Merge Worker
c5ed67077f
Merge "Document the m4 prebuilts" am: 474de20a36 am: 3abf2ee080 am: 08a76dd7c0
...
Change-Id: Ib725b317b169c7a4ef547b412c618e16088d15ad
2020-01-15 20:10:51 +00:00
Automerger Merge Worker
08a76dd7c0
Merge "Document the m4 prebuilts" am: 474de20a36 am: 3abf2ee080
...
Change-Id: I6982af43553d159a164b4bf985feb19db022fed2
2020-01-15 19:58:55 +00:00
Changyeon Jo
d8d5182b44
Merge "Update VNDK library list"
2020-01-15 19:54:37 +00:00
Dan Willemsen
3abf2ee080
Merge "Document the m4 prebuilts"
...
am: 474de20a36
2020-01-15 11:41:07 -08:00
Treehugger Robot
474de20a36
Merge "Document the m4 prebuilts"
2020-01-15 19:38:22 +00:00
Chen Xu
b319487f06
move telephony-framework from framework.jar
...
add telephony-framework to boot class path
Bug: 140908357
Test: Build
Change-Id: I7ebec46ca8c3b02c76b7f9db51b5dbaea21eff6c
2020-01-15 11:30:47 -08:00
TreeHugger Robot
d47921f24b
Merge "Remove PermissionController from base_system after moving into APEX."
2020-01-15 18:17:37 +00:00
Hai Zhang
463a093e5c
Allow adding framework and service java code into permission APEX.
...
Bug: 136503238
Test: presubmit
Change-Id: Idef2216deae08c6e82f8f166a39cf179461f2668
2020-01-15 09:37:58 -08:00
Automerger Merge Worker
e4230bf9ad
Merge "Do not remove RRO resources" am: b55ea658ba am: f174a2da23 am: cb807e945e
...
Change-Id: Ie85f5ea97117343dcdcc0082f9f1079d98c0f0ec
2020-01-15 14:29:17 +00:00
Automerger Merge Worker
cb807e945e
Merge "Do not remove RRO resources" am: b55ea658ba am: f174a2da23
...
Change-Id: I9393dba6e516ca6d8a19697cd1b3b8b95e0b89f7
2020-01-15 14:15:01 +00:00
Ryan Mitchell
f174a2da23
Merge "Do not remove RRO resources"
...
am: b55ea658ba
2020-01-15 06:01:13 -08:00
Treehugger Robot
b55ea658ba
Merge "Do not remove RRO resources"
2020-01-15 13:18:03 +00:00
TreeHugger Robot
a5c409bb75
Merge "Remove service-statsd off SystemServerClassPath"
2020-01-15 08:32:54 +00:00
Automerger Merge Worker
b4723f5a36
Merge "Call a writer to dump html; new warning patterns." am: c339abd467 am: c410b8e63d am: 3c063e0615
...
Change-Id: I0fa1583892d5eaa2846067a7ea287642cb84dd53
2020-01-15 02:49:37 +00:00
Automerger Merge Worker
3c063e0615
Merge "Call a writer to dump html; new warning patterns." am: c339abd467 am: c410b8e63d
...
Change-Id: Ibce80dff51850325bfef5cf385671ed193ae64b2
2020-01-15 02:38:13 +00:00
Chih-hung Hsieh
c410b8e63d
Merge "Call a writer to dump html; new warning patterns."
...
am: c339abd467
2020-01-14 18:27:40 -08:00
Chih-hung Hsieh
c339abd467
Merge "Call a writer to dump html; new warning patterns."
2020-01-15 02:23:25 +00:00
Ryan Mitchell
15e6042b29
Do not remove RRO resources
...
Resource configs should not be deduped when building RROs since it
would be impossible to override some resource configs with the same
value as the default config. Also, aapt2 removes resources that do not
have default configurations. If an overlay attempts to overlay a
non-default configuration without overlaying the default, the resource
will be removed and the value will not be overlaid at all.
Bug: 146227008
Test: m-j
Change-Id: I1465b599cbf7f464d1b5b75a87e7dafa2cf734b0
2020-01-14 17:00:13 -08:00
Automerger Merge Worker
dd21226da6
Merge "Revert "Add check-vintf-all target."" am: 02e7851e02 am: f03f60ea81 am: da079a2b76
...
Change-Id: I4405344729aa7401fbbf4a058e0f7de7e4a0afde
2020-01-15 00:10:59 +00:00
Automerger Merge Worker
da079a2b76
Merge "Revert "Add check-vintf-all target."" am: 02e7851e02 am: f03f60ea81
...
Change-Id: Ie3c591a5f2ee20daddf6d9045d625208c8473414
2020-01-14 23:58:48 +00:00
Dan Willemsen
2bfffb9f48
Document the m4 prebuilts
...
Test: view in gitiles
Change-Id: I2defdb433313fb6744b09685d289e16d094cffdc
2020-01-14 15:08:41 -08:00
Yifan Hong
51be69f063
device_(manifest|matrix).xml -> vendor_*
...
Building device_manifest.xml or device_compatibility_matrix.xml only
builds vendor manifest / matrices, but not all device manifest /
matrices (e.g. vintf_fragments, ODM manifest, etc.). Make the name more
accurate.
Test: m check-vintf-all
Change-Id: Ib017507c421355263d53a9e5b357f169c77da36d
2020-01-14 14:24:51 -08:00
Automerger Merge Worker
f7e6da24c7
Merge "Revert "Improve BUILT_ASSEMBLED_*_MANIFEST checks"" am: 19705c6987 am: 4192ca4845 am: d42697bcb8
...
Change-Id: Ia9e28da8c7142a10e9a4a5c6d9c166f5e34315c6
2020-01-14 21:42:51 +00:00
Harry Zhang
f03f60ea81
Merge "Revert "Add check-vintf-all target.""
...
am: 02e7851e02
2020-01-14 13:37:14 -08:00
