Nick Kralevich
0933e17bb6
am cd8f838d
: am c85364c9
: am 5f79bcdd
: Merge changes from topic \'file_contexts.bin\'
...
* commit 'cd8f838d079b38d8c125396f7932c4be24063193':
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
2015-08-13 00:10:36 +00:00
Nick Kralevich
cd8f838d07
am c85364c9
: am 5f79bcdd
: Merge changes from topic \'file_contexts.bin\'
...
* commit 'c85364c9c91961461a6d81a37c8b30b34b02383b':
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
2015-08-13 00:01:09 +00:00
Nick Kralevich
5f79bcdd07
Merge changes from topic 'file_contexts.bin'
...
* changes:
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
2015-08-12 23:46:28 +00:00
Ian Pedowitz
01090a42ef
am 28c3907d
: am 35bdf149
: am 7e8d6f25
: am 0fd879cd
: am a0372e20
: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
...
* commit '28c3907d695786f19b6e1e8b96d4484b28a4a79b':
Removing VisualizationWallpapers as it does not comply with API 23 rules
2015-08-12 20:56:34 +00:00
Ian Pedowitz
28c3907d69
am 35bdf149
: am 7e8d6f25
: am 0fd879cd
: am a0372e20
: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
...
* commit '35bdf149e7deeea5eebb61ebd3e64261f5eb506d':
Removing VisualizationWallpapers as it does not comply with API 23 rules
2015-08-12 20:49:10 +00:00
Ian Pedowitz
0fd879cd65
am a0372e20
: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
...
* commit 'a0372e20a24283002c2d27b372194d88e1983a3f':
Removing VisualizationWallpapers as it does not comply with API 23 rules
2015-08-12 20:17:30 +00:00
Mike Dodd
a1e7e8a5f6
am 97bb3986
: am e4f29f0b
: am 00e15cd5
: am 09baf014
: am 745d11cc
: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
...
* commit '97bb3986f5ed7cb0adaf4fbd9a7ce5ad926d4fcf':
Revert "Include new AOSP messaging app in base builds."
2015-08-12 19:48:55 +00:00
Ian Pedowitz
a0372e20a2
Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
2015-08-12 19:41:54 +00:00
Mike Dodd
97bb3986f5
am e4f29f0b
: am 00e15cd5
: am 09baf014
: am 745d11cc
: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
...
* commit 'e4f29f0bb76a2f581714c082270cee7964d7004e':
Revert "Include new AOSP messaging app in base builds."
2015-08-12 19:18:16 +00:00
Mike Dodd
09baf01491
am 745d11cc
: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
...
* commit '745d11ccd077060b5d3b0e3e53682e8c1f85dd66':
Revert "Include new AOSP messaging app in base builds."
2015-08-12 18:58:59 +00:00
Mike Dodd
745d11ccd0
Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
2015-08-12 18:53:47 +00:00
Mike Dodd
018500efea
Revert "Include new AOSP messaging app in base builds."
...
This reverts commit a8b0905e16
.
Change-Id: Ia8b8eaf6576937907b073ad97593440e114c0b6f
2015-08-12 18:48:45 +00:00
Mike Dodd
c370bb53f6
am 2cd27c35
: am 71fde725
: am af172736
: am d95990e6
: am 02389bf9
: Merge "Include new AOSP messaging app in base builds." into mnc-dev
...
* commit '2cd27c35b4b0c86b91e734ce79bbbe2bc67f7e22':
Include new AOSP messaging app in base builds.
2015-08-12 18:22:06 +00:00
Mike Dodd
2cd27c35b4
am 71fde725
: am af172736
: am d95990e6
: am 02389bf9
: Merge "Include new AOSP messaging app in base builds." into mnc-dev
...
* commit '71fde725b61abc637aab6be41a50353702775431':
Include new AOSP messaging app in base builds.
2015-08-12 18:16:07 +00:00
Ian Pedowitz
68c62e78ad
Removing VisualizationWallpapers as it does not comply with API 23 rules
...
Bug: 23021372
Change-Id: Ib985ac99bd9068c21f8a1c48e77c72426f69ea79
2015-08-12 11:11:55 -07:00
Mike Dodd
d95990e685
am 02389bf9
: Merge "Include new AOSP messaging app in base builds." into mnc-dev
...
* commit '02389bf940f751ffb85c8c2187a7039f0c18dad1':
Include new AOSP messaging app in base builds.
2015-08-12 17:49:48 +00:00
Mike Dodd
02389bf940
Merge "Include new AOSP messaging app in base builds." into mnc-dev
2015-08-12 17:01:24 +00:00
Ian Pedowitz
eef23a78b8
am 58251fe4
: resolved conflicts for merge of 87eb4007
to mnc-dr-dev-plus-aosp
...
* commit '58251fe44d120b284bcdc47c3f28fbdfa6fb524d':
Increasing arm(64)? emulator partition sizes to 1.5GB
2015-08-11 23:14:09 +00:00
Ian Pedowitz
58251fe44d
resolved conflicts for merge of 87eb4007
to mnc-dr-dev-plus-aosp
...
Change-Id: I7cf9b0153457f9cfba93966db78e0c04b5d216aa
2015-08-11 15:41:19 -07:00
Ian Pedowitz
c055f9b51a
am e5a63158
: Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev
...
* commit 'e5a631585a7b07c329f9ada04c99ed04b6c16b62':
Increasing arm(64)? emulator partition sizes to 1.5GB
2015-08-11 21:59:25 +00:00
Mike Dodd
a8b0905e16
Include new AOSP messaging app in base builds.
...
b/23110861
Change-Id: I365bedc809425c901982f867e671070344d1112b
2015-08-11 13:14:09 -07:00
Ian Pedowitz
4e0d34c7c7
Increasing arm(64)? emulator partition sizes to 1.5GB
...
Bug: 23093319
Change-Id: I5e493ef4715cee96ae6ab40d6415f5330075fad6
2015-08-11 12:53:39 -07:00
Ian Pedowitz
8fb75ec37d
am 35abe706
: am c7e051e0
: am 112f4c07
: am 0150dae6
: am 073f74d9
: Merge "Increasing x86 emulator system partition size" into mnc-dev
...
* commit '35abe70636009dfec96a20efc9f81c5eb907c7a2':
Increasing x86 emulator system partition size
2015-08-11 19:46:26 +00:00
Ian Pedowitz
35abe70636
am c7e051e0
: am 112f4c07
: am 0150dae6
: am 073f74d9
: Merge "Increasing x86 emulator system partition size" into mnc-dev
...
* commit 'c7e051e0b1a7956bddcf8955ef837f2c1acff4af':
Increasing x86 emulator system partition size
2015-08-11 19:39:45 +00:00
Ian Pedowitz
0150dae615
am 073f74d9
: Merge "Increasing x86 emulator system partition size" into mnc-dev
...
* commit '073f74d90853b39de32308fa3eeab9aa8998bd69':
Increasing x86 emulator system partition size
2015-08-11 19:18:13 +00:00
Ian Pedowitz
5394e8bd12
Increasing x86 emulator system partition size
...
Seems sdk_google_phone_x86 is building larger than 750MB
Bug: 23093319
Change-Id: Ib3ddbbb96a9dcea02eb6da7362ac0142bdfae4de
2015-08-11 03:39:34 +00:00
Furquan Shaikh
16853a6c35
am 5620d94c
: am 449b8a06
: am c4904316
: am ffe86de5
: Merge "vboot_signer: Add kernel subkey required for signing kernel keyblock" into mnc-dr-dev
...
* commit '5620d94c5fd5a249f1805ca7acd5fe22930ddef4':
vboot_signer: Add kernel subkey required for signing kernel keyblock
2015-08-10 12:59:13 +00:00
Furquan Shaikh
5620d94c5f
am 449b8a06
: am c4904316
: am ffe86de5
: Merge "vboot_signer: Add kernel subkey required for signing kernel keyblock" into mnc-dr-dev
...
* commit '449b8a0664db86e9a556c323e3f4720303abae95':
vboot_signer: Add kernel subkey required for signing kernel keyblock
2015-08-10 12:53:56 +00:00
Furquan Shaikh
e8c212235f
vboot_signer: Add kernel subkey required for signing kernel keyblock
...
Currently, the keyblock was being generated using
data_key.vbprivk. However, we need to use kernel_subkey.vbprivk for
kernel keyblock generation. This did not create any issues until now
because dev-mode just throws a message saying that keyblock is
invalid. But, normal-mode does not boot if keyblock is
invalid. Add extra parameter for passing in kernel subkey to
vboot_signer script.
TEST="make bootimage-nodeps" generates correctly signed
boot.img. Verified that the image boots fine in normal mode.
Change-Id: I0fc2183b466e34ddf1d98c9532072548504fcec4
Signed-off-by: Furquan Shaikh <furquan@google.com >
2015-08-07 12:01:20 -07:00
Roozbeh Pournader
315890973d
Remove mention of EXTENDED_FONT_FOOTPRINT.
...
This has been a null operation for a while, as devices are on the
extended font footprint by default.
Bug: 21785576
Change-Id: I884752876fa529b9ff29b14d08b0e9e618fa7348
2015-08-06 16:45:30 -07:00
Paul Miller
ae61c885c6
am 450c53ac
: am fa977ff3
: am 09185f5a
: Merge "Replace Browser with Browser2 and BookmarkProvider"
...
* commit '450c53ace6a8c61f0fdf2058307b5e04db617f49':
Replace Browser with Browser2 and BookmarkProvider
2015-08-04 23:43:29 +00:00
Paul Miller
450c53ace6
am fa977ff3
: am 09185f5a
: Merge "Replace Browser with Browser2 and BookmarkProvider"
...
* commit 'fa977ff366f54c6ae244f3ba99e3481f7d29796d':
Replace Browser with Browser2 and BookmarkProvider
2015-08-04 23:35:33 +00:00
Stephen Smalley
d3a803e668
build: switch over to file_contexts.bin only
...
Change all uses of the file_contexts file to use the
file_contexts.bin file instead.
Depends on
I75a781100082c23536f70ce3603f7de42408b5ba
I43806d564b83d57f05f5c36c8eba7b1ff4831b04
Id560d093440a2aba99cef28c20133b35feebf950
I15660f4b3e4c5cb8ae0ec1498c74d6fcbb9a0400
Change-Id: Iaf8c4b2e420f610425a07f48db7af32bda3f5b3a
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov >
2015-08-04 14:59:06 -04:00
Richard Haines
a65637d230
Update embedded.mk to support file_contexts.bin
...
This change supports external/libselinux changes to implement
a PCRE formatted binary file_contexts file.
Change-Id: I75a781100082c23536f70ce3603f7de42408b5ba
Signed-off-by: Richard Haines <richard_c_haines@btinternet.com >
2015-08-04 14:53:12 -04:00
Paul Miller
4271a9b3ed
Replace Browser with Browser2 and BookmarkProvider
...
Browser is going away. Browser2 is a tiny, WebView-based browser for
testing purposes. BookmarkProvider will take over the
"com.android.browser;browser" authorities and return empty Cursors for
all queries. See packages/apps/Browser2/README for how to obtain a
regular browser.
BUG:19351071
Change-Id: I8af605ec65a1185923598ba553a98e3fd9b887db
2015-07-30 18:12:21 -07:00
Ying Wang
3c133ddcdf
am 4cdbb26c
: am 86162e64
: am b1c0a86f
: Merge "Bump generic_arm64 system partition size to 1200 MB."
...
* commit '4cdbb26ca2c0174c6846e1a8a9cf624390c616e9':
Bump generic_arm64 system partition size to 1200 MB.
2015-07-27 19:31:22 +00:00
Ying Wang
4cdbb26ca2
am 86162e64
: am b1c0a86f
: Merge "Bump generic_arm64 system partition size to 1200 MB."
...
* commit '86162e6439e8035494b187efbf138d9cabae92fb':
Bump generic_arm64 system partition size to 1200 MB.
2015-07-27 19:19:15 +00:00
Ying Wang
97ba885a7b
Bump generic_arm64 system partition size to 1200 MB.
...
Change-Id: I31740673829e578d7fc0edd895868bf1f21cfe15
2015-07-27 11:01:50 -07:00
Nick Kralevich
33ca9db5c5
am 17ca1f5d
: am 4a5f5a7b
: am a972891f
: Merge "file_contexts: Label /dev/ttyS2 as console_device"
...
* commit '17ca1f5d26aebd25fa89e86082d2fe423174aeae':
file_contexts: Label /dev/ttyS2 as console_device
2015-07-16 19:35:23 +00:00
Nick Kralevich
17ca1f5d26
am 4a5f5a7b
: am a972891f
: Merge "file_contexts: Label /dev/ttyS2 as console_device"
...
* commit '4a5f5a7b15e27ed159e2398c77de1de7f9fd4da9':
file_contexts: Label /dev/ttyS2 as console_device
2015-07-16 19:19:56 +00:00
Miodrag Dinic
df2620ada4
file_contexts: Label /dev/ttyS2 as console_device
...
This fixes the issue with the emulator "-shell" option.
Init tries to open the console which is passed through
the kernel androidboot.console property, but fails to
open it because "avc" denies it. Init only has permissions
to open console_device in rw mode. This ensures that
/dev/ttyS2 is properly labeled as console_device.
Replaced tabs with spaces.
Change-Id: I9ef94576799bb724fc22f6be54f12de10ed56768
2015-07-16 20:36:07 +02:00
Paul Crowley
e821d139ce
am 460a5abb
: am 70198185
: Merge "Build "secdiscard" for securely discarding data from flash devices." into mnc-dr-dev
...
* commit '460a5abbee35836f152a9be2fe11664e7bfa5432':
Build "secdiscard" for securely discarding data from flash devices.
2015-07-14 00:02:42 +00:00
Paul Crowley
7019818511
Merge "Build "secdiscard" for securely discarding data from flash devices." into mnc-dr-dev
2015-07-13 20:54:43 +00:00
dcashman
0ffa763c41
am 2a50b9b0
: am 2a3a2dc3
: Merge "Allow init to create /mnt/sdcard symlink." into mnc-dev
...
* commit '2a50b9b006b7d0a80ad75635e2709859c72070c6':
Allow init to create /mnt/sdcard symlink.
2015-07-06 16:55:06 +00:00
dcashman
2a50b9b006
am 2a3a2dc3
: Merge "Allow init to create /mnt/sdcard symlink." into mnc-dev
...
* commit '2a3a2dc33c7e5cbd9da95ece2eec0c100e9fbc14':
Allow init to create /mnt/sdcard symlink.
2015-07-06 16:41:43 +00:00
dcashman
19eeccdaf2
Allow init to create /mnt/sdcard symlink.
...
Addresses the following denial:
avc: denied { create } for pid=1 comm="init" name="sdcard" scontext=u:r:init:s0 tcontext=u:object_r:tmpfs:s0 tclass=lnk_file permissive=0
Bug: 22084499
Change-Id: Icffef8330d07b00f36fda11374e39e0df7181ca3
2015-07-01 09:14:18 -07:00
Paul Crowley
36e792b894
Build "secdiscard" for securely discarding data from flash devices.
...
Bug: 19706593
Change-Id: I073b7b39f25b054abdf2b983a63d029d690970a9
(cherry picked from commit 54a28654e6
)
2015-06-30 15:40:00 +01:00
Michael Wright
57ec4c9bab
am b20475db
: am 7371a7a5
: Add hid command to base build
...
* commit 'b20475db100bd21e98239c1ce6f7ef2676e6d0e4':
Add hid command to base build
2015-06-24 17:26:33 +00:00
Michael Wright
b20475db10
am 7371a7a5
: Add hid command to base build
...
* commit '7371a7a5b596f96f8bebf157a7dc261c545a2315':
Add hid command to base build
2015-06-24 17:13:52 +00:00
Michael Wright
7371a7a5b5
Add hid command to base build
...
Bug: 21662862
Change-Id: I11ed67b8f0efd1232ddfbb6e0a5f4bdbb065397e
2015-06-24 15:55:47 +01:00