Justin Klaassen
fdb22ae470
am ae71306a: Merge "Revert "Revert "Switch from Calculator to ExactCalculator""" into mnc-dr-dev-plus-aosp
...
* commit 'ae71306af68ab60a3e006deb8e4a0f48c3d43ea5':
Revert "Revert "Switch from Calculator to ExactCalculator""
2015-08-17 18:43:27 +00:00
Justin Klaassen
45249ff5d1
Revert "Revert "Switch from Calculator to ExactCalculator""
...
This reverts commit 455ffaafcd
.
Bug: 23186109
Change-Id: If768c4c85b8dbf1ffe881eca3412d92150fb019f
2015-08-13 19:22:06 +00:00
Mike Dodd
0477cbe63d
am 742463b3: am 689c097e: am 148839b2: am 17b06910: am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
...
* commit '742463b30fb0f45bd43bf8e0c1c799c9bee35303':
Include new AOSP messaging app in base AOSP telephony builds.
2015-08-13 15:50:24 +00:00
Mike Dodd
742463b30f
am 689c097e: am 148839b2: am 17b06910: am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
...
* commit '689c097eb3ad838f18fd13493cc0d73260f1137e':
Include new AOSP messaging app in base AOSP telephony builds.
2015-08-13 15:43:39 +00:00
Mike Dodd
17b0691076
am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
...
* commit '5bf35d0685ba62ded55cc63f3dd2f23b82cc645d':
Include new AOSP messaging app in base AOSP telephony builds.
2015-08-13 15:22:44 +00:00
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
Mike Dodd
f29b5bd380
Include new AOSP messaging app in base AOSP telephony builds.
...
b/23110861
Change-Id: I31ba32f3341c77ba6eb083a189dffa1a08c6c8d4
2015-08-12 15:44:04 -07: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
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
a8b0905e16
Include new AOSP messaging app in base builds.
...
b/23110861
Change-Id: I365bedc809425c901982f867e671070344d1112b
2015-08-11 13:14:09 -07: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
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
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
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
Bo Hu
61749e2dbc
am 232a195a: am dc175a0f: am 3d81b7d6: Merge "Add android.hardware.ethernet.xml for ranchu targets"
...
* commit '232a195a68925fa534a553ca8516a4f41cd9b394':
Add android.hardware.ethernet.xml for ranchu targets
2015-06-23 07:12:37 +00:00
Bo Hu
232a195a68
am dc175a0f: am 3d81b7d6: Merge "Add android.hardware.ethernet.xml for ranchu targets"
...
* commit 'dc175a0fa8641552696b25a59f99f58942b7c2d3':
Add android.hardware.ethernet.xml for ranchu targets
2015-06-23 07:00:39 +00:00
Miroslav Tisma
39b59502c7
Add android.hardware.ethernet.xml for ranchu targets
...
This commit adds android.hardware.ethernet.xml file for ethernet
permission to PRODUCT_COPY_FILES which will be copied to
/system/etc/permission folder on the target. Reason for adding
this permission file is for enabling the ethernet and having
functional networking until RIL backend support in ranchu is
implemented.
This requires dhcpcd_eth0 service definition in init.ranchu.rc.
Architectures that use goldfish emulator do not need ethernet
support, because networking is provided by RIL.
Change-Id: I7972f80cf78c0fdecf3fde45bf018230bbcefd38
2015-06-19 11:35:38 +02:00
Paul Crowley
4fbba49cfc
Merge "Build "secdiscard" for securely discarding data from flash devices."
2015-06-17 22:37:16 +00:00
Ying Wang
7af2b076bf
am 138fb205: am 1010cc81: am c5672344: Merge "Really include drawables for all densities."
...
* commit '138fb205d5f89729043caf1b05382fbdd284c1d7':
Really include drawables for all densities.
2015-06-17 21:52:21 +00:00
Ying Wang
138fb205d5
am 1010cc81: am c5672344: Merge "Really include drawables for all densities."
...
* commit '1010cc8123893bc154ae1b53b2ab559dc6896240':
Really include drawables for all densities.
2015-06-17 21:39:22 +00:00
Ying Wang
f054bd34b6
Really include drawables for all densities.
...
Previously with "PRODUCT_AAPT_CONFIG := normal" resource with modifier
"small" isn't included.
Bug: 21643610
Change-Id: I53940d716fb9705462b1abb882e04103e211f8af
2015-06-17 21:18:09 +00:00
Tim Kilbourn
5b1d9f78b1
Add input.evdev.default to base.mk
...
The new inputflinger requires it (as of now), so it doesn't make sense
to have it included only in generic_no_telephony.mk.
Change-Id: I8e34c8d75839e1bfe31bf29fe22a2fc6111b44c1
2015-06-10 16:27:47 -07:00
Ying Wang
8c7dd85758
am bc0f1f56: am ac3f88d8: am 080f57ae: Merge "Remove the unnecessary full_x86_64 and full_mips64."
...
* commit 'bc0f1f565143a676dfdb5e2234c94e7da3116a0f':
Remove the unnecessary full_x86_64 and full_mips64.
2015-06-08 20:21:12 +00:00
Ying Wang
bc0f1f5651
am ac3f88d8: am 080f57ae: Merge "Remove the unnecessary full_x86_64 and full_mips64."
...
* commit 'ac3f88d8a2812cd2134f9b67ec4a928d886a4eb6':
Remove the unnecessary full_x86_64 and full_mips64.
2015-06-08 20:08:09 +00:00
Ying Wang
0a76df5ce7
Remove the unnecessary full_x86_64 and full_mips64.
...
For historical reason, the aosp_* products were named full_*.
We keep the full, full_x86 and full_mips in case some tools still
reference these legacy names; But no reason the have the full_* product
names for the new 64-bit archs.
Change-Id: I240ed0c6ded0ded2d80603bd0c5ff24750999afc
2015-06-08 11:57:26 -07:00
Paul Crowley
54a28654e6
Build "secdiscard" for securely discarding data from flash devices.
...
Bug: 19706593
Change-Id: I073b7b39f25b054abdf2b983a63d029d690970a9
2015-06-04 09:59:33 +01:00
Yorke Lee
bc4e48ff39
am 24deb5d0: am 05f9da8e: Merge "Add \'adb shell telecom\' command to packages list" into mnc-dev
...
* commit '24deb5d08f7e258af3e48afc3068be9786462a3d':
Add 'adb shell telecom' command to packages list
2015-06-03 22:27:03 +00:00
Yorke Lee
a1e1d9cea5
Add 'adb shell telecom' command to packages list
...
Change-Id: I193b54dd9f4511eb7959c5dbbf38f90267b8fcc9
2015-06-03 13:57:33 -07:00