Commit graph

2259 commits

Author SHA1 Message Date
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
Dan Sandler
377d5bdb3f Merge \"The easter egg is now its own APK.\" into nyc-dev
am: 18ecea3986

Change-Id: I4712931d6e73ecb08dae76b77ad12585a914882b
2016-06-26 22:56:05 +00:00
Dan Sandler
26c4ef4c65 The easter egg is now its own APK.
It should be included wherever SystemUI is.

Bug: 27376882
Change-Id: Ibe2688c86e58bdfb8a5278c9c4939d7cdb524078
2016-06-26 18:07:59 +00: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
Vikas Marwaha
98dce87fe1 resolve merge conflicts of 07886f1 to nyc-dev-plus-aosp
Change-Id: Iae0444b9e9e7b4db3bfd94f5712e22aa08a122b5
2016-06-09 05:46:40 +00:00
Vikas Marwaha
465fa9b38f Added make files for variable PRODUCT_SHIPPING_API_LEVEL.
Bug: 26381401

Change-Id: I8f2e630118cfa474564eb21911448bc813fcfec7
2016-06-07 15:08:27 -07:00
Narayan Kamath
8b62c008f6 Merge "Add default values for pm.dexopt.core-app." into nyc-dev
am: da147a7c20

* commit 'da147a7c20bf73f9b3736f6c479f3a8f3f56ab9e':
  Add default values for pm.dexopt.core-app.

Change-Id: I566fc87539166998340617bbcc7336b5fcc691bc
2016-06-06 15:15:01 +00:00
Vikas Marwaha
404ccc83c4 Add variable PRODUCT_SHIPPING_API_LEVEL and make files with the
new read only product property ro.product.first_api_level.

PRODUCT_SHIPPING_API_LEVEL declares which API level a device first
shipped with. We use this variable to set a read-only property that
can be used in CTS/GTS tests.

Change-Id: If54202075d3b92ed380655cde8b3fc50c5ba73b3
2016-06-03 23:02:27 +00:00
Narayan Kamath
41a3b1b413 Add default values for pm.dexopt.core-app.
bug: 28998083

Change-Id: Iec4415ad7e5122c1168024f6ccf39b5e342cc7fd
2016-06-02 16:35:03 +01:00
Bjoern Johansson
a521a01345 Merge "Remove Dev Settings app from emulator images" into nyc-dev
am: 4f2f58791f

* commit '4f2f58791f31a66a61865e6c6095a2113609577a':
  Remove Dev Settings app from emulator images

Change-Id: Ib7f40046ec64ba08055fec219107b782ebbc1340
2016-05-27 17:24:36 +00:00
Bjoern Johansson
d7db5d514a Remove Dev Settings app from emulator images
The Dev Settings app currently just launches an intent that is received
by the regular Settings app. However, since N the Settings app only
receives the intent when developer mode is enabled. If it is not enabled
the Dev Settings app will crash. Since the Dev Settings app doesn't
really add much benefit this change removes it from the emulator system
images to prevent this issue. The user will have to access the developer
settings from the regular Settings app just like on a physical device.

BUG: 27549126

Change-Id: I8191f9003bb452ef76c4b236b965368b48be3d25
2016-05-25 18:31:25 -07: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
Andreas Gampe
5d558c5f13 Merge "Build: Only use compiled-classes file when available" into nyc-dev
am: 57c3aea442

* commit '57c3aea442bff67e4452eee7ff8f13294fbad34b':
  Build: Only use compiled-classes file when available

Change-Id: I9a3ae7385483f9f5d934d8cd6660c17c57529989
2016-05-23 20:48:00 +00:00
Andreas Gampe
bbb0b31cf2 Build: Only use compiled-classes file when available
Don't pull in things from frameworks/base when they're not there.

Bug: 28878540
Change-Id: Ida8a5e4e46dc5cd5bdedc4bb66640abb4969e1f3
2016-05-20 13:52:02 -07:00
Andreas Gampe
28efcb6d39 Build: Use phone compiled-classes in core_minimal
am: 695b28f67c

* commit '695b28f67c88b87486911f8881078e7857e989a8':
  Build: Use phone compiled-classes in core_minimal

Change-Id: I3b3a362c17c741994b34a2f70301806eadf9098d
2016-05-19 05:10:55 +00:00
Andreas Gampe
695b28f67c Build: Use phone compiled-classes in core_minimal
Use default phone compiled-classes list to cut down boot image
size on most devices.

Bug: 28026683
Change-Id: I73bb59b792923ebc7549f775085b1c9aed88cc1a
2016-05-18 20:10:43 -07:00
Alex Light
60c7fd15a8 Add fake libart
Bug: 27775991

Change-Id: I54cbdf2340dcfdd9b3973d9d10c8bd94492736fb
(cherry picked from commit 6da74d8f1f)
2016-05-18 07:58:05 -07:00
Amith Yamasani
e536d704e5 Merge "Add CtsShimPrebuilt" into nyc-dev
am: 85c33f500a

* commit '85c33f500aa2ef7c70c1644617e7439b97f22a79':
  Add CtsShimPrebuilt

Change-Id: I604118ab69b52d8965f30ef3f8e0d841a4d7a288
2016-05-17 00:33:05 +00:00
Amith Yamasani
6f7873ca6f Add CtsShimPrebuilt
It was needed for a CTS test but was accidentally
left out?

Bug: 28398205
Change-Id: I7deea60e6b11bc11d3bd8e82170fc42df7cec3c7
2016-05-16 12:43:43 -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
Roozbeh Pournader
1d9cfc58f1 Merge "Remove Romansh from PRODUCT_LOCALES" into nyc-dev
am: 6e034af238

* commit '6e034af238a677db70bc0b10f7f9e08bc8b8aef9':
  Remove Romansh from PRODUCT_LOCALES

Change-Id: I2c6572c55699d43cc687f7acc6c51b6f66c97a54
2016-05-07 00:07:16 +00:00
Roozbeh Pournader
6e034af238 Merge "Remove Romansh from PRODUCT_LOCALES" into nyc-dev 2016-05-06 23:51:48 +00:00
Roozbeh Pournader
1a6a5626f7 Remove Romansh from PRODUCT_LOCALES
The inclusion of Romansh (rm_CH), while it did not have localized
strings, was causing the incorrect assumption that the system
supports Romansh, causing the language fallback to work incorrectly
when Romansh was in the list of user's locales.

Hindi (hi_IN) was also included twice, and this removes the duplicate
too.

Bug: 27325465
Change-Id: I87ec06dc459137f71bb8e5e2f431f629bd51928e
2016-05-06 15:10:51 -07:00
Bjoern Johansson
7b3407f801 Merge "Indicate that all emulator images support USB" into nyc-dev
am: 513e69ec69

* commit '513e69ec69a7e5c61888668a4b16ccab6073419c':
  Indicate that all emulator images support USB

Change-Id: Ie6ee7dbd4fd5cde1ecf828440047cbf81f51aa66
2016-05-05 15:45:00 +00:00
Bjoern Johansson
6b04d94ff7 Indicate that all emulator images support USB
The Android framework assumes that if an app uses UsbManager then there
must be USB support on the device. In order to deal with this the
emulator has to indicate USB support. Previously this was true for
Google SDK phone images because USB support is part of the common API
packages that gets installed. For AOSP and some other build targets USB
support was not included. This change indicates support for USB for all
emulator system images.

BUG: 28088069

Change-Id: I880210e89e6ad3412bdc069d6c20ed54a52cff83
2016-05-04 22:40:56 +00:00
Todd Kennedy
d43b93e7e2 Revert "Revert "Add shim app for CTS testing""
am: 98ffa937bf

* commit '98ffa937bf6d7acc6a1964c7157c906e1a86203c':
  Revert "Revert "Add shim app for CTS testing""

Change-Id: I2eb7d0357861fb9144a9937b6bb60c14af3d6151
2016-05-03 19:42:38 +00:00
Todd Kennedy
98ffa937bf Revert "Revert "Add shim app for CTS testing""
This reverts commit 31003c48c1.

Bug: 28398205
Change-Id: Ia884957e224f46157af31814c32c5e0e1a33b7b8
2016-05-03 11:16:35 -07:00
Todd Kennedy
0451b2f946 Merge "Revert "Add shim app for CTS testing"" into nyc-dev
am: 878775fd75

* commit '878775fd750d7164bd0920b4b94b59e0edab8ed3':
  Revert "Add shim app for CTS testing"

Change-Id: Ie5df8c8ea8785b8562866522f6d13e54b5ce52d5
2016-05-03 00:08:55 +00:00
Todd Kennedy
878775fd75 Merge "Revert "Add shim app for CTS testing"" into nyc-dev 2016-05-02 23:56:37 +00:00
Todd Kennedy
31003c48c1 Revert "Add shim app for CTS testing"
Build errors when trying to dex2oat the CtsShim prebuilt even though it's marked with "hasCode=false".

This reverts commit d987a11126.

Change-Id: If47b3bcd4c727da7acd9068c02f8fb671ed0ae84
2016-05-02 23:54:08 +00:00
Todd Kennedy
46785aea64 Merge "Add shim app for CTS testing" into nyc-dev
am: 6d0c367a64

* commit '6d0c367a64b91cdf8dc6bc25605bff7b13f35a35':
  Add shim app for CTS testing

Change-Id: Ic6342cd60478364533514b576ccc86b6db7ab695
2016-05-02 22:59:21 +00:00
Todd Kennedy
6d0c367a64 Merge "Add shim app for CTS testing" into nyc-dev 2016-05-02 22:49:55 +00:00
Felipe Leme
b382c63a61 Merge "Added bugreportz binary." into nyc-dev
am: 386df80e85

* commit '386df80e85e2098a32c41fee4b8b379991b360b8':
  Added bugreportz binary.

Change-Id: I25aa201a3a7a77771cb57f3eb3ceff435dc1cd15
2016-05-02 20:05:29 +00:00
Felipe Leme
90ab323be2 Added bugreportz binary.
BUG: 28479946
Change-Id: Ic0d1b6598867ccbbc65f3fdc0d32cac7c53128a3
2016-05-02 11:18:07 -07:00
Todd Kennedy
d987a11126 Add shim app for CTS testing
We need a shim application on the system partition that we can upgrade
during CTS tests.

Bug: 27450489
Change-Id: I32a72dc5110cedd466cdee2607965c705f7aa6d3
2016-04-29 07:31:31 -07:00
Alex Light
f82ca86328 Merge "Add fake libart" into nyc-dev
am: 1c04ad1

* commit '1c04ad1b02ea5d149eca71722e76fa14bfe3a6cc':
  Add fake libart

Change-Id: Ib90361465b9f8a79f05181a18f062d82d28754ba
2016-04-25 22:14:37 +00:00
TreeHugger Robot
1c04ad1b02 Merge "Add fake libart" into nyc-dev 2016-04-25 21:53:31 +00:00
Christopher Tate
85520a6b2f Merge "Wallpaper backup/restore is now in its own package" into nyc-dev
am: 8e9431e

* commit '8e9431e54f23c089b3e664a82c622783ef13796c':
  Wallpaper backup/restore is now in its own package

Change-Id: I3501a452d26316da8787a4695fe2ea46ba85518c
2016-04-20 22:19:25 +00:00
Chris Tate
8e9431e54f Merge "Wallpaper backup/restore is now in its own package" into nyc-dev 2016-04-20 22:10:40 +00: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
Alex Light
6da74d8f1f Add fake libart
Bug: 27775991

Change-Id: I54cbdf2340dcfdd9b3973d9d10c8bd94492736fb
2016-04-19 14:31:55 -07:00
Christopher Tate
65e3b75ddc Wallpaper backup/restore is now in its own package
Bug 25453848
Bug 25727875

Change-Id: I774afad99d23f4f7ffb1675909a5a17732af3fb8
2016-04-19 13:08:21 -07:00
Dimitry Ivanov
6c7d7c1f8b Merge "Make sure platform libraries are built, regardless of webview.apk" am: da7fef6
am: b077e80

* commit 'b077e80d041f74af240111f457ebd4dd168da6dd':
  Make sure platform libraries are built, regardless of webview.apk

Change-Id: Ie463aeed9f8f9ef1b12d89d571c8a23d5432b05d
2016-04-19 17:18:49 +00:00
Nikola Veljkovic
8f1ac7c9d6 Make sure platform libraries are built, regardless of webview.apk
Prebuilt WebView is missing for mips64 architecture. Allow device
to boot without it, by making sure platform support libraries are
part of the system image.

WebView APK can then be installed separately.

Change-Id: Iabbb5e6a4778b7542d24bb4f789a7be96232e50c
2016-04-19 14:25:50 +00: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