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
Justin Klaassen
53c5891460
Revert "Revert "Switch from Calculator to ExactCalculator""
...
This reverts commit 455ffaafcd
.
Bug: 23186109
Change-Id: If768c4c85b8dbf1ffe881eca3412d92150fb019f
2015-08-13 12:19:38 -07: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
Mike Dodd
44af8f9655
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:21:46 +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
420662b9cd
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:00:36 +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
Ian Pedowitz
3584355bb9
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 19:51:22 +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
5e1a991973
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:54 +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
5d5a3e0d90
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:35:04 +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
Paul Miller
15a45a6ea7
am fa977ff3
: am 09185f5a
: Merge "Replace Browser with Browser2 and BookmarkProvider"
...
* commit 'fa977ff366f54c6ae244f3ba99e3481f7d29796d':
Replace Browser with Browser2 and BookmarkProvider
2015-08-04 23:35:29 +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
Jeff Sharkey
e95d555c12
am c79068be
: am c2fb6e10
: Merge "Both ext4 and f2fs binaries for adoptable storage." into mnc-dev
...
* commit 'c79068be5c90aefedcb2e171e8700eace4e8f05c':
Both ext4 and f2fs binaries for adoptable storage.
2015-05-29 05:15:59 +00:00
Jeff Sharkey
c2fb6e107d
Merge "Both ext4 and f2fs binaries for adoptable storage." into mnc-dev
2015-05-28 19:54:17 +00:00
bohu
9db8d53432
am bb1ead79
: am 1d8b2702
: Include fingerprintd on emulator images
...
* commit 'bb1ead7920ad5bb98d6989a763d242826663e241':
Include fingerprintd on emulator images
2015-05-28 02:38:04 +00:00
bohu
1d8b270267
Include fingerprintd on emulator images
...
Change-Id: I453d7d3fa3844bdb26c8279982b8b5b246032926
2015-05-27 17:53:11 -07:00
Jeff Sharkey
e819398870
Both ext4 and f2fs binaries for adoptable storage.
...
New adoptable storage feature can format media as either ext4 or
f2fs, so bring in both sets of binaries for typical products.
Bug: 20275581
Change-Id: I85380cbc8c06c958b66db879f63447ddac124cbf
2015-05-27 14:44:30 -07:00
bohu
dffeda6f2a
am ba90e314
: am ed6b6350
: Uses SDK specific feature lists for SDK system images
...
* commit 'ba90e314b136c24013a73528c028db35e51cf738':
Uses SDK specific feature lists for SDK system images
2015-05-23 00:02:57 +00:00
bohu
cf7da13202
am 00005546
: am 2913ecc2
: Merge "Replace Launcher2 by Launcher3 for SDK system images" into mnc-dev
...
* commit '000055468ef1c3cb43f04ab0ae2af3ffa1288318':
Replace Launcher2 by Launcher3 for SDK system images
2015-05-22 22:55:42 +00:00
bohu
ed6b6350ea
Uses SDK specific feature lists for SDK system images
...
The SDK system images does not have some features such as bluetooth;
From now on, it will use its own feature list from
device/generic/goldfish/data/etc/handheld_core_hardware.xml
bug: 21159206
Change-Id: If566d4d190dc307c6d16844dba0d17570f0ceebf
2015-05-22 15:38:13 -07:00
bohu
9b2323edf7
Replace Launcher2 by Launcher3 for SDK system images
...
Launcher2 is deprecated and should use Launcher3, as the latter
can handle higher resolution devices (such as Nexus 6).
Change-Id: I5215d87f8536869486bb0b6317ae382a21099925
2015-05-22 15:05:12 -07:00
Guang Zhu
7ebd604697
am 7b4d4b90
: am 7fda3158
: Merge "Revert "Replace Launcher2 with Launcher3"" into mnc-dev
...
* commit '7b4d4b9040562cd7284b4f9807af0154380a42cc':
Revert "Replace Launcher2 with Launcher3"
2015-05-22 16:50:45 +00:00
Guang Zhu
7fda31584f
Merge "Revert "Replace Launcher2 with Launcher3"" into mnc-dev
2015-05-22 02:12:40 +00:00
Guang Zhu
ed9edb9c29
Revert "Replace Launcher2 with Launcher3"
...
Bug: 21164174
This reverts commit d79778faf3
.
Change-Id: Ide6b2dc4c511a60bcdf22dd44369e3a9fa08d1af
2015-05-22 02:08:19 +00:00
Andres Morales
5ddb1a5234
am d57d6a23
: am 7451df69
: Merge "remove gatekeeper software module" into mnc-dev
...
* commit 'd57d6a235c1ac991bb7429b60751e4fc84b6b194':
remove gatekeeper software module
2015-05-21 19:10:17 +00:00
bohu
875025e5ce
am 0e9dc94f
: am d79778fa
: Replace Launcher2 with Launcher3
...
* commit '0e9dc94f26b1903b17c571ccaf274ebc5912e6af':
Replace Launcher2 with Launcher3
2015-05-21 19:10:16 +00:00
Andres Morales
7451df690c
Merge "remove gatekeeper software module" into mnc-dev
2015-05-21 18:27:52 +00:00
bohu
d79778faf3
Replace Launcher2 with Launcher3
...
Launcher2 is deprecated and should use Launcher3, as the latter
can handle higher resolution devices (such as Nexus 6).
Most importantly, Launcher3 is maintained.
Change-Id: I3a80f242af2baaebe90af93794b0ba5e249dbc7d
2015-05-21 08:16:14 -07:00
Andres Morales
f1d32a1e14
remove gatekeeper software module
...
now implemented directly in gatekeeperd binary
Change-Id: Iaeb8e97427dbcffd1356fa955d61af55e3e330ec
2015-05-18 09:24:44 -07:00
Kevin Cernekee
ed1710eb7b
README: Update docs
...
Add a pointer to the online signing document and delete some redundant
information. Update the "embedding" section and add more background info
on what it is used for. Eliminate references to $BUILD_SECURE which no
longer exists.
Change-Id: I6d971849cc21697de9cf4fd891423f331f083830
Signed-off-by: Kevin Cernekee <cernekee@google.com>
2015-05-15 14:37:33 -07:00
Neil Fuller
abf5ef8fdd
Merge "Add tzdatacheck to image"
2015-05-15 09:09:46 +00:00
Neil Fuller
affc8164ea
am b0bc4628
: am f9f9c3f3
: Merge "Add tzdatacheck to image" into mnc-dev
...
* commit 'b0bc462877f4c25a1a86a23c4b673bd75890976a':
Add tzdatacheck to image
2015-05-14 21:25:53 +00:00
Neil Fuller
84b983a7ef
Add tzdatacheck to image
...
Bug: 21110439
Bug: 19941636
(cherry picked from commit 7d18a68417
)
Change-Id: I29ab303d2695ba1cadf70c2d2f4440d34a8cede9
2015-05-14 12:02:58 +01:00
Neil Fuller
f9f9c3f31e
Merge "Add tzdatacheck to image" into mnc-dev
2015-05-14 10:15:01 +00:00
Neil Fuller
7d18a68417
Add tzdatacheck to image
...
Bug: 21110439
Bug: 19941636
Change-Id: I743236d9c7b433968865648ffae25451c6012a5f
2015-05-14 10:15:35 +01:00
Geoff Mendal
8bf68d59b7
am 06b07daa
: am 8788add7
: Add locales sq_AL, gu_IN, and pa_IN for mnc-{dev,release} Bug: 21095280
...
* commit '06b07daa70cfd10a8154769c895b05fe22a1e582':
Add locales sq_AL, gu_IN, and pa_IN for mnc-{dev,release} Bug: 21095280
2015-05-13 17:39:28 +00:00
Geoff Mendal
8788add72c
Add locales sq_AL, gu_IN, and pa_IN for mnc-{dev,release}
...
Bug: 21095280
2015-05-13 09:57:01 -07:00
Jeff Sharkey
f3d8574181
am 7d7dbece
: am 3ce2e60f
: Merge "New "sm" shell tool to call StorageManager." into mnc-dev
...
* commit '7d7dbece3a7cd3c63e7aec610754b7bd9153d9a2':
New "sm" shell tool to call StorageManager.
2015-05-13 05:48:44 +00:00
Jeff Sharkey
3ce2e60ffc
Merge "New "sm" shell tool to call StorageManager." into mnc-dev
2015-05-13 05:27:39 +00:00
Jeff Sharkey
dea22725d4
New "sm" shell tool to call StorageManager.
...
Bug: 19993667
Change-Id: I9021794eb6f69c7f53151a887a85788d315ab67d
2015-05-12 15:53:29 -07:00
Dan Albert
c6355b9464
Remove stlport from global package list.
...
This is now whitelisted per device.
Bug: http://b/15193147
Change-Id: I7fcd0891242fb552a17753b151cf431a398bbc44
(cherry picked from commit 0a93b56924
)
2015-05-08 09:56:56 -07:00
Robin Lee
54840d8906
am 55125372
: am 455ffaaf
: Revert "Switch from Calculator to ExactCalculator"
...
* commit '551253726f7c3c5e5ec475ce84749b1b9e9453cc':
Revert "Switch from Calculator to ExactCalculator"
2015-05-07 18:30:15 +00:00
Robin Lee
551253726f
am 455ffaaf
: Revert "Switch from Calculator to ExactCalculator"
...
* commit '455ffaafcd5b6d0296bfa6143baccb01c84e2382':
Revert "Switch from Calculator to ExactCalculator"
2015-05-07 17:49:30 +00:00
Dan Albert
3e6d7b145a
am 052b9c4d
: am 6a876676
: am 0e8413e4
: Merge "Remove stlport from global package list."
...
* commit '052b9c4d42c5bb69d889670a66ac4f2747d251dd':
Remove stlport from global package list.
2015-05-07 17:17:54 +00:00
Dan Albert
052b9c4d42
am 6a876676
: am 0e8413e4
: Merge "Remove stlport from global package list."
...
* commit '6a876676f02d51c3fc346e5fc4d7a4b656f39340':
Remove stlport from global package list.
2015-05-07 15:58:30 +00:00
Robin Lee
455ffaafcd
Revert "Switch from Calculator to ExactCalculator"
...
Temporary revert to get TT builds in shape.
This reverts commit 846505dc35
.
Bug: 20745303
Change-Id: Id3455cba38b7aabaffa63c8531a6430f69897c6e
2015-05-07 14:56:00 +00:00
Dan Albert
0a93b56924
Remove stlport from global package list.
...
This is now whitelisted per device.
Bug: http://b/15193147
Change-Id: I7fcd0891242fb552a17753b151cf431a398bbc44
2015-05-06 13:21:51 -07:00
Michael Wright
345ee05e77
Add input HAL to device builds
...
Change-Id: I11d1624947dcc3cdcd0d648de6cc25901c91dac6
2015-04-27 10:19:47 -07:00
Justin Klaassen
f33b404cb6
Merge "Switch from Calculator to ExactCalculator"
2015-04-18 00:24:23 +00:00
Lajos Molnar
3456d3bbf7
am d6ba1cfd
: am 35790525
: am 3a5602eb
: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
...
* commit 'd6ba1cfdfb0c1792e2f2f1de5bd2c596a41a47cc':
core_base.mk: switch to new H264 and MPEG2 software codecs
2015-04-17 06:13:31 +00:00
Lajos Molnar
f623a80480
core_base.mk: switch to new H264 and MPEG2 software codecs
...
Change-Id: I3078a4ef6e73e95edcdd16b087ac61ae56c4b812
2015-04-16 19:02:47 -07:00
Justin Klaassen
846505dc35
Switch from Calculator to ExactCalculator
...
Bug: 20301980
Change-Id: I95373aba826a0b5d58d2845b77e9849b674c5ed3
2015-04-16 17:28:05 -07:00
Jonathan Basseri
3dd39b092b
Adding the new CarrierConfig app to the system image.
...
Bug: b/19483786
Change-Id: I0173246997d6edddf4d9afb508a2427818f71928
2015-04-16 10:25:03 -07:00
Lajos Molnar
7ac7dc7263
am 8cd7e944
: am fb102b1b
: am 7c794b16
: Merge "Revert "core_base.mk: switch to new H264 and MPEG2 software codecs""
...
* commit '8cd7e9442cfbd8247bb99c312f6e98649b3afe42':
Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"
2015-04-16 16:40:35 +00:00
Lajos Molnar
37e931d9c3
Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"
...
clang builds fail on the dependent libraries
This reverts commit c628500ca5
.
Change-Id: Ibd4cdce82b890bd3cb9d03a1a1bc0e4fc0e22ee8
2015-04-16 15:49:08 +00:00
Lajos Molnar
2578431911
am ec1c2c0f
: am b5f7b187
: am 161c6971
: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
...
* commit 'ec1c2c0fea5b82ecf480d32dd3679f8437f720eb':
core_base.mk: switch to new H264 and MPEG2 software codecs
2015-04-16 15:45:56 +00:00
Lajos Molnar
c628500ca5
core_base.mk: switch to new H264 and MPEG2 software codecs
...
Change-Id: I86777e5efc7dbb138e9348a4ec7271ff047d328f
2015-04-15 16:18:53 -07:00
Ying Wang
3b2f1fc7c6
am 414bb9a4
: am 78622230
: am 47ff7f56
: Merge "Add host tool fastboot to every build."
...
* commit '414bb9a4823c44e2f4927f052678e56935d3a9af':
Add host tool fastboot to every build.
2015-04-13 22:51:29 +00:00
Ying Wang
9668a7ab1d
Add host tool fastboot to every build.
...
Some tools expect fastboot to be present even in user builds.
Change-Id: I4b6ee458eb2feb0dc7a77ec33a04219c5f4adc0d
2015-04-13 14:49:19 -07:00
Ricardo Garcia
3b216991a7
Adding libsonic to base.mk
...
Adding Sonic library to base
bug: 19196501
Change-Id: Id39a3a2f843aadf2808a10d2017151461db2c9b2
2015-04-10 15:43:30 -07:00
Andres Morales
452196f8a0
Merge "Add gatekeeperd to build"
2015-04-10 14:46:05 +00:00
Andres Morales
c7f7125b00
Merge "Add GateKeeper to core build"
2015-04-10 14:45:27 +00:00
Sami Tolvanen
e18196095b
Merge "Separate boot and recovery image signing from dm-verity"
2015-04-10 09:44:47 +00:00
Narayan Kamath
96c872d5e3
Merge "Track renaming of org.apache.http.legacy.jar"
2015-04-10 08:16:01 +00:00
Mike Lockwood
70e60b63a0
Merge "Add BluetoothMidiService to generic_no_telephony.mk"
2015-04-09 21:05:11 +00:00
Narayan Kamath
bf72f679d6
Track renaming of org.apache.http.legacy.jar
...
Change-Id: I224a4883474f81039df2203eb17272bc994c04c8
2015-04-09 13:12:09 +01:00
Roozbeh Pournader
cf6a4d8004
Merge "Add hyphenation patterns to generic_no_telephony.mk."
2015-04-09 02:12:54 +00:00
Joseph Wen
e1c8bdf8d8
Merge "Add StatementService to the build"
2015-04-08 18:47:07 +00:00
Joseph Wen
3a260d6860
Add StatementService to the build
...
- this is related to IntentFilter auto verification in Framework
Change-Id: I83d1c4bcc7be7992509348098cc320e38efea862
2015-04-08 10:55:27 -04:00
Sami Tolvanen
8b3f08bc7b
Separate boot and recovery image signing from dm-verity
...
Allow dm-verity to be enabled without boot and recovery images being
signed. This makes it possible to enable only dm-verity to detect
corruption without confusing bootloaders that do not understand signed
images.
Bug: 19985143
Change-Id: Ie52c6ff595faa7a5c1f1bc1b37f6899c4d0c7001
2015-04-08 12:30:16 +01:00
Roozbeh Pournader
fe4b3b185d
Add hyphenation patterns to generic_no_telephony.mk.
...
They should be included on all devices.
Bug: 20088132
Change-Id: I83bb2b018090bb9e76ea68ffad69f5e649d82be3
2015-04-07 09:13:21 -07:00
Andres Morales
d2c9d453ef
Add gatekeeperd to build
...
Change-Id: I84fb2b2ffee43f81d7fc2081fec225d6dc94f9c1
2015-04-06 17:23:23 -07:00
Andres Morales
f886fee685
Add GateKeeper to core build
...
This is built from system/gatekeeper/softgatekeeper.
It will represent the core native library for
validating device Pin/Pattern/Password.
Change-Id: I927c17042e59076eb7867b8855c2970b1c289307
2015-04-06 17:22:36 -07:00
Roozbeh Pournader
622b9ee784
Remove Lohit fonts from the build.
...
There are no remaining fonts to be built from Lohit. They are all
replaced by Noto.
Change-Id: I694e48cec194735c176083e4f4b7491a1079f74c
2015-04-06 12:43:04 -07:00
Mike Lockwood
0c651c52d6
Add BluetoothMidiService to generic_no_telephony.mk
...
Change-Id: I4ffa78c19e089074b33ade8c6a9881bf7186301e
2015-04-01 14:16:48 -07:00
Fabrice Di Meglio
6696172bad
Merge "Add IntentFilterVerifier to the build"
2015-03-31 00:20:12 +00:00
Nicholas Sauer
e4f3956252
Remove mms-common from tiny and minimal builds to fix the pdk build.
...
mms-common was replaced with telephony-common over several CLs including
ag/496311. the current mms-common project is merely a dummy class used
to satisfy legacy build targets. i confirmed with ywen@ that it is no
longer needed.
Change-Id: I70302abe4d1312847341bbda4976c489af2e32e3
2015-03-27 17:54:08 +00:00
David Riley
17be3d3921
Add support to sign boot images with vboot.
...
Change-Id: I924468fe06f7d38d4fc49c2ae9dfee734fd58867
Signed-off-by: David Riley <davidriley@google.com>
(cherry picked from commit 14fb7236c1942a9f5050b3e608a0f5f4cd1cae1d)
2015-03-26 17:54:40 +00:00
bohu
bb49bc5417
Merge "Add fingerprint HAL to emulator system images"
2015-03-26 17:39:54 +00:00
bohu
a2005ae47d
Add fingerprint HAL to emulator system images
...
This will build fingerprint.goldfish.so and fingerprint.ranchu.so
HALs for emulator system images and put them into the hw/
directory.
Change-Id: I6959d4b8e99ea0476c324c01ff05e44716ad8fa1
2015-03-26 10:16:42 -07:00
Paul Miller
99fbd82028
am 5bd58691
: am 23588104
: am 971e5787
: Merge "Revert "Replace legacy Browser with BookmarkProvider""
...
* commit '5bd5869115fa80cc4a94752e160d3df001d6d3d6':
Revert "Replace legacy Browser with BookmarkProvider"
2015-03-23 22:55:27 +00:00
Paul Miller
971e5787c0
Merge "Revert "Replace legacy Browser with BookmarkProvider""
2015-03-20 21:08:49 +00:00
Paul Miller
54dfc3fc22
Revert "Replace legacy Browser with BookmarkProvider"
...
This reverts commit 6169022417
.
Change-Id: I0246ef7a89de08bc449509b39f8db8279ea0871e
BUG:19351071
2015-03-20 16:26:26 +00:00
Narayan Kamath
e18445ead8
am 4de176b8
: am 2002102e
: am ad22a8f2
: Merge "Remove VoiceDialer from PRODUCT_PACKAGE list."
...
* commit '4de176b888f7dda32e1a3d01fb9add7a1774f080':
Remove VoiceDialer from PRODUCT_PACKAGE list.
2015-03-20 09:23:50 +00:00
Narayan Kamath
ad22a8f2a7
Merge "Remove VoiceDialer from PRODUCT_PACKAGE list."
2015-03-20 08:53:09 +00:00
Paul Miller
8b01ac4a59
am a6726d1f
: am e601f1ec
: am d121f184
: Merge "Replace legacy Browser with BookmarkProvider"
...
* commit 'a6726d1f3001b84c51da523d09f079274e39902e':
Replace legacy Browser with BookmarkProvider
2015-03-19 20:42:54 +00:00
Narayan Kamath
fadee109d6
Remove VoiceDialer from PRODUCT_PACKAGE list.
...
Change-Id: Ibc86ddee90a9ff83c3cdcbf086a6a1e466ba5088
2015-03-19 18:10:15 +00:00
Paul Miller
6169022417
Replace legacy Browser with BookmarkProvider
...
BookmarkProvider is Browser's old provider code, refactored into its
own app.
BUG:19351071
Change-Id: I0a5e1f2fc54749e2d3e3442636a26b2459b600c6
2015-03-18 15:44:21 -07:00
Elliott Hughes
e0203b17fa
am bf8164f9
: am 47584657
: am 0f98a378
: Merge "Remove netcfg from the list of base modules."
...
* commit 'bf8164f938f0af98b76e481de6c415fa496cfe21':
Remove netcfg from the list of base modules.
2015-03-17 14:47:28 +00:00
Elliott Hughes
f3124b3523
Remove netcfg from the list of base modules.
...
It's obsolete and -- other than a mention in the reference RIL and
another in a shell script that no longer works -- unused.
Change-Id: Ibbf2613778802222865528644c7e59a2d7c68b48
2015-03-16 13:52:30 -07:00
Eric Laurent
3131486892
Merge "added broadcast radio service"
2015-03-16 18:29:05 +00:00
Ying Wang
f25838a7ea
Support modules to be installed directly to recovery.img
...
Previously the recovery binary was configured to be installed to the
system.img and then got copied to recovery.img in the recovery.img's
build rule.
With this change, a module, such as the recovery binary, can configure
itself to be installed directly to the recovery.img, just like how other
modules get installed to system.img.
Bug: 19667686
Change-Id: I46b0b4a95cf078a68999db9c0f6635d6a3f5cd86
2015-03-11 10:38:13 -07:00
Ying Wang
3752614de1
Support modules to be installed directly to recovery.img
...
Previously the recovery binary was configured to be installed to the
system.img and then got copied to recovery.img in the recovery.img's
build rule.
With this change, a module, such as the recovery binary, can configure
itself to be installed directly to the recovery.img, just like how other
modules get installed to system.img.
Bug: 19667686
Change-Id: I46b0b4a95cf078a68999db9c0f6635d6a3f5cd86
2015-03-10 12:02:57 -07:00
Santos Cordon
386fa7350a
Add Call Log backup to basic telephony spec.
...
Change-Id: I9c101044a7750141a01e3a7e5c6ed127471f10bc
2015-03-06 12:45:05 -08:00
Eric Laurent
5793ad8a47
added broadcast radio service
...
Added core libraries for broacast radio service, client
and meta data utility.
Change-Id: Ic93444aee9a41c02dce67c8170450ac111332a62
2015-03-05 16:59:39 -08:00
Roozbeh Pournader
3ab85e4783
Add Roboto fonts
...
Roboto fonts are now moved to external/roboto-fonts.
Change-Id: Ic42bc5f7e645a66b3cf5c2ab61a6b5e9bde1b7cd
2015-02-25 16:39:22 -08:00
Tim Kilbourn
d0731048d6
Remove inputflinger binary from builds.
...
Change-Id: I98b19c532a2329a867c9943c13aa471bda01568c
2015-02-23 23:44:09 -08:00
Fabrice Di Meglio
b9051dae41
Add IntentFilterVerifier to the build
...
- this is related to IntentFilter auto verification in Framework
Change-Id: Ifb318ff96e15054467d8cd150678d5ea740f221d
2015-02-24 01:25:34 +00:00
Jeff Sharkey
aa438dc4cf
Include sgdisk in all device builds.
...
sgdisk is the command line version of gptfdisk, which we're using
to format devices with the GUID partition table standard.
Change-Id: I99e0c56d35391d46031d1c2f04956332e1a164a9
2015-02-23 10:06:56 -08:00
Narayan Kamath
af439891e9
Merge "Temporarily add org.apache.http.legacy to the boot classpath."
2015-02-11 14:48:03 +00:00
Jorim Jaggi
050f21cb00
Merge "Split up android.policy into framework.jar and services.jar 3/3"
2015-02-10 14:15:20 +00:00
Narayan Kamath
2011e895dc
Temporarily add org.apache.http.legacy to the boot classpath.
...
This change is the stepping stone towards removing it altogether.
In order to remove it, we need a few changes to ART to properly
support compile time classpaths.
bug: 18027885
Change-Id: I70d5453ff88b8ba51c418fd72aaf78ac97869502
2015-02-10 13:45:06 +00:00
Elliott Hughes
4244392ea9
am 57555891
: am ed556858
: Merge "Make sure we keep building grep now it\'s broken out from toolbox."
...
* commit '5755589141358a4f82cada56e6738075c670011f':
Make sure we keep building grep now it's broken out from toolbox.
2015-02-05 20:15:59 +00:00
Elliott Hughes
5755589141
am ed556858
: Merge "Make sure we keep building grep now it\'s broken out from toolbox."
...
* commit 'ed556858262a7311f0145f1d1c605f7cec7c18c4':
Make sure we keep building grep now it's broken out from toolbox.
2015-02-05 18:47:21 +00:00
Jorim Jaggi
a514472bce
Split up android.policy into framework.jar and services.jar 3/3
...
Change-Id: I2943e73ae5b59bb457e164bc4de2e92724686376
2015-02-05 16:42:19 +01:00
Elliott Hughes
c00dedb21c
Make sure we keep building grep now it's broken out from toolbox.
...
Change-Id: Ib71e37c5ba238136a9790cd92ecec745e099341e
2015-02-04 18:56:17 -08:00
Elliott Hughes
954baa1fff
am 21a0c862
: am 67c4d916
: Merge "Remove unused property."
...
* commit '21a0c8629ced53bdfddfe5ece8cb4fca2d92c351':
Remove unused property.
2015-01-29 18:37:35 +00:00
Elliott Hughes
21a0c8629c
am 67c4d916
: Merge "Remove unused property."
...
* commit '67c4d916f5294e47e3da275664bb55f4518300f3':
Remove unused property.
2015-01-29 16:51:52 +00:00
Elliott Hughes
7419722205
Remove unused property.
...
Change-Id: I14cfccf104881fdbca2b926e289b90e4bfad1c32
2015-01-28 22:43:43 -08:00
Ying Wang
7761e78451
am 79834f37
: am ae542c78
: Merge "Revert "Add the default local_time hal implementation to builds.""
...
* commit '79834f371ea13475577e4babd2c3960aefb5a2a2':
Revert "Add the default local_time hal implementation to builds."
2015-01-22 19:58:04 +00:00
Ying Wang
4d26681f3d
resolved conflicts for merge of 0f205ad9
to master
...
Change-Id: Ic741805a0037d8d29d7d5ff6e2b6e83067943f12
2015-01-22 11:54:58 -08:00
Ying Wang
79834f371e
am ae542c78
: Merge "Revert "Add the default local_time hal implementation to builds.""
...
* commit 'ae542c785d11f1e62f20f4493e422fdf5749d397':
Revert "Add the default local_time hal implementation to builds."
2015-01-22 00:13:34 +00:00
David Turner
b6af64c3ea
am 8be358bf
: Merge "emulator: Include the ranchu sensors library"
...
* commit '8be358bf9a5407a379d4c4709c172b8c1ba6d4c7':
emulator: Include the ranchu sensors library
2015-01-22 00:13:32 +00:00
Ying Wang
ae542c785d
Merge "Revert "Add the default local_time hal implementation to builds.""
2015-01-21 20:05:22 +00:00
David Turner
8be358bf9a
Merge "emulator: Include the ranchu sensors library"
2015-01-21 19:42:54 +00:00
Chih-Wei Huang
567ea28838
Revert "Add the default local_time hal implementation to builds."
...
Remove duplicate local_time.default.
This reverts commit a09c24db71
.
Change-Id: Ic96d42235c14588d454e92a57b3bb9e74688fd99
2015-01-21 12:17:58 +08:00
Narayan Kamath
6b3097baae
Add the apache-http library to all product configs.
...
bug: 18027885
Change-Id: I6b881ca8e868d6190c832dee8784ab1642ab3d82
2015-01-20 13:08:05 +00:00
Stephen Hines
6c61e37f4a
am d57b7c64
: am 5f31338c
: Merge "Add ld.mc as a required executable to core_minimal.mk."
...
* commit 'd57b7c640dbc25fa1265543ca680a222003cf324':
Add ld.mc as a required executable to core_minimal.mk.
2015-01-15 19:06:31 +00:00
Stephen Hines
d57b7c640d
am 5f31338c
: Merge "Add ld.mc as a required executable to core_minimal.mk."
...
* commit '5f31338c1bbc0a958d390d7b21ecf5fc66d29ffd':
Add ld.mc as a required executable to core_minimal.mk.
2015-01-15 18:08:15 +00:00
Stephen Hines
2306635fa3
Add ld.mc as a required executable to core_minimal.mk.
...
Bug: 18322681
Change-Id: I94754641db0c218e044f329bc59d4d918b389533
2015-01-14 16:11:12 -08:00
Baligh Uddin
38299d8569
am 4117b4e3
: am cda56ef6
: Fix default locale issue (cherry picked from commit 2a52f5c526
)
...
* commit '4117b4e3bd50e76135375da84b8754a0fade7c3e':
Fix default locale issue (cherry picked from commit 2a52f5c526
)
2015-01-12 04:15:19 +00:00
Baligh Uddin
cda56ef6da
Fix default locale issue
...
(cherry picked from commit 2a52f5c526
)
Change-Id: Ic59dd105d60c2dd44f60ed9f57b7e1381924080d
2015-01-11 23:10:44 +00:00
Baligh Uddin
2a52f5c526
Fix default locale issue
2015-01-11 13:41:08 -08:00
Christoffer Dall
b5381366d4
emulator: Include the ranchu sensors library
...
Include the HAL library support for the ranchu sensors emulation
provided for display rotation support on the virtual ranchu emulator
board.
Change-Id: Ibb5e1821d5f8ec9299523332352c2f0938fad687
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2014-12-21 21:17:45 +01:00
Dan Albert
39f792d6a4
am 818ce668
: am b3ad3943
: Merge "Revert "Remove libstlport from PRODUCT_PACKAGES.""
...
* commit '818ce6688d4b1b0fa50ebd7362371d624dd4c484':
Revert "Remove libstlport from PRODUCT_PACKAGES."
2014-12-17 02:21:08 +00:00
Dan Albert
818ce6688d
am b3ad3943
: Merge "Revert "Remove libstlport from PRODUCT_PACKAGES.""
...
* commit 'b3ad3943f363ab7c60d17125ac871e31c25b8a7a':
Revert "Remove libstlport from PRODUCT_PACKAGES."
2014-12-17 01:18:27 +00:00
Dan Albert
01bf7931eb
Revert "Remove libstlport from PRODUCT_PACKAGES."
...
The platform dependence on stlport is now far enough gone that a
regular build no longer builds stlport (woot!). Unfortunately, vendor
blobs don't claim their dependencies, so the build system has to keep
track of this for them.
Bug: 18777920
This reverts commit ef11722e9b
.
Change-Id: I6a0dd26dfc6837c419eb5dd2ec5258dd323fd4bf
2014-12-16 16:13:06 -08:00
Ying Wang
366de0b484
am 912da645
: am 73a730ca
: Merge "Remove libdvm support from the core build system."
...
* commit '912da64598a5175d6e5868c22977eda95f2a9df1':
Remove libdvm support from the core build system.
2014-12-16 21:58:10 +00:00
Ying Wang
912da64598
am 73a730ca
: Merge "Remove libdvm support from the core build system."
...
* commit '73a730caf566fb778ad36f6d991666c482918d22':
Remove libdvm support from the core build system.
2014-12-16 21:47:13 +00:00
Ying Wang
d54520a667
Remove libdvm support from the core build system.
...
Now libart is the only supported runtime and
we don't need the build variables PRODUCT_RUNTIMES and
DALVIK_VM_LIB.
Bug: 18465297
Change-Id: Ibfda931cde0649163d79b584fb5ccad927a9bc2b
2014-12-16 10:08:00 -08:00
Adam Lesinski
ec792e5f39
am 82a033f8
: am c2b74b87
: am 57a3d3e1
: Merge "Remove uses of density in PRODUCT_AAP_CONFIG" into lmp-mr1-dev
...
* commit '82a033f89c257ad72dbf175c3f145ae676958d87':
Remove uses of density in PRODUCT_AAP_CONFIG
2014-12-05 00:13:49 +00:00
Adam Lesinski
82a033f89c
am c2b74b87
: am 57a3d3e1
: Merge "Remove uses of density in PRODUCT_AAP_CONFIG" into lmp-mr1-dev
...
* commit 'c2b74b87d4ea4bcdef228080a874bad4aca7c323':
Remove uses of density in PRODUCT_AAP_CONFIG
2014-12-04 21:46:56 +00:00
Adam Lesinski
83ee6d790f
Remove uses of density in PRODUCT_AAP_CONFIG
...
Change-Id: I98594165515c07fa2e6b847266f7d8fa3283b52e
2014-12-03 15:20:51 -08:00
Roozbeh Pournader
7096d8a0a1
am f901b699
: am bceaa7f1
: am 35e7c067
: Add Lohit fonts to the build.
...
* commit 'f901b699a620936f8499209f7f9f79127c99d141':
Add Lohit fonts to the build.
2014-11-26 18:10:12 +00:00
Roozbeh Pournader
f901b699a6
am bceaa7f1
: am 35e7c067
: Add Lohit fonts to the build.
...
* commit 'bceaa7f1ae1aaa64935077469c72b0c96a1ceed9':
Add Lohit fonts to the build.
2014-11-26 18:01:06 +00:00
Roozbeh Pournader
35e7c067b8
Add Lohit fonts to the build.
...
This is needed to support the Oriya script on the expanded font
builds, currently done using the Lohit Odia (Oriya) font.
Bug: 17686019
Change-Id: I2914a9f8f8dfc43797af1551acaa8e43f25007ed
2014-11-25 10:52:20 -08:00
Elliott Hughes
f6a663dcb2
am c0c47561
: am 88392fae
: Merge "Ensure the base system includes toybox."
...
* commit 'c0c4756184da5033922703f7a1c62c8a53580706':
Ensure the base system includes toybox.
2014-11-23 18:00:16 +00:00
Elliott Hughes
c0c4756184
am 88392fae
: Merge "Ensure the base system includes toybox."
...
* commit '88392fae52f2b72e5537bb88a073d527edf7c00d':
Ensure the base system includes toybox.
2014-11-23 17:56:05 +00:00
Elliott Hughes
626d3f0a77
Ensure the base system includes toybox.
...
Change-Id: I0eec19328855d67da1c574a88b452f0eeec6adc7
2014-11-22 23:13:40 -08:00
Ying Wang
f679a480c1
am 276a543e
: am ea6113f0
: Merge "arm: Support qemu-android on generic arm targets"
...
* commit '276a543e71e139dfc086c955df9686e53ea15c5a':
arm: Support qemu-android on generic arm targets
2014-11-20 18:11:29 +00:00
Ying Wang
276a543e71
am ea6113f0
: Merge "arm: Support qemu-android on generic arm targets"
...
* commit 'ea6113f0f1a7069f1dd16bb2c0c7c29700bfda96':
arm: Support qemu-android on generic arm targets
2014-11-20 17:27:35 +00:00
Christoffer Dall
a60edd110f
arm: Support qemu-android on generic arm targets
...
When building a generic arm 32-bit target, we also want to include
support for the ranchu board model for the updated Android emulator
based on recent upstream QEMU.
Since the emulator.mk file is included by both the generic and
generic_arm64 targets and already defines a PRODUCT_COPY_FILES and
PRODUCT_PACKAGES, move duplicate entries from
target/board/generic*/device.mk to target/product/emulator.mk.
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Change-Id: I7922ec0c4097776a185dbb245301d760ff332386
2014-11-19 12:17:59 -08:00
Andreas Gampe
534aa692f7
am 41c939a1
: am 44259e4c
: Merge "Build: Support for compiled-classes file"
...
* commit '41c939a18698751d963bb57f9a0bc86ce4d3ec2e':
Build: Support for compiled-classes file
2014-11-19 00:14:46 +00:00
Andreas Gampe
41c939a186
am 44259e4c
: Merge "Build: Support for compiled-classes file"
...
* commit '44259e4cc64bd0382fb27f6d7540c7494db198cc':
Build: Support for compiled-classes file
2014-11-18 23:39:07 +00:00
Andreas Gampe
96a522037f
Build: Support for compiled-classes file
...
Allow a compiled-classes file for pre-opting.
Bug: 18410571
(cherry picked from commit 4fec0bb265
)
Change-Id: I8c69dd0fb8c04aaae0c4f062049cc9cce7d755c7
2014-11-18 15:09:51 -08:00
Andreas Gampe
4fec0bb265
Build: Support for compiled-classes file
...
Allow a compiled-classes file for pre-opting.
Bug: 18410571
Change-Id: I8c69dd0fb8c04aaae0c4f062049cc9cce7d755c7
2014-11-18 14:41:26 -08:00
Dan Albert
85e73042db
am 24c16064
: am 654e3907
: Merge "Remove libstlport from PRODUCT_PACKAGES."
...
* commit '24c160642011afa16a46d6616004772713bcb919':
Remove libstlport from PRODUCT_PACKAGES.
2014-11-17 23:15:55 +00:00
Dan Albert
24c1606420
am 654e3907
: Merge "Remove libstlport from PRODUCT_PACKAGES."
...
* commit '654e39072ecfc0052af0cbfca7e51aa8fc7856e8':
Remove libstlport from PRODUCT_PACKAGES.
2014-11-17 23:11:54 +00:00
Dan Albert
ef11722e9b
Remove libstlport from PRODUCT_PACKAGES.
...
Bug: 15193147
Change-Id: Idd2699d895393216bcd514da64145540faec4033
2014-11-17 14:26:11 -08:00
Ying Wang
f50de565e7
am 2ac57b50
: am 45f975bb
: Merge "Fix PDK build."
...
* commit '2ac57b50da24fdce2e60445a4ce66e34f01cae32':
Fix PDK build.
2014-11-17 20:26:23 +00:00
Ying Wang
2ac57b50da
am 45f975bb
: Merge "Fix PDK build."
...
* commit '45f975bba5efca94fae9471ce4388a51bd919b5d':
Fix PDK build.
2014-11-17 19:44:19 +00:00
Ying Wang
3424e699d9
Fix PDK build.
...
Add frameworks/base/preloaded-classes to PRODUCT_COPY_FILES only if it
exists in the source tree.
Bug: 18305157
Change-Id: I46c277ebfb8095f9e5fe0fbb21276d932509f2eb
2014-11-17 11:26:46 -08:00
Ying Wang
0c9b3bac65
Install preloaded-classes as a standalone configuration file
...
Install preloaded-classes as a standalone configuration file
/system/etc/preloaded-classes, so we can configure different file per product.
To override the default frameworks/base/preloaded-classes, just override
in your product configuration makefile with PRODUCT_COPY_FILES before it
inherits from build/target/product/base.mk: if there are multiple items
in PRODUCT_COPY_FILES with the same destination, the first one takes
precedence.
Bug: 18305157
Change-Id: I937632b4a1aa73310ec90e73fd708fbd0c704a21
2014-11-17 11:26:29 -08:00
Ying Wang
1b879e3c26
Fix PDK build.
...
Add frameworks/base/preloaded-classes to PRODUCT_COPY_FILES only if it
exists in the source tree.
Bug: 18305157
Change-Id: I46c277ebfb8095f9e5fe0fbb21276d932509f2eb
2014-11-17 11:01:18 -08:00
Ying Wang
2416273d5f
am 4aa4de96
: am 9a0a8bd0
: am 9a9d180f
: Install preloaded-classes as a standalone configuration file
...
* commit '4aa4de961b0a62c4863736ac79efc6a4c07ffc1d':
Install preloaded-classes as a standalone configuration file
2014-11-17 18:34:13 +00:00
Ying Wang
4aa4de961b
am 9a0a8bd0
: am 9a9d180f
: Install preloaded-classes as a standalone configuration file
...
* commit '9a0a8bd00697fd6dd3e7dd6fb5dcf3697dc27507':
Install preloaded-classes as a standalone configuration file
2014-11-17 18:28:19 +00:00
Ying Wang
9a9d180ff1
Install preloaded-classes as a standalone configuration file
...
Install preloaded-classes as a standalone configuration file
/system/etc/preloaded-classes, so we can configure different file per product.
To override the default frameworks/base/preloaded-classes, just override
in your product configuration makefile with PRODUCT_COPY_FILES before it
inherits from build/target/product/base.mk: if there are multiple items
in PRODUCT_COPY_FILES with the same destination, the first one takes
precedence.
Bug: 18305157
Change-Id: I937632b4a1aa73310ec90e73fd708fbd0c704a21
2014-11-14 15:38:54 -08:00
Sami Tolvanen
5132315546
am 2a1697d9
: am 8d212ea8
: DO NOT MERGE: Change verity key formats
...
* commit '2a1697d9831fc887a32c661fa4e3758f32790e67':
DO NOT MERGE: Change verity key formats
2014-11-14 00:03:51 +00:00
Sami Tolvanen
8d212ea873
DO NOT MERGE: Change verity key formats
...
Change boot, recovery, and verity metadata signing keys to use the
same PKCS8 / X.509 PEM format as the other signing keys, and update
build scripts to use correct arguments for the updated signing
tools.
Bug: 15984840
Bug: 18120110
Change-Id: I23ed5a004ecdad6cf7696487935ad5031eb8adf8
(cherry picked from commit 72d90eb189
)
2014-11-13 23:23:31 +00:00
Sami Tolvanen
72d90eb189
Change verity key formats
...
Change boot, recovery, and verity metadata signing keys to use the
same PKCS8 / X.509 PEM format as the other signing keys, and update
build scripts to use correct arguments for the updated signing
tools.
Change-Id: I23ed5a004ecdad6cf7696487935ad5031eb8adf8
2014-11-06 20:40:07 -08:00
Stephen Hines
98364d80ed
am c4962a55
: am 4d2b4fdc
: am 11054d5e
: Add bcc to core_tiny.mk. automerge: bdac04e
...
* commit 'c4962a551555cf181f01a6c9cf37598337f5cf27':
Add bcc to core_tiny.mk.
2014-11-06 00:45:55 +00:00
Stephen Hines
c4962a5515
am 4d2b4fdc
: am 11054d5e
: Add bcc to core_tiny.mk. automerge: bdac04e
...
* commit '4d2b4fdced95ed97d601a68afbdfcdb1c5e9f24d':
Add bcc to core_tiny.mk.
2014-11-06 00:41:35 +00:00
Stephen Hines
bdac04e0f6
Add bcc to core_tiny.mk.
...
Bug: 18257466
Also update the core.mk documentation that has gone slightly out of date.
Change-Id: I90ed64e2509dad3d78d451dd4a7d8c3dfd01532c
2014-11-05 13:19:56 -08:00
Alan Viverette
7c546388af
am 63cea7b2
: am a6f16533
: am 4543ae81
: Merge "Add Cutive Mono to makefiles" into lmp-dev
...
* commit '63cea7b23020f7e86532429e116a7208fe87f35a':
Add Cutive Mono to makefiles
2014-10-11 05:07:32 +00:00
Alan Viverette
63cea7b230
am a6f16533
: am 4543ae81
: Merge "Add Cutive Mono to makefiles" into lmp-dev
...
* commit 'a6f16533e23aa287bbeddb025d1166d3f35f1563':
Add Cutive Mono to makefiles
2014-10-11 04:55:33 +00:00
Alan Viverette
1dc5b58689
am 4543ae81
: Merge "Add Cutive Mono to makefiles" into lmp-dev
...
* commit '4543ae819da023b8d51f36497c6e5445a51b70ba':
Add Cutive Mono to makefiles
2014-10-10 23:46:06 +00:00
Alan Viverette
6444212890
Add Cutive Mono to makefiles
...
BUG: 17666124
Change-Id: I73aee6b7a211bfbd0bdba9c6c630c4c5dea905c7
2014-10-10 19:53:44 +00:00
Adam Lesinski
dcc1aef30f
am 6f1e56ad
: am f082f19a
: am 811e650b
: Merge "Add appops command to devices" into lmp-dev
...
* commit '6f1e56ad475ced0a3f8854bc4c4fac1ee2d5f37c':
Add appops command to devices
2014-10-09 22:31:07 +00:00
Adam Lesinski
6f1e56ad47
am f082f19a
: am 811e650b
: Merge "Add appops command to devices" into lmp-dev
...
* commit 'f082f19a90e91f74ae2e88a12250addd816ad426':
Add appops command to devices
2014-10-09 22:23:43 +00:00
Adam Lesinski
dcfaac5f8e
am 811e650b
: Merge "Add appops command to devices" into lmp-dev
...
* commit '811e650b820ffa4f291d18d6f49673314848c810':
Add appops command to devices
2014-10-08 22:48:46 +00:00
Adam Lesinski
02bbd640e7
Add appops command to devices
...
This is used to set appops permissions from the command line
or from CTS tests via the shell.
Change-Id: I8a71d1398e2071aecfd22be7b6530f186f40c2c0
2014-10-08 10:53:59 -07:00
Bill Yi
d13421b0e2
am 4f61040d
: am e3386105
: Remove PinyinIME from target config
...
* commit '4f61040da162082c625897f8f0c01cbb98ba0065':
Remove PinyinIME from target config
2014-09-20 00:38:40 +00:00
Bill Yi
4f61040da1
am e3386105
: Remove PinyinIME from target config
...
* commit 'e3386105e31971378386ef2fe8480aacfc082ea0':
Remove PinyinIME from target config
2014-09-20 00:27:48 +00:00
Bill Yi
6d3f081e08
am e3386105
: Remove PinyinIME from target config
...
* commit 'e3386105e31971378386ef2fe8480aacfc082ea0':
Remove PinyinIME from target config
2014-09-20 00:02:19 +00:00
Bill Yi
e3386105e3
Remove PinyinIME from target config
...
BUG:17578207
2014-09-19 16:04:17 -07:00
Tyler Gunn
a0c8f67c88
am 260abc8a
: am 6156bcad
: Renaming Telecomm to Telecom.
...
* commit '260abc8a1079bb3504c42543c3b3824414774cef':
Renaming Telecomm to Telecom.
2014-09-13 18:19:39 +00:00
Tyler Gunn
260abc8a10
am 6156bcad
: Renaming Telecomm to Telecom.
...
* commit '6156bcad42b8a08dcf41b7cb12be90d2c6d02cf5':
Renaming Telecomm to Telecom.
2014-09-13 18:03:13 +00:00
Tyler Gunn
6156bcad42
Renaming Telecomm to Telecom.
...
- Changing reference from Telecomm to Telecom.
Bug: 17364651
Change-Id: I5b7200396dfc5f0d4c62f9a1aa50bd4fdc04fccf
2014-09-12 20:06:57 -07:00
Esteban Talavera
c43f8f75bb
am f69ff0e0
: am aaaf5025
: Merge "Added new \'adb dpm\' command to the packages list." into lmp-dev
...
* commit 'f69ff0e07f7953a382f6e4f37ad063bf7179f24d':
Added new 'adb dpm' command to the packages list.
2014-09-12 19:29:12 +00:00
Esteban Talavera
f69ff0e07f
am aaaf5025
: Merge "Added new \'adb dpm\' command to the packages list." into lmp-dev
...
* commit 'aaaf5025b6ecca2815d32c0c78557686b68baac6':
Added new 'adb dpm' command to the packages list.
2014-09-12 18:53:25 +00:00
Esteban Talavera
aaaf5025b6
Merge "Added new 'adb dpm' command to the packages list." into lmp-dev
2014-09-12 10:35:48 +00:00
Dan Albert
b7af531ecc
Remove the vbox target from the build system.
...
I've been told this is no longer in use, and it's the only user of
external/grub, which is distressingly out of date.
Change-Id: I434a55e0d68f6db97fa71e294e983ff1802e9ba6
(cherry picked from commit de21059acf
)
2014-09-11 13:48:15 -07:00
Dan Albert
3ea8d03cdd
am 38dc420e
: resolved conflicts for merge of fa21f9db
to lmp-dev-plus-aosp
...
* commit '38dc420e19a77e22c49fb568561fb697a91143cd':
Remove the vbox target from the build system.
2014-09-11 17:26:01 +00:00
Esteban Talavera
b8ef1188e7
Added new 'adb dpm' command to the packages list.
...
Bug: 17312478, 17316711
Change-Id: I2613178ea82a6c6268e7f8012e74c4a852fea0d4
2014-09-11 17:52:08 +01:00
Dan Albert
38dc420e19
resolved conflicts for merge of fa21f9db
to lmp-dev-plus-aosp
...
Change-Id: I8cd590e7e6f764d6651dcaacd4beb8c72a23164f
2014-09-10 16:15:18 -07:00
Dan Albert
fa21f9db1c
am 30dbfce5
: Merge "Remove the vbox target from the build system."
...
* commit '30dbfce52fdf3ec554b1818ac40fea734e8eac3f':
Remove the vbox target from the build system.
2014-09-10 22:39:26 +00:00
Dan Albert
de21059acf
Remove the vbox target from the build system.
...
I've been told this is no longer in use, and it's the only user of
external/grub, which is distressingly out of date.
Change-Id: I434a55e0d68f6db97fa71e294e983ff1802e9ba6
2014-09-10 15:10:31 -07:00
Mike Lockwood
29b28ebec5
am 3fedbc0c
: am f856b093
: Merge "Add com.android.future.usb.accessory support library to all builds" into lmp-dev
...
* commit '3fedbc0c12ed451287572f110ec39b3318c04387':
Add com.android.future.usb.accessory support library to all builds
2014-09-08 18:46:07 +00:00
Mike Lockwood
3fedbc0c12
am f856b093
: Merge "Add com.android.future.usb.accessory support library to all builds" into lmp-dev
...
* commit 'f856b0939670d052ef01182413d9aaa0824dcd11':
Add com.android.future.usb.accessory support library to all builds
2014-09-08 18:36:30 +00:00
Mike Lockwood
b0a62787b4
Add com.android.future.usb.accessory support library to all builds
...
so we don't have to remember to add it to device.mk for all products.
Bug: 17189905
Change-Id: Ia19c5e16bc7916996804a52eccd3ecca89099f09
2014-09-08 10:34:18 -07:00
Elliott Hughes
c4472d517c
am 0c2dcc08
: am cc3b0c41
: am 5c11a76b
: Merge "Add debug.atrace.tags.enableflags=0 to /default.prop."
...
* commit '0c2dcc08454851b74a8c4ee265e2a56beab89052':
Add debug.atrace.tags.enableflags=0 to /default.prop.
2014-09-04 00:28:12 +00:00
Elliott Hughes
0c2dcc0845
am cc3b0c41
: am 5c11a76b
: Merge "Add debug.atrace.tags.enableflags=0 to /default.prop."
...
* commit 'cc3b0c411389a7f8dbcc9317614f9027585cc3d0':
Add debug.atrace.tags.enableflags=0 to /default.prop.
2014-09-04 00:17:05 +00:00
Elliott Hughes
cc3b0c4113
am 5c11a76b
: Merge "Add debug.atrace.tags.enableflags=0 to /default.prop."
...
* commit '5c11a76badbea36c4f6b89a0d2b2dd2acee35a5d':
Add debug.atrace.tags.enableflags=0 to /default.prop.
2014-09-04 00:04:59 +00:00
Stephen Smalley
88c5a130b4
Add debug.atrace.tags.enableflags=0 to /default.prop.
...
This ensures that the property is always set by init
prior to starting any other process, which avoids the need
for the bionic systrace code to try to set the property
if it has not already been set to avoid the full cost of
searching for an undefined property each time. See
change I30ed5b377c91ca4c36568a0e647ddf95d4e4a61a for
the relevant bionic code.
The problem with the current bionic code is that it can
trigger an attempt to set this property from any random
process, which will be denied unless the process is already
authorized to set debug properties. This is visible in the
form of various SELinux avc: denied messages and
init sys_prop: permission denied messages in dmesg output.
Allowing all domains to set such properties is undesirable.
Change-Id: I6d953c0c281fd72ad3eba8a479fd258023579b5b
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-09-03 15:08:08 -04:00
Marcin Kosiba
2380261057
am 15493ceb
: Merge "Remove webviewchromium from PRODUCT_BOOT_JARS for real."
...
* commit '15493ceba52ce6bc962c66fd38d1cb0cbd88e2eb':
Remove webviewchromium from PRODUCT_BOOT_JARS for real.
2014-09-01 10:30:13 +00:00
Marcin Kosiba
6eeacd322f
Remove webviewchromium from PRODUCT_BOOT_JARS for real.
...
The WebView Java code is now loaded by WebViewFactory from an APK
when an app needs it, so remove the old jar from the boot classpath.
The previous change removed the webview from core_minimal.mk but
not from core_base.mk, which is what this change addresses.
Change-Id: I6f4bcd427a7e65f3a20372c3c177e9342a953290
2014-09-01 10:57:44 +01:00
Marcin Kosiba
e3345bcd76
am aab8cdb7
: Merge "Remove webviewchromium from PRODUCT_BOOT_JARS."
...
* commit 'aab8cdb7044555fc88c7aaffa83884bb68a2ddb0':
Remove webviewchromium from PRODUCT_BOOT_JARS.
2014-09-01 09:37:10 +00:00
Marcin Kosiba
aab8cdb704
Merge "Remove webviewchromium from PRODUCT_BOOT_JARS."
2014-09-01 09:26:59 +00:00
Marcin Kosiba
98cee3b415
Remove webviewchromium from PRODUCT_BOOT_JARS.
...
The WebView Java code is now loaded by WebViewFactory from an APK
when an app needs it, so remove the old jar from the boot classpath.
Bug: 16329371
Change-Id: Ibed49641d04fd5e93e26ab12e203e4596e0b3bb6
2014-09-01 10:22:10 +01:00
Calin Juravle
cf4e6a722c
am 8078df97
: Merge "Make sure that ro.dalvik.vm.native.bridge is always set."
...
* commit '8078df9755fc0942feae8ac10a4965c5de4968a8':
Make sure that ro.dalvik.vm.native.bridge is always set.
2014-08-27 15:58:44 +00:00
Calin Juravle
c783b5065b
Make sure that ro.dalvik.vm.native.bridge is always set.
...
A value of "0" means that native bridge is disabled.
Bug: 17104449
(cherry picked from commit 4f703a7f9f
)
Change-Id: I4ca379923996ea08828dea4b2cd2da045e3f8031
2014-08-27 14:55:32 +01:00
Calin Juravle
08cef7185f
am d9f31612
: am 4f703a7f
: Make sure that ro.dalvik.vm.native.bridge is always set.
...
* commit 'd9f31612f2af69abc7b56c154e48d4ac639eeac1':
Make sure that ro.dalvik.vm.native.bridge is always set.
2014-08-27 13:37:42 +00:00
Calin Juravle
d9f31612f2
am 4f703a7f
: Make sure that ro.dalvik.vm.native.bridge is always set.
...
* commit '4f703a7f9ffd9a0d0432401a3173533d695d2ae6':
Make sure that ro.dalvik.vm.native.bridge is always set.
2014-08-27 13:27:53 +00:00
Calin Juravle
4f703a7f9f
Make sure that ro.dalvik.vm.native.bridge is always set.
...
A value of "0" means that native bridge is disabled.
Bug: 17104449
Change-Id: Id68afe305cd11471fed8aa3f5568e5dbfc22166c
2014-08-26 23:03:16 +01:00
David 'Digit' Turner
ddcbb89a8d
am 4d3f581d
: resolved conflicts for merge of 7a58de4e
to lmp-dev-plus-aosp
...
* commit '4d3f581d872ff1634b772411a66dab5ba9c6bebe':
arm64: Fix the sdk_arm64 build products
arm64: Fix aosp_arm64 system image.
2014-08-25 18:07:39 +00:00