Commit Graph

323 Commits

Author SHA1 Message Date
Konstantinos Menychtas 956e469327 Increasing MIPS emulator system image size and user-data image size
Size increase taken as a precaution against recent built breakage
due to lack of space on a number of targets (e.g. x86, ARM64).
System and user-data image sizes set to match currently most common
setup for the emulator: system image: 1.25gb, user-data image 700mb.

Change-Id: I7118eb26dd78f5fa9e4f0006e15c8d47dee8e28c
2015-08-18 17:34:09 +00: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 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
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
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
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
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
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
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
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
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
Nick Kralevich 9160c60f13 am 4e94ed11: am 2d47488e: Merge "Drop BOARD_SEPOLICY_UNION."
* commit '4e94ed11855e56ed498a2e7e83e312d5b691c5b9':
  Drop BOARD_SEPOLICY_UNION.
2015-04-01 18:05:29 +00:00
Stephen Smalley 5699c6cf90 Drop BOARD_SEPOLICY_UNION.
As suggested in the comments on
https://android-review.googlesource.com/#/c/141560/
drop BOARD_SEPOLICY_UNION and simplify the build_policy logic.
Union all files found under BOARD_SEPOLICY_DIRS.

Change-Id: I4214893c999c23631f5456cb1b8edd59771ef13b
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-04-01 10:33:24 -04:00
Ying Wang 383cc39285 am 62086971: am d64b853a: Merge "Bump generic_mips64 system partition size."
* commit '62086971c0616c325fd80ef172de1478ade52fbc':
  Bump generic_mips64 system partition size.
2015-03-31 00:19:24 +00:00
Duane Sand e53cf413e1 Bump generic_mips64 system partition size.
Fix broken mips64 build via 20% increase.

Change-Id: Ie30418c6fc7cf8810139abe53537ef8259a49a2f
2015-03-30 17:02:00 -07:00
Ying Wang 8200eff9a3 am 00391a43: am 082184e7: Merge "Bump generic_arm64 system partition size."
* commit '00391a43166a4271ad2471adffb75849be1984a8':
  Bump generic_arm64 system partition size.
2015-03-20 20:41:09 +00:00
Ying Wang 6c194cb0c5 Bump generic_arm64 system partition size.
Change-Id: Ic53fdaa0143ee2c0cce5a2f750da4c52adc6fdb9
2015-03-20 13:29:10 -07:00
Ying Wang daeaa57a4e am b9583756: am 8e52e15d: Merge "Bump generic_mips system partition size."
* commit 'b9583756eecda3dbad41b83fcba51ef7c07ac907':
  Bump generic_mips system partition size.
2015-03-20 17:10:51 +00:00
Ying Wang 779e9cc806 Bump generic_mips system partition size.
Change-Id: Ieb3becc3ddc1efa19c6e6d34b4a31c0440d3479d
2015-03-20 09:18:33 -07:00
Justin Morey abd5bbc4fe am 292427b6: am 030b5493: resolved conflicts for merge of 68000907 to lmp-mr1-dev
* commit '292427b69f7b1a753c0636f916382e2a4f9648ba':
  Bump generic_x86_64 system partition size - DO NOT MERGE
2015-03-19 03:00:29 +00:00
Justin Morey 030b549314 resolved conflicts for merge of 68000907 to lmp-mr1-dev
Change-Id: I9f1a80746a5d945c704cd126efebca0941e27e47
2015-03-18 21:29:09 -05:00
Justin Morey 02060b7bdd Bump generic_x86_64 system partition size - DO NOT MERGE
This makes it big enough to hold Orla, unbreaking the build

Change-Id: I5a131dfbaaa3aa2bb1bc24e4f859cc3507b671b0
2015-03-18 21:04:14 +00:00
Douglas Leung 3713ded238 Increase system and userdata partition sizes.
The extra system space is needed for mips64r6/mips32r6 quick
mode images and the extra userdata is needed to run ART tests.

Change-Id: I96dc1553d950dcf046b57feff10a369e9155bd4d
2015-03-11 16:36:54 +00:00
Ying Wang 0487ab1ec0 am 58aeaed9: Merge "goldfish_logcat: remove permissive_or_unconfined()"
* commit '58aeaed9ce5c3738dd8eb36d56484a9614fb00e0':
  goldfish_logcat:  remove permissive_or_unconfined()
2015-02-23 17:34:38 +00:00
Ying Wang 723d003929 am aa67c0ce: Merge "qemud: remove permissive_or_unconfined()"
* commit 'aa67c0ce9a9697f5ac192020ee8b75734862b129':
  qemud:  remove permissive_or_unconfined()
2015-02-23 17:34:37 +00:00
Ying Wang 4ca5ab5d4a am 4be75b37: Merge "qemu_props: remove permissive_or_unconfined()"
* commit '4be75b37333f22e8ce10cc8aff7e9756b2f82689':
  qemu_props:  remove permissive_or_unconfined()
2015-02-23 17:34:36 +00:00
Ying Wang a65c7cf1a6 am 5d47a481: Merge "goldfish_setup: remove permissive_or_unconfined()"
* commit '5d47a481fb88ca4dba853d064eb5dfd671f9b68a':
  goldfish_setup:  remove permissive_or_unconfined()
2015-02-23 17:34:35 +00:00
Ying Wang 58aeaed9ce Merge "goldfish_logcat: remove permissive_or_unconfined()" 2015-02-23 17:30:50 +00:00
Ying Wang aa67c0ce9a Merge "qemud: remove permissive_or_unconfined()" 2015-02-23 17:30:43 +00:00
Ying Wang 4be75b3733 Merge "qemu_props: remove permissive_or_unconfined()" 2015-02-23 17:30:28 +00:00
Ying Wang 5d47a481fb Merge "goldfish_setup: remove permissive_or_unconfined()" 2015-02-23 17:30:28 +00:00
Bill Yi 251412b472 Merge commit 'b89ec38113a22d09b0832ed2d3cb8fc413a14a75' into HEAD 2015-02-19 14:30:26 -08:00
Elliott Hughes 24374e5752 Merge "Remove ARCH_ARM_HAVE_TLS_REGISTER." 2015-02-17 17:47:10 +00:00
Elliott Hughes e033c6df7d Remove ARCH_ARM_HAVE_TLS_REGISTER.
This was only needed for platform builds, and was removed in the gap between
armv5 being removed and being added back again for tapas builds. Otherwise it
would have been removed back then.

(I suspect that we don't need the system.prop file in here, either, but I
don't really know how to test that.)

Change-Id: I212ff7b3568b5d5ff3cc66150ec7c4fa0b8cac92
2015-02-13 20:51:12 -08:00
Ying Wang f5a6279c4c am bdfec89d: Merge "Increase BOARD_SYSTEMIMAGE_PARTITION_SIZE to 900MB for mips64."
* commit 'bdfec89d96819cf78faa4a61635c2ec536b4545f':
  Increase BOARD_SYSTEMIMAGE_PARTITION_SIZE to 900MB for mips64.
2015-02-12 20:11:19 +00:00
bohu 05defc16b6 am d857abd1: am 151205c3: Merge "Bump generic_mips and generic_x86_64 system partition size" into lmp-mr1-dev
* commit 'd857abd1ff8b3436d15765e93b0d4d0ec1a9147a':
  Bump generic_mips and generic_x86_64 system partition size
2015-02-12 01:16:22 +00:00
bohu 4c49eaadf3 Bump generic_mips and generic_x86_64 system partition size
This fixes the sdk_google_phone_mips and sdk_google_phone_x86-64
builds

Change-Id: I971d02b07a6aa917d7e0f3750b48e657205aae52
2015-02-11 16:51:54 -08:00
Stephen Smalley 7b4a69adf4 qemud: remove permissive_or_unconfined()
Change-Id: Ia15cf87de1d03364f80d3d0cbc546475abfef448
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-02-10 17:29:01 -05:00
Stephen Smalley 25a150c5e1 qemu_props: remove permissive_or_unconfined()
Change-Id: I29f37822ccac22dd884d88f9dcd23237b5a3e2de
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-02-10 17:28:41 -05:00
Stephen Smalley 063b6b85d6 goldfish_setup: remove permissive_or_unconfined()
Change-Id: I3b44f24554f288f4fb1e18a53fa68e8a7cd8c8c7
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-02-10 17:28:11 -05:00
Stephen Smalley de78c2776a goldfish_logcat: remove permissive_or_unconfined()
Change-Id: I1a26b07bf723c944c7dcb8beec96537500a3bc60
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-02-10 17:27:41 -05:00
Douglas Leung 206cbdb68e Increase BOARD_SYSTEMIMAGE_PARTITION_SIZE to 900MB for mips64.
This is needed to build mips64 ART in quick mode.

Change-Id: I8a9e62389a3d4edb84bf1d6814d6594565bc98ba
2015-02-10 11:55:12 -08:00
Brian Carlstrom d169346b05 am 7a1125bc: Merge "Make TARGET_CPU_VARIANT the same as TARGET_ARCH_VARIANT for Mips."
* commit '7a1125bc632e150b934538036102807374406d2f':
  Make TARGET_CPU_VARIANT the same as TARGET_ARCH_VARIANT for Mips.
2015-01-09 18:02:20 +00:00
Douglas Leung 3cf3d78600 Make TARGET_CPU_VARIANT the same as TARGET_ARCH_VARIANT for Mips.
This is used to set --instruction-set-variant for dex2oat.

Change-Id: Ic93d1bfab634489e004ccf1195cdcfc767f092ef
2015-01-07 18:50:06 -08:00
Ying Wang 904e88b5be am 8750cfc5: am 111ba923: Bump generic_arm64 system partition size to 900M.
* commit '8750cfc5b5af821c90b224e727729e721c981e78':
  Bump generic_arm64 system partition size to 900M.
2014-12-10 22:36:49 +00:00
Ying Wang 111ba923be Bump generic_arm64 system partition size to 900M.
This fixes the arm64 sdk build.

Change-Id: Ic7b7ada79027845974cbcfc68941cfc87ed050fd
2014-12-10 09:56:06 -08: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