Commit Graph

2044 Commits

Author SHA1 Message Date
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 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 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
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 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 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 02389bf940 Merge "Include new AOSP messaging app in base builds." into mnc-dev 2015-08-12 17:01:24 +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 c3bc0b112c resolved conflicts for merge of e5a63158 to mnc-dev-plus-aosp
Change-Id: Ifcbf55d0f4a158602867c01546f4c0f7e668697f
2015-08-11 15:06:29 -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 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 c08c3507be 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:43 +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 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 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
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 9e7d6d152b 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:17:51 +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 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
Nick Kralevich 385457dc31 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:20 +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 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 e7733e55f6 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:06:06 +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 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 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
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
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 080f57aed7 Merge "Remove the unnecessary full_x86_64 and full_mips64." 2015-06-08 19:01:47 +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
Yorke Lee 24deb5d08f am 05f9da8e: Merge "Add \'adb shell telecom\' command to packages list" into mnc-dev
* commit '05f9da8e6f778c44031b957ccd2f91bde83baa6e':
  Add 'adb shell telecom' command to packages list
2015-06-03 21:59:47 +00:00
Yorke Lee 05f9da8e6f Merge "Add 'adb shell telecom' command to packages list" into mnc-dev 2015-06-03 21:39:39 +00:00
Yorke Lee a1e1d9cea5 Add 'adb shell telecom' command to packages list
Change-Id: I193b54dd9f4511eb7959c5dbbf38f90267b8fcc9
2015-06-03 13:57:33 -07:00
Mark Salyzyn 31f116de07 am 70749857: am 9ec84792: Merge "goldfish: rename goldfish_logcat.te to logd.te"
* commit '70749857595a100bf9e8f009767030812101d365':
  goldfish: rename goldfish_logcat.te to logd.te
2015-06-03 18:36:22 +00:00
Mark Salyzyn 9f8e1e1c7d goldfish: rename goldfish_logcat.te to logd.te
(cherrypicked from commit fd8c30177c)

Bug: 19608716
Change-Id: I5c76648a4bcbbb15a033465e8af66b12af6e0a18
2015-06-03 10:48:35 -07:00
Mark Salyzyn 94871b94ef goldfish: logcat -Q in logd domain
Deal with a build failure in conflict with cl/152105

(cherrypicked from commit 1cc7735ffa)

Bug: 19608716
Change-Id: I1078046db3b159c1baf0a22435c3e777424453a1
2015-06-03 10:47:34 -07:00
Mark Salyzyn 86997b8809 am defa1737: am b37ac46b: Merge "goldfish: logcat -Q in logd domain"
* commit 'defa1737973575e3be2dce415c68c6b13fb4fbd0':
  goldfish: logcat -Q in logd domain
2015-06-03 17:43:28 +00:00
Mark Salyzyn fd8c30177c goldfish: rename goldfish_logcat.te to logd.te
Bug: 19608716
Change-Id: I5c76648a4bcbbb15a033465e8af66b12af6e0a18
2015-06-03 09:00:14 -07:00
Mark Salyzyn 1cc7735ffa goldfish: logcat -Q in logd domain
Deal with a build failure in conflict with cl/152105

Bug: 19608716
Change-Id: I1078046db3b159c1baf0a22435c3e777424453a1
2015-06-03 07:52:21 -07:00
Jeff Sharkey c79068be5c am c2fb6e10: Merge "Both ext4 and f2fs binaries for adoptable storage." into mnc-dev
* commit 'c2fb6e107d81e50a58fe25073f490b9dd48b31e2':
  Both ext4 and f2fs binaries for adoptable storage.
2015-05-28 22:34:32 +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 bb1ead7920 am 1d8b2702: Include fingerprintd on emulator images
* commit '1d8b2702675555ca1b2f074379b5a56b369e71aa':
  Include fingerprintd on emulator images
2015-05-28 02:04:40 +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 4abbca83a9 am a2eccba1: Bump x86_64 system image size to fix build
* commit 'a2eccba17f2d9f0c6df1885c6a96987f23f0a390':
  Bump x86_64 system image size to fix build
2015-05-26 18:11:40 +00:00
bohu a2eccba17f Bump x86_64 system image size to fix build
Bumped from 1G to 1.25G

Change-Id: I8d04166c43c792030f346cbe6ba9d6889b31359b
2015-05-26 10:40:36 -07:00
bohu ba90e314b1 am ed6b6350: Uses SDK specific feature lists for SDK system images
* commit 'ed6b6350ea85246e508ea4b286d5ceaaa2ef29c8':
  Uses SDK specific feature lists for SDK system images
2015-05-22 23:11:58 +00:00
bohu 000055468e am 2913ecc2: Merge "Replace Launcher2 by Launcher3 for SDK system images" into mnc-dev
* commit '2913ecc2d54544fef5c98e35002d251f473b5209':
  Replace Launcher2 by Launcher3 for SDK system images
2015-05-22 22:45:38 +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 7b4d4b9040 am 7fda3158: Merge "Revert "Replace Launcher2 with Launcher3"" into mnc-dev
* commit '7fda31584fd6ea78f0417abbfb96a8a15a07756c':
  Revert "Replace Launcher2 with Launcher3"
2015-05-22 16:37:09 +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 d57d6a235c am 7451df69: Merge "remove gatekeeper software module" into mnc-dev
* commit '7451df690c74731f022c244b229ecdd2f2b45f57':
  remove gatekeeper software module
2015-05-21 18:58:22 +00:00
bohu 0e9dc94f26 am d79778fa: Replace Launcher2 with Launcher3
* commit 'd79778faf3180ec0db67e7a12e0871d39867565a':
  Replace Launcher2 with Launcher3
2015-05-21 18:48:37 +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
Yu Ning 0f54ada1cd Allow goldfish-setup to put the emulator in WiFi-only mode
The goldfish-setup service (essentially /system/etc/init.goldfish.sh)
executes the following commands when certain conditions are met:

 setprop ro.radio.noril yes
 stop ril-daemon

so as to stop the RIL daemon and emulate a WiFi-only device. Both would
fail, though, because goldfish-setup does not have the permissions to
set relevant properties.

This CL modifies the emulator's SELinux policy to grant the necessary
permissions. It is a step towards fixing the ril-daemon-keeps-getting-
killed-and-restarted problem with the new ("ranchu") emulator, which
does not support telephony emulation yet. (The other step is to have
init start goldfish-setup, which will be done in a seperate CL.)

(cherrypicked from commit 33dca8090f)

Change-Id: Ice7e7898804b7353ac4a8c49d871b1b2571d7a5f
Signed-off-by: Yu Ning <yu.ning@intel.com>
2015-05-18 19:46:18 -07:00
William Roberts c434f71bd8 Update device to use set_prop() macro
(cherrypicked from commit cccc901639)

Change-Id: I630ba0178439c935d08062892990d43a3cc1239e
Signed-off-by: William Roberts <william.c.roberts@linux.intel.com>
2015-05-18 19:20:03 -07:00
Nick Kralevich e4ed2db2f5 am 8da1acf8: am c3b58d4a: Merge "Allow goldfish-setup to put the emulator in WiFi-only mode"
* commit '8da1acf8b702665ce7891799cdbc86499533cc54':
  Allow goldfish-setup to put the emulator in WiFi-only mode
2015-05-19 00:50:05 +00:00
Yu Ning 33dca8090f Allow goldfish-setup to put the emulator in WiFi-only mode
The goldfish-setup service (essentially /system/etc/init.goldfish.sh)
executes the following commands when certain conditions are met:

 setprop ro.radio.noril yes
 stop ril-daemon

so as to stop the RIL daemon and emulate a WiFi-only device. Both would
fail, though, because goldfish-setup does not have the permissions to
set relevant properties.

This CL modifies the emulator's SELinux policy to grant the necessary
permissions. It is a step towards fixing the ril-daemon-keeps-getting-
killed-and-restarted problem with the new ("ranchu") emulator, which
does not support telephony emulation yet. (The other step is to have
init start goldfish-setup, which will be done in a seperate CL.)

Change-Id: Ice7e7898804b7353ac4a8c49d871b1b2571d7a5f
Signed-off-by: Yu Ning <yu.ning@intel.com>
2015-05-19 08:22:41 +08:00
Nick Kralevich ae7c835923 am 7b6e1ba2: am 94b4f9a5: Merge "Label /dev/ttyGF* as serial_device"
* commit '7b6e1ba2fa4edb757ff9e1c08deee9edf06fc1cc':
  Label /dev/ttyGF* as serial_device
2015-05-18 17:12:33 +00:00
Yu Ning e9ec053e99 Label /dev/ttyGF* as serial_device
In goldfish kernel 3.10, the goldfish_tty device instantiates virtual
serial ports as /dev/ttyGF* (e.g. /dev/ttyGF0), not as /dev/ttyS* as in
goldfish kernel 3.4. However, in the emulator's SELinux security policy,
there is no specific security context assigned to /dev/ttyGF*, and the
one inherited from /dev (u:object_r:device:s0) prevents services such as
qemud and goldfish-logcat from reading and writing ttyGF*. Consequently,
qemud terminates abnormally on the classic x86_64 emulator:

 init: Service 'qemud' (pid XXX) exited with status 1

Fix this issue by assigning /dev/ttyGF* the same security context as
/dev/ttyS*.

(cherrypicked from commit 4783467922)

Change-Id: Ia7394dc217bd82f566c4d1b7eda3cc8ce3ac612f
Signed-off-by: Yu Ning <yu.ning@intel.com>
2015-05-18 09:55:07 -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
Yu Ning 4783467922 Label /dev/ttyGF* as serial_device
In goldfish kernel 3.10, the goldfish_tty device instantiates virtual
serial ports as /dev/ttyGF* (e.g. /dev/ttyGF0), not as /dev/ttyS* as in
goldfish kernel 3.4. However, in the emulator's SELinux security policy,
there is no specific security context assigned to /dev/ttyGF*, and the
one inherited from /dev (u:object_r:device:s0) prevents services such as
qemud and goldfish-logcat from reading and writing ttyGF*. Consequently,
qemud terminates abnormally on the classic x86_64 emulator:

 init: Service 'qemud' (pid XXX) exited with status 1

Fix this issue by assigning /dev/ttyGF* the same security context as
/dev/ttyS*.

Change-Id: Ia7394dc217bd82f566c4d1b7eda3cc8ce3ac612f
Signed-off-by: Yu Ning <yu.ning@intel.com>
2015-05-18 17:19:08 +08: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
Nick Kralevich 05c3f7cee1 am 53df3d67: am e89b6f5d: Merge "Update device to use set_prop() macro"
* commit '53df3d67b22b70dff841b41603945d1ae4221246':
  Update device to use set_prop() macro
2015-05-15 19:46:52 +00:00
Nick Kralevich e89b6f5df1 Merge "Update device to use set_prop() macro" 2015-05-15 19:26:56 +00:00
Nick Kralevich b00d6937cd am 45d8cf5a: am cea991d7: Merge "Label /dev/goldfish_pipe as qemu_device"
* commit '45d8cf5aafd3108c861dadfa85e1177714fee4ae':
  Label /dev/goldfish_pipe as qemu_device
2015-05-15 16:45:04 +00:00
Yu Ning b23b5cc4a4 Label /dev/goldfish_pipe as qemu_device
In goldfish kernel 3.10, qemu_pipe has been renamed to goldfish_pipe.
However, in the emulator's SELinux policy, there is no specific security
context assigned to /dev/goldfish_pipe, and the one inherited from /dev
(u:object_r:device:s0) prevents various processes (qemud, qemu-props,
etc.) from reading and writing goldfish_pipe. Consequently, the classic
x86_64 emulator will not boot if GPU emulation is enabled ("-gpu host"),
and does not render the UI correctly if launched with "-gpu off".

Fix this issue by assigning /dev/goldfish_pipe the same security context
as /dev/qemu_pipe.

This CL also benefits the new ("ranchu") emulator, where all supported
ABIs (arm64, mips64, x86 and x86_64) use 3.10-based kernels. Without
this fix, the new emulator boots and works, but there are avc denials
related to goldfish_pipe.

Last but not least, it is now possible to boot the classic x86 emulator
with a 3.10-based kernel instead of the current 3.4-based one, without
disabling SELinux.

(cherry-pick of commit: a5053e6b35)

Change-Id: I52e75c94d3ae3758cbbf5bc0e1d84254fdf5c6cb
Signed-off-by: Yu Ning <yu.ning@intel.com>
2015-05-15 07:44:28 -07:00
Nick Kralevich cea991d778 Merge "Label /dev/goldfish_pipe as qemu_device" 2015-05-15 13:00:26 +00:00
Neil Fuller abf5ef8fdd Merge "Add tzdatacheck to image" 2015-05-15 09:09:46 +00:00
Yu Ning a5053e6b35 Label /dev/goldfish_pipe as qemu_device
In goldfish kernel 3.10, qemu_pipe has been renamed to goldfish_pipe.
However, in the emulator's SELinux policy, there is no specific security
context assigned to /dev/goldfish_pipe, and the one inherited from /dev
(u:object_r:device:s0) prevents various processes (qemud, qemu-props,
etc.) from reading and writing goldfish_pipe. Consequently, the classic
x86_64 emulator will not boot if GPU emulation is enabled ("-gpu host"),
and does not render the UI correctly if launched with "-gpu off".

Fix this issue by assigning /dev/goldfish_pipe the same security context
as /dev/qemu_pipe.

This CL also benefits the new ("ranchu") emulator, where all supported
ABIs (arm64, mips64, x86 and x86_64) use 3.10-based kernels. Without
this fix, the new emulator boots and works, but there are avc denials
related to goldfish_pipe.

Last but not least, it is now possible to boot the classic x86 emulator
with a 3.10-based kernel instead of the current 3.4-based one, without
disabling SELinux.

Change-Id: Iad979c0ee9d0a410be12b83ac1bef9476b50a6dc
Signed-off-by: Yu Ning <yu.ning@intel.com>
2015-05-15 16:30:57 +08:00
Neil Fuller b0bc462877 am f9f9c3f3: Merge "Add tzdatacheck to image" into mnc-dev
* commit 'f9f9c3f31e85a96aeb13af065d8eb8dbf33dd05c':
  Add tzdatacheck to image
2015-05-14 19:27:45 +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 06b07daa70 am 8788add7: Add locales sq_AL, gu_IN, and pa_IN for mnc-{dev,release} Bug: 21095280
* commit '8788add72c093b16d9a2f301c3da71f0b328f3d1':
  Add locales sq_AL, gu_IN, and pa_IN for mnc-{dev,release} Bug: 21095280
2015-05-13 17:29:02 +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 7d7dbece3a am 3ce2e60f: Merge "New "sm" shell tool to call StorageManager." into mnc-dev
* commit '3ce2e60ffc13ba8f8c0ac691db27e4c422e7e2d3':
  New "sm" shell tool to call StorageManager.
2015-05-13 05:43:18 +00:00
Jeff Sharkey 3ce2e60ffc Merge "New "sm" shell tool to call StorageManager." into mnc-dev 2015-05-13 05:27:39 +00:00
William Roberts cccc901639 Update device to use set_prop() macro
Change-Id: I630ba0178439c935d08062892990d43a3cc1239e
Signed-off-by: William Roberts <william.c.roberts@linux.intel.com>
2015-05-12 20:44:37 -07:00
Dan Albert f807d1fa6f Merge "Remove stlport from global package list." into mnc-dev 2015-05-12 23:11:32 +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
Stephen Smalley 901d792cbf Define BOARD_SEPOLICY_DIRS for 64-bit emulators.
Define BOARD_SEPOLICY_DIRS for the arm64, mips64, and x86_64
emulator targets.  As a first cut, simply inherit from the
existing policy directories used for generic and generic_x86.
We may need further board-specific policy added for these targets
but testing will require first enabling SELinux in the relevant
kernel configs.

(cherrypicked from commit 21ebc213bb)

Change-Id: I7b4459b32298698fc2908cbbdd0e3afadbe5ac24
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-05-11 10:46:51 -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 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
Andreas Gampe d9e855cd70 am 2e286f46: am afec6236: Merge "Build: Update Mips64 generic build for ART"
* commit '2e286f467b1d156c7ccc741f2c28d3a37cf78a3f':
  Build: Update Mips64 generic build for ART
2015-05-07 16:26:32 +00:00
Andreas Gampe afec6236bb Merge "Build: Update Mips64 generic build for ART" 2015-05-07 16:02:16 +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
Andreas Gampe 13761c43c4 Build: Update Mips64 generic build for ART
For ART testing, we need:

1) A larger userdata partition. A lot of files end up there as it
is multi-arch.

2) Don't strip prebuilts. Technically we only care about core-libart,
but this is the best high-level change that doesn't impact other
files.

Change-Id: Ic36bfcf80ba50a602752ca0a3031dda89a0f3051
2015-05-06 21:00:44 -07: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
Nick Kralevich c665eb9547 am 13d8654f: am 37ddcad5: Merge "Define BOARD_SEPOLICY_DIRS for 64-bit emulators."
* commit '13d8654ffedfd86733feb4712b26a9e24a4ed90d':
  Define BOARD_SEPOLICY_DIRS for 64-bit emulators.
2015-04-29 19:20:41 +00:00
Stephen Smalley 21ebc213bb Define BOARD_SEPOLICY_DIRS for 64-bit emulators.
Define BOARD_SEPOLICY_DIRS for the arm64, mips64, and x86_64
emulator targets.  As a first cut, simply inherit from the
existing policy directories used for generic and generic_x86.
We may need further board-specific policy added for these targets
but testing will require first enabling SELinux in the relevant
kernel configs.

Change-Id: I7b4459b32298698fc2908cbbdd0e3afadbe5ac24
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-04-29 09:55:08 -04:00
bohu 22f1bc5db2 Bump sdk arm system image size to 750M
To fix broken build of arm system images.

Change-Id: I960dbb2a5a895557499fcf38655cd8907e768ef9
(cherry picked from commit 9f42be14b8)
2015-04-27 19:59:57 +00: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 d6ba1cfdfb am 35790525: am 3a5602eb: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
* commit '35790525cc756c72a44094f55970ec3b3d7e8a28':
  core_base.mk: switch to new H264 and MPEG2 software codecs
2015-04-17 05:20:26 +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 8cd7e9442c am fb102b1b: am 7c794b16: Merge "Revert "core_base.mk: switch to new H264 and MPEG2 software codecs""
* commit 'fb102b1b5107fced1fb7cfdb98b051efb3575ec5':
  Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"
2015-04-16 16:19:14 +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 ec1c2c0fea am b5f7b187: am 161c6971: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
* commit 'b5f7b18749a490a61eac66572ab1a009c608468b':
  core_base.mk: switch to new H264 and MPEG2 software codecs
2015-04-16 15:24:42 +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 414bb9a482 am 78622230: am 47ff7f56: Merge "Add host tool fastboot to every build."
* commit '7862223034dee3ef9ac35e3a5346a24c77eacd1b':
  Add host tool fastboot to every build.
2015-04-13 22:27:54 +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