Commit graph

448 commits

Author SHA1 Message Date
Jiyong Park
38f8aacf3b Add aosp_arm64_ab for generic system image for A/B-ready devices
aosp_arm64_ab is added as a product to build a generic system image for
all devices with ARM64 and A/B ready partitions. For now, it only
supports sailfish/marlin devices because following items are not yet
split.

- fstab
- overlays
- sepolicy

Bug: 35653062
Test: build and flash it to sailfish (or marlin)

$ source build/envsetup.sh; choosecombo 1 sailfish userdebug
$ ENABLE_EARLY_MOUNT=true ENABLE_TREBLE=true m -j 80
$ fastboot flashall
(For now, the two ENABLE_* are required to install  *.rc and *.prop
files into vendor partition. This restriction will be removed in the
future.)

$ source build/envsetup.sh; choosecombo 1 aosp_arm64_ab userdebug
$ m -j 80 systemimage
$ fastboot flash system out/target/product/generic_arm64_ab/system.img
$ fastboot -w reboot

Change-Id: Ia91163f2d51e90a488c9451cba23242887ea82ba
2017-03-09 17:14:37 +09:00
bohu
225f804e30 Emulator: set correct rild library path for 64bit arch
BUG: 34861221
Test: build and run sdk_google_phone_x86_64 with emulator
and check radio logcat to make sure it does not complain
about the 32bit library system/lib/libreference-ril.so
being used. Also check the kernel message to make sure
rild is launched properly

Change-Id: I6cbd5abcf64bec9a504066a43fefc55fa698a864
2017-02-01 12:52:48 -08:00
Yahan Zhou
ad9bf7b3e6 Increase system image size for arm64 to 2.5G to fix buildbot
This CL increases system image size for arm64 to 2.5G to fit in the
packages.

Change-Id: I5ae52c5f64e7d54b70e36bb0bce68e8197365017
2017-01-24 12:33:11 -08:00
Yahan Zhou
c363436272 Increase system image size for x64 to 2.5G
x64 uses more space than others.

Change-Id: I67674823960874164f6d40ad07c6e865eaacefc5
2017-01-24 12:33:10 -08:00
Yahan Zhou
93d1636508 Increase system image size to 2GB for the emulator
This is needed as GTS requires us to pre-install more google apps into
the system image.

Change-Id: Iaf72f745df97604c2d0bc3fbdca01730ca7be94d
2017-01-24 12:30:07 -08:00
Hiroshi Yamauchi
34826908e6 Increase the generic_arm64 system image partition size to to 2G.
Bug: 34571380
Test: build sdk_google_phone_arm64.

Change-Id: I53c8980417bfac3651d71c13111a0c1dc0022d6c
2017-01-23 10:49:43 -08:00
Weilun Du
0499d282a7 Merge "Allow /dev/goldfish_sync" 2017-01-10 19:32:23 +00:00
Lingfeng Yang
ee3bd46245 Merge "Allow goldfish-setup to take wake locks" am: 10f6bf093d am: 528a561d4e am: f0069a0c7f
am: f5bb5b739a

Change-Id: I46f1077c114e1e7f972dc1823277d66b01348424
2017-01-06 20:18:51 +00:00
Lingfeng Yang
de0eaf2b7b Allow goldfish-setup to take wake locks
Change-Id: I6a5db8586168e47e974a82afd2e75fd858aa5750
2017-01-06 10:12:08 -08:00
Lingfeng Yang
e1b174f11c Allow /dev/goldfish_sync
manual cherry pick of:
https://googleplex-android-review.git.corp.google.com/#/c/1024926/

Change-Id: I41883eafd2b261d000c41eaf3ba04af7e2b89349
(cherry picked from commit 10bbf13fe7a3c2bfa28a4f560bb6f85de4edf786)
2017-01-05 18:54:59 +00:00
Mark Salyzyn
99fe879424 Merge "logpersist: introduce split to logcat and logpersist domains" am: 04f2cbd92a am: 76b36cfb98 am: 76e0e2a53e
am: f4f347cf06

Change-Id: Ib5776224c1a854c481756fb10f133aad2074fefd
2016-12-20 22:24:54 +00:00
Mark Salyzyn
239ef9d502 logpersist: introduce split to logcat and logpersist domains
logcat_exec transition to logpersist from init with perms

Test: compile
Bug: 30566487
Change-Id: I0cea55f71be011e921841ef9d3e1283f11606f36
2016-12-20 20:32:01 +00:00
Richard Haines
227fa5d597 Merge "goldfish_setup: grant ifconfig priv_sock_ioctls" am: 4a0f550cc7 am: f80ed9f08e
am: d1cb2ac13a

Change-Id: Ic908915602bfdade8e3d5fadf0197f02839ea790
2016-10-20 18:03:58 +00:00
Richard Haines
f80ed9f08e Merge "goldfish_setup: grant ifconfig priv_sock_ioctls"
am: 4a0f550cc7

Change-Id: Ie7cfadf3dd2b8e0687bcfcb8f14c5234854dc727
2016-10-20 17:47:57 +00:00
Treehugger Robot
4a0f550cc7 Merge "goldfish_setup: grant ifconfig priv_sock_ioctls" 2016-10-20 17:37:43 +00:00
Richard Haines
8a09cc2297 goldfish_setup: grant ifconfig priv_sock_ioctls
The goldfish_setup shell script needs the ability to set the interface
address via ifconfig. This requires SIOCSIFADDR plus other ioctl
permissions, therefore allow the set of priv_sock_ioctls permissions.

Addresses the following denial that stops internet access via browser:
avc: denied { ioctl } for pid=712 comm="ifconfig" path="socket:[1825]"
dev="sockfs" ino=1825 ioctlcmd=8916 scontext=u:r:goldfish_setup:s0
tcontext=u:r:goldfish_setup:s0 tclass=udp_socket permissive=0

Test: With update can access internet via browser.

Change-Id: I77a52c0b72bb0ebe9451f45c346a399c1f61672d
Signed-off-by: Richard Haines <richard_c_haines@btinternet.com>
2016-10-20 16:46:22 +01:00
Dan Willemsen
8134339d26 Merge "For emulator builds preopt system apps even if doing eng build" am: 6dfd788fda am: cb3991d670
am: 178d8647e1

Change-Id: I3a0938d14708568f21cdc3eb7eeb6d741b24e570
2016-10-19 18:18:06 +00:00
Dan Willemsen
cb3991d670 Merge "For emulator builds preopt system apps even if doing eng build"
am: 6dfd788fda

Change-Id: I5556244da69ca46583a63cfa83a321efa14b2381
2016-10-19 18:04:34 +00:00
Nikola Veljkovic
dcef8d3470 For emulator builds preopt system apps even if doing eng build
Following change disabled preopt for system apps when doing eng build:
    4df565786a

    Build: Only preopt boot images in eng builds

    As a middle way between full preopt/high performance/long builds,
    and no preopt/low performance/fast turnaround, preopt only the
    boot image in eng builds.

    I4a2692f3ce84823cd40c6b7d672fd73257739ef8

This works well for devices, but first boot on emulator takes 10+mins.
Bypass the change by forcing preopt inside the BoardConfig.

Change-Id: I58d100cd65d2a09b644a90d91261102aab31fcbb
2016-09-27 16:07:32 +00:00
bohu
a0e05b44a4 Emulator: increase x86_64 system image size to 2G am: 67d789a9a5 am: d84d576e9b
am: e88bd41f07

Change-Id: Ifd88c4d556da3c49495293f9785c1e0ecd012f81
2016-09-15 00:47:15 +00:00
bohu
e88bd41f07 Emulator: increase x86_64 system image size to 2G am: 67d789a9a5
am: d84d576e9b

Change-Id: I900de587d535267a4479b0e56db0aaf24278d9a8
2016-09-14 23:46:28 +00:00
bohu
67d789a9a5 Emulator: increase x86_64 system image size to 2G
Fix the build on nyc-mr1-emu-dev

Change-Id: Iae5160289c98d045096a9dae9d536df447ca18f7
2016-09-14 21:42:58 +00:00
Dan Stoza
8b0d255331 Remove DispSync default value/docs am: ae5e550f81 am: 92df306bd9
am: cddda45883

Change-Id: I3073c1f3b7d4de885519a9f0a9120069687a37d3
2016-09-12 18:03:38 +00:00
Dan Stoza
cddda45883 Remove DispSync default value/docs am: ae5e550f81
am: 92df306bd9

Change-Id: I0b21afde084512b622f74983456491749aa7c5a7
2016-09-12 17:51:17 +00:00
Dan Stoza
ae5e550f81 Remove DispSync default value/docs
Moves DispSync phase offset default values and documentation to
frameworks/native/services/surfaceflinger/Android.mk.

Bug: 30801895
Change-Id: I44a4355b2d112561b94ccfc6e9c3365885c205ad
2016-09-09 13:53:52 -07:00
Duane Sand
5e1558d542 Merge changes I65c3fa9a,Id1ea5e8b am: 126ea5a55c am: 7363b91cb1 am: c2793b97e9
am: ec26fd752e

Change-Id: Iaaa49605571302f8fccd597a23e0611204184667
2016-09-06 23:37:09 +00:00
Treehugger Robot
126ea5a55c Merge changes I65c3fa9a,Id1ea5e8b
* changes:
  Pair mips64r6 with mips32r2 on Aosp
  Allowing pairing mips64r6 with mips32r1 and r2
2016-09-06 22:38:40 +00:00
Duane Sand
9f525961ac Pair mips64r6 with mips32r2 on Aosp
On mips64r6 cpus, the preferred zero-emulation-overhead 32-bit arch
variant is mips32r6.  Mips32r1 and mips32r2 software runs but with
frequent op-emulation traps to the kernel.  Android NDK had support
for mips32r6 prebuilt binaries in release r10 but lacked STL binaries
in r11 and omits all mips32r6 prebuilts in r13.

To keep mips64 buildable using just aosp sources, switch to using the
slower mips32r2 variant as its 2nd cpu arch.  This applies only to the
aosp copy of Android.  Imgtec's redistribution of Android releases will
instead use mips32r6 as the 2nd cpu arch, using a privately-maintained
prebuilts/ndk that includes all needed mips32r6 libraries.

The standard 32-bit Mips build on aosp uses mips32r2 as its native ABI.
That also runs mips32r1 apps built by NDK and mips32r1 android STL
components built by NDK.  Similarly, the 2nd arch for mips64r6 will
use mips32r2 itself but runs fine with mips32r1 apps and components.

Change-Id: I65c3fa9a3e5427be12955b902e6ec965de85e608
2016-08-11 11:09:50 -07:00
Roozbeh Pournader
8e9eddba35 Remove last mention of EXTENDED_FONT_FOOTPRINT.
Setting EXTENDED_FONT_FOOTPRINT has been a no-op for a while, since
no one reads it anymore. Also do the same for naver-fonts, which had
also become a no-op.

Bug: 21785576
Change-Id: I3818adcbba11398024b82c2f22fe2d545b55418d
2016-06-09 17:51:16 -07:00
Nick Kralevich
03bfdea1a3 goldfish_setup: grant /system/bin/sh exec access
The goldfish_setup shell script needs the ability to execute
the shell script interpreter. Allow it.

Addresses the following denial:

avc: denied { getattr } for pid=1220 comm="init.goldfish.s"
path="/system/bin/sh" dev="vda" ino=442 scontext=u:r:goldfish_setup:s0
tcontext=u:object_r:shell_exec:s0 tclass=file permissive=0

(cherrypicked from commit 501c88c029)

Bug: 28941573
Change-Id: I22d26e90f107c8d801229354a5e0513c37e6c31d
2016-06-09 09:52:39 -07:00
Nick Kralevich
80099408c9 goldfish_setup: grant /system/bin/sh exec access am: 501c88c029
am: 477ff93b14

* commit '477ff93b14ff46bef46fe7ca5242329b14328d8e':
  goldfish_setup: grant /system/bin/sh exec access

Change-Id: I0e4222bb838715423225337745537432ac57f1a0
2016-05-25 05:20:24 +00:00
Nick Kralevich
ce2e90308e goldfish_setup: grant /system/bin/sh exec access
am: 501c88c029

* commit '501c88c0290eb2308c110398f106411260863bb8':
  goldfish_setup: grant /system/bin/sh exec access

Change-Id: I9cf86d98f355342416a584ca74ac189f1873c6d7
2016-05-25 05:17:42 +00:00
Nick Kralevich
501c88c029 goldfish_setup: grant /system/bin/sh exec access
The goldfish_setup shell script needs the ability to execute
the shell script interpreter. Allow it.

Addresses the following denial:

avc: denied { getattr } for pid=1220 comm="init.goldfish.s"
path="/system/bin/sh" dev="vda" ino=442 scontext=u:r:goldfish_setup:s0
tcontext=u:object_r:shell_exec:s0 tclass=file permissive=0

Bug: 28941573
Change-Id: I22d26e90f107c8d801229354a5e0513c37e6c31d
2016-05-24 17:40:53 -07:00
Dan Willemsen
56242e5ca5 Merge "Add a 32-bit x86_64 arch variant" am: 19b7692496
am: f51e73d8bf

* commit 'f51e73d8bf10c32cee5bc9bded78949e50bb9b1c':
  Add a 32-bit x86_64 arch variant

Change-Id: Ib5f51ddcdec6f38a9cfc8f6182b6919c4f24aee6
2016-05-11 00:49:22 +00:00
Dan Willemsen
04aa521eca Add a 32-bit x86_64 arch variant
The current 32-bit configuration for generic x86_64 targets inherits some
variables (SSE4 support) from the 64-bit configuration, and overrides
the make variables used for other configurations (SSSE3). Ideally, these
would be using different variables, but until then, unify the
configuration for x86_64 targets so that everything is consistent.

Bug: 28694691
Change-Id: I47e67299d4c632e7491d7e73dc0fc6480ef08006
2016-05-10 14:15:41 -07:00
bohu
d7f734024f Merge "Fix emulator specific SELinux denials related to qemu.gles" into nyc-dev
am: 94f576d

* commit '94f576d18cb61e672bcc849a324eab244dd4f3f8':
  Fix emulator specific SELinux denials related to qemu.gles

Change-Id: Iba1c077238ec1c41434c87e8ac96467a081383fc
2016-04-20 21:04:31 +00:00
Bo Hu
94f576d18c Merge "Fix emulator specific SELinux denials related to qemu.gles" into nyc-dev 2016-04-20 18:46:38 +00:00
bohu
bf863dbffc Fix emulator specific SELinux denials related to qemu.gles
init: avc:  denied  { set } for property=qemu.gles pid=108 uid=1003 gid=1003 scontext=u:r:bootanim:s0 tcontext=u:object_r:qemu_prop:s0 tclass=property_service permissive=1
init: avc:  denied  { set } for property=qemu.gles pid=75 uid=0 gid=0 scontext=u:r:zygote:s0 tcontext=u:object_r:qemu_prop:s0 tclass=property_service permissive=1

bug: 28221393
Change-Id: Icb0ee7fbf9a7b985f66fac087a48d9b5789e2b67
2016-04-19 15:04:58 -07:00
Nick Kralevich
6910622a70 Merge "Move sysfs_writable to emulator specific policy" am: 821e3fd
am: ef77794259

* commit 'ef77794259155f5a8bd3f5be56dcd49463d3ad65':
  Move sysfs_writable to emulator specific policy

Change-Id: Idb7c6a37c5da58450e6332ccafca83ad6754f701
2016-04-19 00:28:42 +00:00
Nick Kralevich
db411cf903 Move sysfs_writable to emulator specific policy
This type is never used in core policy, only by emulators.
Move the definition of this type to where it's used.

Bug: 28221393
Change-Id: I38dbc12dbe9813f323d4bcd5f07679db57b2fd4a
2016-04-18 15:18:09 -07:00
Nick Kralevich
6cba1fed80 Address emulator specific SELinux denials
am: 841f6d8

* commit '841f6d870db50862bb6be2e963149f46768f8aca':
  Address emulator specific SELinux denials

Change-Id: I4aba83efb36510f730e515da476e900e94cbbca6
2016-04-18 22:07:15 +00:00
Nick Kralevich
1eb14d0d61 Address emulator specific SELinux denials
(cherrypicked from commit 841f6d870d)

Fix the following denials:

  avc: denied { search } for pid=222 comm="system_server"
  name="qemu_trace" dev="sysfs" ino=45 scontext=u:r:system_server:s0
  tcontext=u:object_r:sysfs_writable:s0 tclass=dir permissive=1

  avc: denied { open } for pid=222 comm="system_server"
  name="u:object_r:opengles_prop:s0" dev="tmpfs" ino=1429
  scontext=u:r:system_server:s0 tcontext=u:object_r:opengles_prop:s0
  tclass=file permissive=1

  avc: denied { read } for pid=222 comm="system_server"
  name="u:object_r:radio_noril_prop:s0" dev="tmpfs" ino=1430
  scontext=u:r:system_server:s0 tcontext=u:object_r:radio_noril_prop:s0
  tclass=file permissive=1

  avc: denied { open } for pid=222 comm="system_server"
  name="u:object_r:radio_noril_prop:s0" dev="tmpfs" ino=1430
  scontext=u:r:system_server:s0 tcontext=u:object_r:radio_noril_prop:s0
  tclass=file permissive=1

  avc: denied { getattr } for pid=222 comm="system_server"
  path="/dev/__properties__/u:object_r:radio_noril_prop:s0" dev="tmpfs"
  ino=1430 scontext=u:r:system_server:s0
  tcontext=u:object_r:radio_noril_prop:s0 tclass=file permissive=1

  avc: denied { search } for pid=424 comm="putmethod.latin"
  name="qemu_trace" dev="sysfs" ino=45
  scontext=u:r:untrusted_app:s0:c512,c768
  tcontext=u:object_r:sysfs_writable:s0 tclass=dir permissive=1

Bug: 28221393
Change-Id: I6fce1127d9d9e8bc0119bace3f142d51382401c0
2016-04-18 14:57:24 -07:00
Nick Kralevich
841f6d870d Address emulator specific SELinux denials
Fix the following denials:

  avc: denied { search } for pid=222 comm="system_server"
  name="qemu_trace" dev="sysfs" ino=45 scontext=u:r:system_server:s0
  tcontext=u:object_r:sysfs_writable:s0 tclass=dir permissive=1

  avc: denied { open } for pid=222 comm="system_server"
  name="u:object_r:opengles_prop:s0" dev="tmpfs" ino=1429
  scontext=u:r:system_server:s0 tcontext=u:object_r:opengles_prop:s0
  tclass=file permissive=1

  avc: denied { read } for pid=222 comm="system_server"
  name="u:object_r:radio_noril_prop:s0" dev="tmpfs" ino=1430
  scontext=u:r:system_server:s0 tcontext=u:object_r:radio_noril_prop:s0
  tclass=file permissive=1

  avc: denied { open } for pid=222 comm="system_server"
  name="u:object_r:radio_noril_prop:s0" dev="tmpfs" ino=1430
  scontext=u:r:system_server:s0 tcontext=u:object_r:radio_noril_prop:s0
  tclass=file permissive=1

  avc: denied { getattr } for pid=222 comm="system_server"
  path="/dev/__properties__/u:object_r:radio_noril_prop:s0" dev="tmpfs"
  ino=1430 scontext=u:r:system_server:s0
  tcontext=u:object_r:radio_noril_prop:s0 tclass=file permissive=1

  avc: denied { search } for pid=424 comm="putmethod.latin"
  name="qemu_trace" dev="sysfs" ino=45
  scontext=u:r:untrusted_app:s0:c512,c768
  tcontext=u:object_r:sysfs_writable:s0 tclass=dir permissive=1

Bug: 28221393
Change-Id: I6fce1127d9d9e8bc0119bace3f142d51382401c0
2016-04-18 13:28:04 -07:00
Ying Wang
77f67cd048 Merge "Support x86+arm multilib build."
am: d314805

* commit 'd314805c29fdbee3508b99c14ca63e1a8d170c3b':
  Support x86+arm multilib build.
2016-03-25 21:51:21 +00:00
Ying Wang
87538e4f8b Support x86+arm multilib build.
Support TARGET_2ND_ARCH as the binary translation arch.
See target/board/generic_x86_arm/BoardConfig.mk and
target/product/aosp_x86_arm.mk as example for the setup.

In BoardConfig, use the TARGET_2ND_ARCH/etc. variables to set up the
binary translation arch;
Set "TARGET_TRANSLATE_2ND_ARCH := true" to tell the build system it's
not a typical 64-bit multilib configuration.
In product makefile, use "PRODUCT_PACKAGES += libfoo_<2nd_arch>" to
install the TARGET_2ND_ARCH libraries. This also pulls in any dependency
libraries.
By default we don't install any TARGET_2ND_ARCH modules, unless it's
pulled in by PRODUCT_PACKAGES.

Bug: 27526885
Change-Id: I0578e9c80da0532d2fa886a8fcdb140bbc703009
(cherry-pick from commit 277e75a488)
2016-03-25 13:29:53 -07:00
Prathmesh Prabhu
6e64f417cd Emulator: Bump mips(64) system image partition size to 1.75 GB.
BUG:27834040
Change-Id: I71861b023e8155df951036053ab0561e153d04fd
(cherry picked from commit 8a17ace10e)
2016-03-25 00:20:29 +00:00
Prathmesh Prabhu
316654fc23 Emulator: Bump arm(64) system image partition size to 1.75 GB
Change-Id: If9ce0346ed4ca7ceab3fda217e5c9de6d89b6c94
2016-03-14 18:07:31 +00:00
Bo Hu
fed6c5cb0b Merge "emulator: allows surfaceflinger to change qemu.gles value" into nyc-dev 2016-02-23 21:46:34 +00:00
Prathmesh Prabhu
e6ea602bb4 Generic x86_64: Bump system image partition size to 1.75 GB.
BUG=b.android.com/201662

Change-Id: I3b13082d73a3e1c9f49cb9158d2423dc580a8c75
2016-02-23 20:33:23 +00:00
bohu
37f5b608e1 emulator: allows surfaceflinger to change qemu.gles value
This is to allow surfaceflinger to always load vendor provided
egl libraries first and fall back to software renderer, and then
set the qemu.gles to correct value reflecting what libraries
are actually used.

bug: 27273457

Change-Id: Ifaca31aa2e562f50baa41fd228df9836bc3b1667
2016-02-20 01:39:27 +00:00