Commit graph

57546 commits

Author SHA1 Message Date
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

Change-Id: I3d5351c0ef408b87f0a14d2cb989e40d97e5e2d5
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
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
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
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

Change-Id: I291ec3a86cb4bfb08559abb61b54e1184b2459d8
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
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

Change-Id: If273a885fa6b4982423dd7c903977954a3fcadea
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
08a76dd7c0 Merge "Document the m4 prebuilts" am: 474de20a36 am: 3abf2ee080
Change-Id: I6982af43553d159a164b4bf985feb19db022fed2
2020-01-15 19:58:55 +00:00
Dan Willemsen
3abf2ee080 Merge "Document the m4 prebuilts"
am: 474de20a36

Change-Id: If16ce1087669b3768316489ff2d6dab3c5acd8ff
2020-01-15 11:41:07 -08:00
Treehugger Robot
474de20a36 Merge "Document the m4 prebuilts" 2020-01-15 19:38:22 +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

Change-Id: I178c85c75e54ee74517daf35af213709e58b600a
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
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

Change-Id: I6806faf28a2772c6b20b0e838edd7972024d7fad
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
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
Harry Zhang
f03f60ea81 Merge "Revert "Add check-vintf-all target.""
am: 02e7851e02

Change-Id: I34a60d92c9305c3a30c05eea9cd5ae60cc512ba2
2020-01-14 13:37:14 -08:00
Harry Zhang
02e7851e02 Merge "Revert "Add check-vintf-all target."" 2020-01-14 21:34:51 +00:00
Automerger Merge Worker
d42697bcb8 Merge "Revert "Improve BUILT_ASSEMBLED_*_MANIFEST checks"" am: 19705c6987 am: 4192ca4845
Change-Id: I9317252a7d05ae663280020f32c0391dede70e21
2020-01-14 21:29:40 +00:00
Harry Zhang
4192ca4845 Merge "Revert "Improve BUILT_ASSEMBLED_*_MANIFEST checks""
am: 19705c6987

Change-Id: I7422b0a3bdedaa1edeb15693452fe17c82ea3881
2020-01-14 13:15:48 -08:00
Harry Zhang
19705c6987 Merge "Revert "Improve BUILT_ASSEMBLED_*_MANIFEST checks"" 2020-01-14 21:12:40 +00:00
Chih-Hung Hsieh
5392cdbeb1 Call a writer to dump html; new warning patterns.
* HTML emit functions now take a writer parameter.
  This makes warn_common.py one step closer to the ChromeOS version.
* Add new found warning patterns from java and yacc.

Test: warn.py --url=http://cs/android --separator='?l=' build.log > warnings.html
Test: warn.py --gencsv build.log > warnings.csv
Change-Id: I5c446ca767746598f07603591fdf98f7d82cae17
2020-01-14 11:57:12 -08:00
Harry Zhang
152a783e2b Revert "Add check-vintf-all target."
Revert submission 1202895-build_time_vintf

Reason for revert: Build breakage at b/147648187
Reverted Changes:
I9791abc44: Improve BUILT_ASSEMBLED_*_MANIFEST checks
I6ee79910d: Add check-vintf-all target.

Change-Id: I6d9fd1747eaea492a3ebfe98c13ea4a5a2d22a33
2020-01-14 18:40:23 +00:00
Harry Zhang
d00ebcd740 Revert "Improve BUILT_ASSEMBLED_*_MANIFEST checks"
Revert submission 1202895-build_time_vintf

Reason for revert: Build breakage at b/147648187
Reverted Changes:
I9791abc44: Improve BUILT_ASSEMBLED_*_MANIFEST checks
I6ee79910d: Add check-vintf-all target.

Change-Id: If580207415d6ca54eb5fc653efc54d07b086f804
2020-01-14 18:40:23 +00:00
David Zeuthen
dcc85ca5dd Add Identity Credential 1.0
Bug: 111446262
Test: VtsHalIdentityCredentialTargetTest
Test: android.hardware.identity-support-lib-test
Test: CtsIdentityTestCases
Change-Id: I91bf3a0551c4c0358d5f0de066739dcc05de1642
2020-01-14 11:21:03 -05:00
Automerger Merge Worker
bd0ff048c0 Merge changes from topic "build_time_vintf" am: 997661002a am: ea624d0c66
Change-Id: I2dc0cc6ac3de9c6e5e49f05f430231beee6c792a
2020-01-14 02:11:30 +00:00
Yifan Hong
ea624d0c66 Merge changes from topic "build_time_vintf"
am: 997661002a

Change-Id: Ide4f47dec243b823ebd0b9d0e8c05ad0434ede35
2020-01-13 18:01:04 -08:00
Yifan Hong
997661002a Merge changes from topic "build_time_vintf"
* changes:
  Improve BUILT_ASSEMBLED_*_MANIFEST checks
  Add check-vintf-all target.
2020-01-14 01:29:47 +00:00
Automerger Merge Worker
6f3ffa6128 Update Security String to 2020-03-05 am: 20c6e7dbe1
Change-Id: I89aaa622a1aa3a58cb6c35206be9244166f6ca84
2020-01-14 01:28:53 +00:00
Automerger Merge Worker
4c84dea09e Merge "Make allmod() and pathmod() py3 compatible" am: 5740e22d7c am: 3e3a93ca25
Change-Id: I7df5a1b0748fd667ddeb43d4a9754a1b02af4b29
2020-01-13 23:15:10 +00:00
LuK1337
3e3a93ca25 Merge "Make allmod() and pathmod() py3 compatible"
am: 5740e22d7c

Change-Id: Idcb7ff1903d720355bf23ff6ac9562130335ffef
2020-01-13 15:01:00 -08:00
Treehugger Robot
5740e22d7c Merge "Make allmod() and pathmod() py3 compatible" 2020-01-13 22:49:44 +00:00
Automerger Merge Worker
e72ad4dc69 Merge "Clean up cpp warning patterns" am: 9c65671b91 am: 966a03c534
Change-Id: I5f1aa62c467ac945ef4ac5a76c8c6d6f0f2f7a52
2020-01-13 22:19:29 +00:00
Chih-hung Hsieh
966a03c534 Merge "Clean up cpp warning patterns"
am: 9c65671b91

Change-Id: Ibb54c5316a805e33fee2a2e21305a4eddb363b84
2020-01-13 14:09:35 -08:00
Chih-hung Hsieh
9c65671b91 Merge "Clean up cpp warning patterns" 2020-01-13 21:59:27 +00:00
Chih-Hung Hsieh
8724ff72ef Clean up cpp warning patterns
* Remove the useless 'option' key.
  It is only used in some C/C++ warning patterns
  to give a hint of options to turn to -Werror.
  Now the global default is -Werror.
* Factor out common code patterns into high/medium/low functions.

Test: warn.py --url=http://cs/android --separator='?l=' build.log > warnings.html
Test: warn.py --gencsv build.log > warnings.csv
Change-Id: Ibd3f768b1552ada925eb5afb0f01ab674c968a87
2020-01-13 11:10:54 -08:00
Automerger Merge Worker
cf0e282a4b Merge "Use boot image extension in the JIT-zygote experiment." am: d99a1faccc am: 1448ba3a01
Change-Id: Ia12594ee81831d38dbbc0f3116bc2eac4b29521a
2020-01-13 11:16:48 +00:00
Ulyana Trafimovich
1448ba3a01 Merge "Use boot image extension in the JIT-zygote experiment."
am: d99a1faccc

Change-Id: I3a511eca1571f957cc96310b25f1242109096f63
2020-01-13 03:02:51 -08:00
Ulyana Trafimovich
d99a1faccc Merge "Use boot image extension in the JIT-zygote experiment." 2020-01-13 10:38:01 +00:00
Automerger Merge Worker
1d2de4f1bd Merge "Correctly gather boot jars from APEXes" am: 7434764cce am: ad7f7a9eec
Change-Id: I11b894cd3ad8a6f9fc3a57e98f3e00bad406212c
2020-01-13 02:18:16 +00:00