Commit Graph

2279 Commits

Author SHA1 Message Date
Jeff Sharkey 3f391240d5 Merge "PRODUCT_PACKAGES: add to tune2fs." am: 4337794acd am: a35fba1954
am: 7f5ac24eec

Change-Id: Ia038eb10af41c7403a04e9e5411700cd86079640
2016-10-12 01:35:52 +00:00
Jeff Sharkey 4337794acd Merge "PRODUCT_PACKAGES: add to tune2fs." 2016-10-12 01:16:33 +00:00
Iliyan Malchev 8293fb67b3 Merge "build: add hwservicemanager to the core packages" am: 69bd0bf22a am: 3f044f007f
am: a65c0d3481

Change-Id: If5968ce47c39b5fd55f30893550d581d4c04e414
2016-09-27 00:16:42 +00:00
Iliyan Malchev bd710ed45a build: add hwservicemanager to the core packages
b/31458381
b/31240290

Test: passing build and runtime tests

Change-Id: I294c70d93d23ada94ff1175f2d3babd5b836eeee
Signed-off-by: Iliyan Malchev <malchev@google.com>
2016-09-26 14:21:10 -07: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 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 ec26fd752e Merge changes I65c3fa9a,Id1ea5e8b am: 126ea5a55c am: 7363b91cb1
am: c2793b97e9

Change-Id: I79f3a7c39f23a0f24cdacce3034ed9571bcc7faf
2016-09-06 23:06:24 +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
liminghao a4b899da0c PRODUCT_PACKAGES: add to tune2fs.
N/A

Change-Id: Ie3cb9953046adb3dd6320a84e7572c84d7e07565
Signed-off-by: liminghao <liminghao@xiaomi.com>
2016-08-17 11:06:16 +08: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
Ian Pedowitz c3e2c808de Merge \\"The easter egg is now its own APK.\\" into nyc-dev am: 18ecea3986
am: 377d5bdb3f

Change-Id: I11f7501dcf768397acc4cfc74eee58d27013b6a4
2016-06-26 23:03:00 +00: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 e4224c46cb Merge \"The easter egg is now its own APK.\" into nyc-dev
am: 18ecea3986

Change-Id: Ica7456ab7bf01dba0f294fce3720b0e19db02f38
2016-06-26 22:56:03 +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
Roozbeh Pournader a51b0b6012 Merge \"Revert \"Add Serbian in Latin script to the full locale list\" [DO NOT MERGE]\" into nyc-mr1-dev
am: 9b6ce7bf0d

Change-Id: Ia696c61ce6e24e29627356cfe66819ac98dfafc2
2016-06-24 02:51:25 +00:00
Roozbeh Pournader 9b6ce7bf0d Merge "Revert "Add Serbian in Latin script to the full locale list" [DO NOT MERGE]" into nyc-mr1-dev 2016-06-23 21:52:35 +00:00
Roozbeh Pournader 34247cfda3 Revert "Add Serbian in Latin script to the full locale list" [DO NOT MERGE]
This reverts commit 4c6e1b62e0, since sr-Latn is no longer planned for MR1.

Bug: 29455508
Bug: 29601930
Change-Id: I47c240fa7456940ecb272f05e94f563b221c92c3
2016-06-23 20:03:44 +00:00
Daniel Nishi 3893beb80f Merge \"Add the StorageManager APK to the core build.\" into nyc-mr1-dev
am: 36ae59228c

Change-Id: I09c099f3cbeee26b91a8de56b794c5e6cc581d9f
2016-06-22 23:56:23 +00:00
Daniel Nishi 36ae59228c Merge "Add the StorageManager APK to the core build." into nyc-mr1-dev 2016-06-22 23:50:07 +00:00
Roozbeh Pournader c5a4be50d8 Add Serbian in Latin script to the full locale list
am: 4c6e1b62e0

Change-Id: Ib5c08536c454bafdbd31dc4eb50db3fe1d46def9
2016-06-20 23:25:24 +00:00
Roozbeh Pournader 4c6e1b62e0 Add Serbian in Latin script to the full locale list
Bug: 29455508
Change-Id: I3b6e889d42c41c653824cca15463466d5ccedb43
2016-06-17 21:28:41 -07:00
Daniel Nishi 936cc2a09c Add the StorageManager APK to the core build.
Bug: 28965462
Change-Id: Id2877a22f0b8e675cecc0430013a008993145d6e
2016-06-10 13:14:57 -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
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