StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,054 Commits 1 Branch 0 Tags
eaf2b7e58204f86a46bbd5897a87b715ac7a610c
Commit Graph

57054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Hansson
eaf2b7e582 CleanSpec for system_other 
Bug: 142537657
Test: m
Change-Id: I9206a2b8540ec49889b9e8210eae3b64b0fa2d81
 2019-10-14 16:55:03 +01:00
TreeHugger Robot
3860fef102 Merge "base_system.mk: Switch back to InProcessWifiStack" 2019-10-14 10:53:36 +00:00
Anton Hansson
dffd81b9d5 Merge "Document SYSTEM_OTHER_ODEX_FILTER matching" am: 3cc4fa6394 am: bde786ca70 am: 2ce82aea1a 
am: 9cef3e597e

Change-Id: I5fe8bfc84e02538f41fe404105369e56501c2de9
 2019-10-14 02:58:17 -07:00
Anton Hansson
9cef3e597e Merge "Document SYSTEM_OTHER_ODEX_FILTER matching" am: 3cc4fa6394 am: bde786ca70 
am: 2ce82aea1a

Change-Id: I2d387ec825dc3c91e94ab658b06848f9ea9af78f
 2019-10-14 02:53:02 -07:00
Anton Hansson
2ce82aea1a Merge "Document SYSTEM_OTHER_ODEX_FILTER matching" am: 3cc4fa6394 
am: bde786ca70

Change-Id: Ia10a14e43e24bb19985631275fb43bbb497521d3
 2019-10-14 02:45:57 -07:00
Anton Hansson
bde786ca70 Merge "Document SYSTEM_OTHER_ODEX_FILTER matching" 
am: 3cc4fa6394

Change-Id: I6e243dc057ce23913a9a33f97a7ecd35c9714de1
 2019-10-14 02:40:35 -07:00
Anton Hansson
3cc4fa6394 Merge "Document SYSTEM_OTHER_ODEX_FILTER matching" 2019-10-14 09:29:10 +00:00
Steven Moreland
9a63c2a1ce [automerger skipped] Merge "mainline_system: libhwbinder/libhidltransport" am: 2ce54fa76a am: a84540e557 am: 3b9d2dc689 
am: c58858de4c -s ours
am skip reason: change_id Ia142f8e67c31f66f86386b65e009d4faee502c11 with SHA1 3dbd647da5 is in history

Change-Id: I6f8a20a23dc1df0dafd104d7fe0a08486879f7ec
 2019-10-11 14:15:07 -07:00
Steven Moreland
c58858de4c Merge "mainline_system: libhwbinder/libhidltransport" am: 2ce54fa76a am: a84540e557 
am: 3b9d2dc689

Change-Id: Idfdab4c246de986d1e9ac1dcd4244a1fc1f23ab1
 2019-10-11 14:07:47 -07:00
Steven Moreland
3b9d2dc689 Merge "mainline_system: libhwbinder/libhidltransport" am: 2ce54fa76a 
am: a84540e557

Change-Id: I74d9e246243ff2c93ab60b92b61aee1ae6b6dd43
 2019-10-11 13:56:23 -07:00
Steven Moreland
a84540e557 Merge "mainline_system: libhwbinder/libhidltransport" 
am: 2ce54fa76a

Change-Id: Icf8f192120bbd9f8ee186a52f90f336700cd1704
 2019-10-11 13:49:24 -07:00
Steven Moreland
2ce54fa76a Merge "mainline_system: libhwbinder/libhidltransport" 2019-10-11 20:19:13 +00:00
Roshan Pius
da2153126c base_system.mk: Switch back to InProcessWifiStack 
Until we fix the RAM usage increase with the out of process version, use
the system_server version.

Bug: 140564146
Test: Device boots up and connects to wifi networks.
Change-Id: I8ebfba7e2ce8fcb7383ce05336dbc0ae7d7a2947
 2019-10-11 11:32:04 -07:00
Colin Cross
f9e07d6b9b Merge "Remove stray ZIPALIGN_PAGE_ALIGN_FLAGS" am: d6d27517f7 am: 30124b4e1e am: 011d40c669 
am: 4c0fccb650

Change-Id: I06add3e875c8511c70a010cd6f4f223e0258ea94
 2019-10-11 08:02:14 -07:00
dianlujitao
c18689e4e4 Merge "Fix odm output directory for devices w/o vendor partition" am: 46cfab96d8 am: eec39a95f3 am: a620ad1ff1 
am: d50139f773

Change-Id: I3bab84b8e5574556b2a26d9bcc40f4a82909ab36
 2019-10-11 08:01:33 -07:00
Xin Li
5040b151c3 [automerger skipped] Merge "DO NOT MERGE - Merge QP1A.191005.007 into master" am: 51a7d20229 -s ours am: 13c9a00e30 -s ours am: 7180291ccc -s ours 
am: 1addebe6d4 -s ours
am skip reason: subject contains skip directive

Change-Id: Id5f0392c41509052e0c65c9ddb7f703ae4c94e22
 2019-10-11 07:59:54 -07:00
Colin Cross
4c0fccb650 Merge "Remove stray ZIPALIGN_PAGE_ALIGN_FLAGS" am: d6d27517f7 am: 30124b4e1e 
am: 011d40c669

Change-Id: I6a16e4f3cd614e581b5f85330e7f589466f4d268
 2019-10-11 06:32:50 -07:00
Colin Cross
011d40c669 Merge "Remove stray ZIPALIGN_PAGE_ALIGN_FLAGS" am: d6d27517f7 
am: 30124b4e1e

Change-Id: I2b415e12eca7a870bbc2aff04b1e3556084b4ede
 2019-10-11 06:26:57 -07:00
Colin Cross
30124b4e1e Merge "Remove stray ZIPALIGN_PAGE_ALIGN_FLAGS" 
am: d6d27517f7

Change-Id: I6bd69722e8f5fa9b1333b9dc9e374e255d11e234
 2019-10-11 06:20:52 -07:00
Treehugger Robot
d6d27517f7 Merge "Remove stray ZIPALIGN_PAGE_ALIGN_FLAGS" 2019-10-11 13:12:29 +00:00
dianlujitao
d50139f773 Merge "Fix odm output directory for devices w/o vendor partition" am: 46cfab96d8 am: eec39a95f3 
am: a620ad1ff1

Change-Id: Ie029f0bcb2227cb43beeabb550aea21a19803a5b
 2019-10-11 04:32:27 -07:00
dianlujitao
a620ad1ff1 Merge "Fix odm output directory for devices w/o vendor partition" am: 46cfab96d8 
am: eec39a95f3

Change-Id: I9b91b105e926a9da8279b23e7b1aad09a7b1058a
 2019-10-11 04:20:07 -07:00
dianlujitao
eec39a95f3 Merge "Fix odm output directory for devices w/o vendor partition" 
am: 46cfab96d8

Change-Id: Ia132212a1b1cfb909a3f8539ca42af0bdd9c9939
 2019-10-11 04:14:06 -07:00
Treehugger Robot
46cfab96d8 Merge "Fix odm output directory for devices w/o vendor partition" 2019-10-11 10:46:43 +00:00
Xin Li
45c0f56ae9 [automerger skipped] DO NOT MERGE - Merge QP1A.191005.007 into master am: 66ec993fe5 -s ours am: 39124f2240 -s ours am: 656c9fcf1b -s ours 
am: d6d0eb2522 -s ours
am skip reason: subject contains skip directive

Change-Id: I49929c3f86b6e72f2045dc61a7cc784444607df5
 2019-10-10 21:51:38 -07:00
Harpreet "Eli" Sangha
4a44a68a17 Merge "Add Vibrator HAL 1.4" am: 0ffe0c6248 am: 4a27b4e3fe am: 0838439f88 
am: cf9cfe78dc

Change-Id: I875e9fafd04506c0c9af3b1ca5f94e50ed42c3f7
 2019-10-10 21:50:01 -07:00
Tao Bao
63ddf0a8c9 Merge "AVB: decouple vbmeta.img from recovery.img for non-A/B devices" am: 549325427b am: 97c1c9aaa3 am: 04530d41c3 
am: e0f133bf04

Change-Id: Ie92db847ea67f6da53eb8d9c46f5ff8cf030d7ef
 2019-10-10 21:49:41 -07:00
David Anderson
478c50aa93 Merge "Add boot@1.1 to VNDK" am: 5ff715d088 am: f44a1e6c67 am: d4976a85ed 
am: 7a33fce8f1

Change-Id: I94b2e259524ac5bbe387bfded9917d55ce4cb334
 2019-10-10 21:47:09 -07:00
Xin Li
1addebe6d4 [automerger skipped] Merge "DO NOT MERGE - Merge QP1A.191005.007 into master" am: 51a7d20229 -s ours am: 13c9a00e30 -s ours 
am: 7180291ccc -s ours
am skip reason: change_id I063f0430347d9f1e6ea5a8133204585833ed5ddc with SHA1 84633edb22 is in history

Change-Id: I148ff053cb6f1ced0d717a6caca072fc681dc671
 2019-10-10 21:45:44 -07:00
Xin Li
d6d0eb2522 [automerger skipped] DO NOT MERGE - Merge QP1A.191005.007 into master am: 66ec993fe5 -s ours am: 39124f2240 -s ours 
am: 656c9fcf1b -s ours
am skip reason: change_id I063f0430347d9f1e6ea5a8133204585833ed5ddc with SHA1 84633edb22 is in history

Change-Id: I636b92565facf565f7991e7895deed18e0b18f87
 2019-10-10 21:33:32 -07:00
Xin Li
7180291ccc [automerger skipped] Merge "DO NOT MERGE - Merge QP1A.191005.007 into master" am: 51a7d20229 -s ours 
am: 13c9a00e30 -s ours
am skip reason: change_id I063f0430347d9f1e6ea5a8133204585833ed5ddc with SHA1 84633edb22 is in history

Change-Id: Ib4a6fa4e6cf666a4c88460a115483d231769d56e
 2019-10-10 21:32:01 -07:00
Xin Li
656c9fcf1b [automerger skipped] DO NOT MERGE - Merge QP1A.191005.007 into master am: 66ec993fe5 -s ours 
am: 39124f2240 -s ours
am skip reason: change_id I063f0430347d9f1e6ea5a8133204585833ed5ddc with SHA1 84633edb22 is in history

Change-Id: I116f24077289c2251b30a158e50b62ebbbee8280
 2019-10-10 21:21:16 -07:00
Xin Li
13c9a00e30 [automerger skipped] Merge "DO NOT MERGE - Merge QP1A.191005.007 into master" 
am: 51a7d20229 -s ours
am skip reason: change_id I063f0430347d9f1e6ea5a8133204585833ed5ddc with SHA1 84633edb22 is in history

Change-Id: Id2e7eaeb1ad6dd8ad7f9d5ebaf8d4e8f5c0511e0
 2019-10-10 21:19:44 -07:00
Xin Li
39124f2240 [automerger skipped] DO NOT MERGE - Merge QP1A.191005.007 into master 
am: 66ec993fe5 -s ours
am skip reason: change_id I063f0430347d9f1e6ea5a8133204585833ed5ddc with SHA1 84633edb22 is in history

Change-Id: I794691b6e2f321e6073be08803291871cd2c414c
 2019-10-10 21:10:46 -07:00
Xin Li
51a7d20229 Merge "DO NOT MERGE - Merge QP1A.191005.007 into master" 2019-10-11 02:56:40 +00:00
Harpreet "Eli" Sangha
cf9cfe78dc Merge "Add Vibrator HAL 1.4" am: 0ffe0c6248 am: 4a27b4e3fe 
am: 0838439f88

Change-Id: Iadcd35b926447862eba0bc074447cc8bdc3bbd53
 2019-10-10 17:55:13 -07:00
Harpreet "Eli" Sangha
0838439f88 Merge "Add Vibrator HAL 1.4" am: 0ffe0c6248 
am: 4a27b4e3fe

Change-Id: Ia79ced4513561f3324f6825e6dadd31ef5d16eca
 2019-10-10 17:49:14 -07:00
Harpreet "Eli" Sangha
4a27b4e3fe Merge "Add Vibrator HAL 1.4" 
am: 0ffe0c6248

Change-Id: Icc4968fb4f33b173484c5e3ecc028b65fcb0279f
 2019-10-10 17:43:10 -07:00
Treehugger Robot
0ffe0c6248 Merge "Add Vibrator HAL 1.4" 2019-10-11 00:35:05 +00:00
Colin Cross
00caec196a Revert "Merge "Revert "Add NeuralNetworks HAL v1.3"" am: f5f487be03 am: 176c4afae7 am: a163c720ed" 
This reverts commit 23405c1565.

Reason for revert: revert of a cherry-pick broke master

Change-Id: I2f5d1a66c12509440293c7b5916c337ff1bbe88c
 2019-10-10 22:58:01 +00:00
Xin Li
66ec993fe5 DO NOT MERGE - Merge QP1A.191005.007 into master 
Bug: 142297020
Merged-In: I063f0430347d9f1e6ea5a8133204585833ed5ddc
Change-Id: I6fe9ad3f71b30ba7c1cf9d6941450809cfc66909
 2019-10-10 22:54:06 +00:00
Lev Proleev
23405c1565 Merge "Revert "Add NeuralNetworks HAL v1.3"" am: f5f487be03 am: 176c4afae7 am: a163c720ed 
am: ddc799744d

Change-Id: Iada764ac0a62f8130dd70623bc13912ba9483e54
 2019-10-10 14:54:24 -07:00
Tao Bao
e0f133bf04 Merge "AVB: decouple vbmeta.img from recovery.img for non-A/B devices" am: 549325427b am: 97c1c9aaa3 
am: 04530d41c3

Change-Id: I8a258e6b7ad69c61f7e7097a739939a883f1dde5
 2019-10-10 13:50:55 -07:00
Tao Bao
04530d41c3 Merge "AVB: decouple vbmeta.img from recovery.img for non-A/B devices" am: 549325427b 
am: 97c1c9aaa3

Change-Id: I1ed2a4e004f7bf9a9ae1b0aa2e4b41c5c733124e
 2019-10-10 13:44:11 -07:00
Tao Bao
97c1c9aaa3 Merge "AVB: decouple vbmeta.img from recovery.img for non-A/B devices" 
am: 549325427b

Change-Id: Iebb05accc055147051cfecfc2729fbe8cca0a0d1
 2019-10-10 13:38:13 -07:00
Tao Bao
549325427b Merge "AVB: decouple vbmeta.img from recovery.img for non-A/B devices" 2019-10-10 20:18:35 +00:00
Lev Proleev
482ac1b83f [automerger skipped] Merge "Add NeuralNetworks HAL v1.3" am: 4b49e75a40 am: 5195c4cf99 am: 165a75575f 
am: 2d1b1b2ca6 -s ours
am skip reason: change_id Id1baae2c00a38e5327ab144db76189f53bcb04cf with SHA1 fde53f4e3e is in history

Change-Id: Ibf576102a0642b1cfd8605fa2f7261a54d20555f
 2019-10-10 13:08:03 -07:00
Colin Cross
bf086436b0 Remove stray ZIPALIGN_PAGE_ALIGN_FLAGS 
Iae26e4676c29c68fa3f76187512c82786bfa0522 removed the definition
of ZIPALIGN_PAGE_ALIGN_FLAGS in favor of always using the -p flag,
but left accidentaly left one usage.  Replace it with -p.

Bug: 141212627
Test: m checkbuild
Change-Id: Ica69d9195426f8f30039da211ed1a0ad5dffe8e8
 2019-10-10 12:52:13 -07:00
Steven Moreland
bf4fd54cee mainline_system: libhwbinder/libhidltransport 
Bug: 135686713
Test: artifact whitelist requirement no longer complaining
Change-Id: Ia142f8e67c31f66f86386b65e009d4faee502c11
Merged-In: Ia142f8e67c31f66f86386b65e009d4faee502c11
 2019-10-10 19:51:46 +00:00
David Anderson
7a33fce8f1 Merge "Add boot@1.1 to VNDK" am: 5ff715d088 am: f44a1e6c67 
am: d4976a85ed

Change-Id: Ib60ac6e2359829efbaf78e90ab10d6b03d7f2f73
 2019-10-10 12:46:01 -07:00