Commit Graph

34862 Commits

Author SHA1 Message Date
Adam Seaton 84888652e0 [DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev
b/34345751

Change-Id: Ie5bd1ced37f4ca9642c572ca0e3e0008bf1639e8
2017-01-17 11:29:08 -08:00
Adam Seaton 28dae4b62b [DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev
b/34345751

Change-Id: I001816a1f60aa4229b8fb96a96737bcebf416cef
2017-01-17 11:28:06 -08:00
Adam Seaton 3597d69559 [DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev
b/34345751

Change-Id: Ib1ea316e49631a4c5294db5f6260b5fdd364baa6
2017-01-17 11:25:07 -08:00
Adam Seaton 6cece247c4 [DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev
b/34345751

Change-Id: I159221baf765da3f31d5f7e92e4a899c17300eae
2017-01-17 11:23:27 -08:00
Sandeep Patil e4ade08f63 SELinux: split service_contexts into platform and non-platform components.
Bug: 33746484
Test: Successfully boot with original service and property contexts.
      Successfully boot with split serivce and property contexts.

Change-Id: I6fec8d9b3023de09d69198c9e72311a1f03fe844
Signed-off-by: Sandeep Patil <sspatil@google.com>
2017-01-17 04:39:00 +00:00
Lingfeng Yang 396dde6167 Allow /dev/goldfish_sync am: bdceef4325 am: 9f7ef7bed8
am: 91fcc52b82

Change-Id: Ic4d97f715809c19afd69d836f335b36654b50054
2017-01-17 01:13:34 +00:00
Lingfeng Yang 4b992a3763 Allow /dev/goldfish_sync am: bdceef4325 am: 60a8826f53
am: f17d83fd89

Change-Id: Ib991e1300692bb3dc8a14ee63d13a53012624000
2017-01-17 01:13:04 +00:00
Lingfeng Yang 91fcc52b82 Allow /dev/goldfish_sync am: bdceef4325
am: 9f7ef7bed8

Change-Id: Ie8c4e36d2285789379367ffe134979687c331145
2017-01-17 00:51:32 +00:00
Lingfeng Yang f17d83fd89 Allow /dev/goldfish_sync am: bdceef4325
am: 60a8826f53

Change-Id: I8739e950a1a6bbbd77ce0c6a320ff5d41976214b
2017-01-17 00:50:29 +00:00
Lingfeng Yang 60a8826f53 Allow /dev/goldfish_sync
am: bdceef4325

Change-Id: I00c018ea4dc553bfceebc3c44be6617c1813e954
2017-01-17 00:45:28 +00:00
Lingfeng Yang 9f7ef7bed8 Allow /dev/goldfish_sync
am: bdceef4325

Change-Id: Iaa5b0fe304e3b65a4e58949d9c8fc7b3ce5f83ec
2017-01-17 00:45:28 +00:00
Tao Bao cac5423a23 Merge "releasetools: Replace print stmt with print()." am: 4a0b494eea am: 0e2a0fd76c am: 3cf2daceb6
am: 6074106214

Change-Id: I1a1df156a20cd8f88c908445e4e6e74036865e46
2017-01-14 15:58:02 +00:00
Tao Bao 6074106214 Merge "releasetools: Replace print stmt with print()." am: 4a0b494eea am: 0e2a0fd76c
am: 3cf2daceb6

Change-Id: I43400f1b2cc61596ee81e9cf1c3955cd76d6625d
2017-01-14 15:46:56 +00:00
Tao Bao 3cf2daceb6 Merge "releasetools: Replace print stmt with print()." am: 4a0b494eea
am: 0e2a0fd76c

Change-Id: I4efbff199c3a44ddc33a0e46cdd64a6c949c5262
2017-01-14 15:43:26 +00:00
Tao Bao 0e2a0fd76c Merge "releasetools: Replace print stmt with print()."
am: 4a0b494eea

Change-Id: I8823ee5f778c3017d85c1fa6d0f159ad85178314
2017-01-14 15:40:27 +00:00
Tao Bao 4a0b494eea Merge "releasetools: Replace print stmt with print()." 2017-01-14 15:36:41 +00:00
Tao Bao 6210565f93 Merge "releasetools: Delete the obsolete --aslr_mode/-a flag." am: ecbb31e8c4 am: 82c2fb0e21 am: 6c828d25b8
am: 60f07ba750

Change-Id: I3ce58360ebff8c2503da288cb300b03ce3e32d5f
2017-01-14 08:36:26 +00:00
Tao Bao 60f07ba750 Merge "releasetools: Delete the obsolete --aslr_mode/-a flag." am: ecbb31e8c4 am: 82c2fb0e21
am: 6c828d25b8

Change-Id: If4a6be8f42518f73b90a5ed28e84f6d0952e3966
2017-01-14 08:19:14 +00:00
Tao Bao 6c828d25b8 Merge "releasetools: Delete the obsolete --aslr_mode/-a flag." am: ecbb31e8c4
am: 82c2fb0e21

Change-Id: If3acd29bc8854d1c1e2b53216f5e984cdd46c0e9
2017-01-14 08:16:43 +00:00
Tao Bao 82c2fb0e21 Merge "releasetools: Delete the obsolete --aslr_mode/-a flag."
am: ecbb31e8c4

Change-Id: I648906871d064a309b21eca4c8718bb15381f086
2017-01-14 08:13:43 +00:00
Treehugger Robot ecbb31e8c4 Merge "releasetools: Delete the obsolete --aslr_mode/-a flag." 2017-01-14 08:08:30 +00:00
Tao Bao 89fbb0f6d5 releasetools: Replace print stmt with print().
So that it's compatible with Python 3.

Test: pylint --pylint=pylintrc

Change-Id: If06c135a492c94bedd713c8cbdf03155a502d5cd
2017-01-13 14:55:14 -08:00
Tao Bao 2a0d1da4d9 releasetools: Delete the obsolete --aslr_mode/-a flag.
It was added in commit 96be7205dc
("Working ASLR implementation.") in 2010, and removed in commit
1807e700a5 ("don't generate retouch
commands in OTA scripts") in 2012.

Remove the obsolete --aslr_mode flag.

Test: ota_from_target_files.py still works (by generating incremental
      and full OTAs respectively).

Change-Id: I6d8e62730ac192f3574d484c4a4b9b43b4ee0a9e
2017-01-13 22:46:27 +00:00
Chen Xu 77f8aa41e6 Merge "Include CarrierDefaultApp to the img" am: 5e6ce5f504 am: 10253bbea9 am: 189298d536
am: 6a38a9db03

Change-Id: I85de6fa97af1b7d0105276875d6c5a198df49258
2017-01-13 22:17:05 +00:00
Chen Xu 6a38a9db03 Merge "Include CarrierDefaultApp to the img" am: 5e6ce5f504 am: 10253bbea9
am: 189298d536

Change-Id: Ic2e997f630717a548dbf7dc1d19bf785020b74ed
2017-01-13 22:12:34 +00:00
Chen Xu 189298d536 Merge "Include CarrierDefaultApp to the img" am: 5e6ce5f504
am: 10253bbea9

Change-Id: If9e2c093b2a0802c639b1a0d88e913300e94a3c0
2017-01-13 22:10:32 +00:00
Chen Xu 10253bbea9 Merge "Include CarrierDefaultApp to the img"
am: 5e6ce5f504

Change-Id: Ibe79b9b961f6a04535e2f34e3da2ef1e3367a9d9
2017-01-13 22:08:32 +00:00
Christopher Tate d68045446f Add framework sysconfig content to the build
Bug 30953212

Change-Id: Ib5e45b9f579bc7c5dcef2384422bc18b4d22fd82
2017-01-13 14:06:43 -08:00
Connor O'Brien 3dceff7a20 Merge "Pass flash erase & logical block size to mke2fs" 2017-01-13 22:03:35 +00:00
Chen Xu 5e6ce5f504 Merge "Include CarrierDefaultApp to the img" 2017-01-13 21:59:23 +00:00
Joachim Sauer 4f5091d44f Merge "Add java.time packages to whitelist." am: 4dbe67cddc am: 4f60acde39 am: 95874afdfb
am: 8d9300bbc5

Change-Id: Ibcb3d995791e375b30d03e2a3c22a7a271e70c4d
2017-01-13 21:41:59 +00:00
Joachim Sauer 8d9300bbc5 Merge "Add java.time packages to whitelist." am: 4dbe67cddc am: 4f60acde39
am: 95874afdfb

Change-Id: I1d04b052911e34f90cded439ad7bdaa7f534a825
2017-01-13 21:13:21 +00:00
Connor O'Brien 20f08c3e16 Pass flash erase & logical block size to mke2fs
This information can be used to tune ext4 stripe and stride in the
userdata partition for better performance

Test: Build & flash userdata, confirm correct stripe & stride values
Bug: 33243520
Merged-In: Ia97cdd2d0239c3484b895fce49299f692ef911d8
Change-Id: Ia97cdd2d0239c3484b895fce49299f692ef911d8
Signed-off-by: Connor O'Brien <connoro@google.com>
2017-01-13 12:17:05 -08:00
fionaxu 94e974dece Include CarrierDefaultApp to the img
Bug: 30958215
Test: Manual test
Change-Id: I67e235028b73513954b7d5f4fe2623700d176e87
2017-01-13 11:49:58 -08:00
Connor O'Brien e9ee68d841 Pass flash erase & logical block size to mke2fs
This information can be used to tune ext4 stripe and stride in the
userdata partition for better performance

Test: Build & flash userdata, confirm correct stripe & stride values
Bug: 33243520
Change-Id: Ia97cdd2d0239c3484b895fce49299f692ef911d8
Signed-off-by: Connor O'Brien <connoro@google.com>
2017-01-13 11:32:02 -08:00
Joachim Sauer 95874afdfb Merge "Add java.time packages to whitelist." am: 4dbe67cddc
am: 4f60acde39

Change-Id: I792adfb7df7dba66236c15956c899a5b36a61a2f
2017-01-13 10:33:56 +00:00
Joachim Sauer 4f60acde39 Merge "Add java.time packages to whitelist."
am: 4dbe67cddc

Change-Id: I93342090e16090e73dd2377f027deedd321849d8
2017-01-13 10:25:46 +00:00
Joachim Sauer 4dbe67cddc Merge "Add java.time packages to whitelist." 2017-01-13 10:18:20 +00:00
Lingfeng Yang bdceef4325 Allow /dev/goldfish_sync
Change-Id: I41883eafd2b261d000c41eaf3ba04af7e2b89349
(cherry picked from commit 5d6ae8a3d467dd23a2f09a96bc4fdbea2d0353a2)
2017-01-12 11:35:53 -08:00
Bjoern Johansson 8b7110b185 Switch Gallery to Gallery2 app for emulator images
Change gallery application from Gallery to Gallery2. Gallery does not
seem to have been changed in a long time and AOSP images for devices use
Gallery2 so emulator images should match that.

BUG: 29334386
Change-Id: I1054af38aa1c100cdb671688e2d7aaaf882753af
(cherry picked from commit ea9467cd003f51e83e497b6fbd1a4abd9705be29)
2017-01-12 17:13:02 +00:00
Jack He 1cb1671b3d Merge "Add mk file parsers to support build variables required by system/bt" am: 7b66d28b25 am: dfa69daccc am: 258cf95456
am: 57563d7ed9

Change-Id: I2886280041ef77b15b40db172625634c24b19f6d
2017-01-12 08:58:44 +00:00
Jack He 57563d7ed9 Merge "Add mk file parsers to support build variables required by system/bt" am: 7b66d28b25 am: dfa69daccc
am: 258cf95456

Change-Id: If1994daa7540f02aff3712f7b422f034d6c4ee5d
2017-01-12 08:52:13 +00:00
Jack He 258cf95456 Merge "Add mk file parsers to support build variables required by system/bt" am: 7b66d28b25
am: dfa69daccc

Change-Id: Ie7e81cfe290214734db6c09c42f4aba8d2cd2be8
2017-01-12 08:46:13 +00:00
Jack He dfa69daccc Merge "Add mk file parsers to support build variables required by system/bt"
am: 7b66d28b25

Change-Id: I188658d0741722e78ed2b636e04830c0870ca728
2017-01-12 08:40:13 +00:00
Treehugger Robot 7b66d28b25 Merge "Add mk file parsers to support build variables required by system/bt" 2017-01-12 08:31:26 +00:00
Jack He da214cd572 Add mk file parsers to support build variables required by system/bt
* BtConfigIncludeDir: Path to device specific config headers
                      BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR
* BTHcilpIncluded: Path to Hcilp headers
                   BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED
* BtHciUseMct: Whether MCT is used
               BLUETOOTH_HCI_USE_MCT

Bug: 32958753
Test: Code compilation, no user visible effects

Change-Id: I94cad65c77464e5b467abee05951ddfd35b9f27d
2017-01-11 17:11:32 -08:00
Colin Cross baefdc1a96 Merge "Don't run find on directories that don't exist" am: c1df498f0c am: a8839ac623 am: 3432bf504c
am: 5761aa2015

Change-Id: I5c8cc32c1aefffd46e642eb50cf0c54ececc6d86
2017-01-12 00:09:29 +00:00
Colin Cross 5761aa2015 Merge "Don't run find on directories that don't exist" am: c1df498f0c am: a8839ac623
am: 3432bf504c

Change-Id: I38076336d0383af879206995be6b3feef73b2a5f
2017-01-12 00:04:10 +00:00
Colin Cross 3432bf504c Merge "Don't run find on directories that don't exist" am: c1df498f0c
am: a8839ac623

Change-Id: Ia8043ec41fd4589a300aa2780e775d003e0f2d0a
2017-01-11 23:59:39 +00:00
Colin Cross a8839ac623 Merge "Don't run find on directories that don't exist"
am: c1df498f0c

Change-Id: If0792cb62b7e666ca700dbb9b0dbf4b3d6d3cd02
2017-01-11 23:54:27 +00:00