Commit Graph

1153 Commits

Author SHA1 Message Date
Ying Wang
06d914c841 am d23bd8f5: Merge "e2fsck missing from emulator"
* commit 'd23bd8f59f396ecd23a54d4e9b798bc872a2e505':
  e2fsck missing from emulator
2013-12-27 12:46:31 -08:00
Eric Frohnhoefer
0214b3fa3c e2fsck missing from emulator
The emulator file system was recently switched to ext4 however, e2fsck was not
added to the emulator build.

Change-Id: I94621c148fa40d6042b5c86a26815d867a417a6c
See: https://code.google.com/p/android/issues/detail?id=64144
2013-12-27 15:30:15 -05:00
Stephen Smalley
61c7107df3 Allow execmem and ashmem_device execute as required.
bootanim requires execmem.
bootanim and surfaceflinger requires execute to ashmem_device.

Change-Id: I3b4964c5acd31a44ce81672077c70353a375c072
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-12-24 11:43:25 -05:00
Nick Kralevich
da5d54c8ce am dfabbc68: Merge "Add policy for x86 emulator."
* commit 'dfabbc6863494374396a94181c408348824b37ab':
  Add policy for x86 emulator.
2013-12-20 13:06:07 -08:00
Stephen Smalley
737f9a167a Add policy for x86 emulator. 2013-12-20 14:33:55 -05:00
Ying Wang
82c59aefcd am 71e8a22e: Merge "Add DEXPREOPT support for ART"
* commit '71e8a22e3478b6b4277957ef47486058a5306286':
  Add DEXPREOPT support for ART
2013-12-17 16:58:43 -08:00
Brian Carlstrom
ced4bff58e Add DEXPREOPT support for ART
Change-Id: I24d0d7b2a23a769f5d69bd4dc14be22e1475b759
2013-12-17 14:44:00 -08:00
The Android Open Source Project
722581a598 Merge commit 'd54f8c2d1b4d88db84465fee93aa29103ca32078' into HEAD
Change-Id: I3cf53f083dee277a450dac36b011bc83180f6294
2013-12-05 12:59:39 -08:00
Ying Wang
a395c6c1e4 am 18ee9e5e: Merge "Push wpa_supplicant modules down to the leaf product config."
* commit '18ee9e5e7de08933a04137e560bff87b113adb21':
  Push wpa_supplicant modules down to the leaf product config.
2013-12-05 12:25:33 -08:00
Ying Wang
730511d9c4 am 3bd3693d: Merge "Delete board config for the unused "emulator" device."
* commit '3bd3693dd0a0b514d6b1e9cbce052dee1940166b':
  Delete board config for the unused "emulator" device.
2013-12-05 12:25:32 -08:00
Ying Wang
404f32d120 am 1caa938a: Merge "Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices"
* commit '1caa938a22606a55103318df82a31a92f47900da':
  Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices
2013-12-05 12:25:31 -08:00
Ying Wang
17fc3d2ac1 Push wpa_supplicant modules down to the leaf product config.
Since 558477c0b2a5a7db679c1ad7551d43e6364d1df2 in
external/wpa_supplicant_8 we don't need those modules if
WPA_SUPPLICANT_VERSION is not set by the BoardConfig.mk.

Actually the generic devices don't need them.

Change-Id: Iff7c1fbf483bd16d5f898836c4e7401d56def80f

Conflicts:
	target/product/core_tiny.mk
2013-12-05 10:12:01 -08:00
Ying Wang
817d803c65 Delete board config for the unused "emulator" device.
Change-Id: I1e1d47fece4113be9f31f04775c5b310d28017e3
2013-12-05 10:08:10 -08:00
Ying Wang
ab6b4e0e22 Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices
Since 558477c0b2a5a7db679c1ad7551d43e6364d1df2 in
external/wpa_supplicant_8 we don't have WPA_SUPPLICANT_VERSION default
to VER_0_8_X.
This fixes the SDK build.

Change-Id: Ib7a8e10705dc6b987b60b1308405e89eaa2a47c9
2013-12-05 10:07:38 -08:00
Xavier Ducrohet
7a33b56429 am 8eb89dde: am ab92f3df: Add Dialer to SDK system image. DO NOT MERGE.
* commit '8eb89dde9b1c4da0aa0d116ef05e12c38873b756':
  Add Dialer to SDK system image. DO NOT MERGE.
2013-12-04 13:33:41 -08:00
Xavier Ducrohet
ab92f3dff0 Add Dialer to SDK system image. DO NOT MERGE.
Change-Id: I4f15482385c869a4ae08d99ae98bffc7c113acd7
2013-12-04 13:25:56 -08:00
The Android Open Source Project
b9041a45b1 Merge commit 'c73341006286c391ae4d268a77f5e008045d5308' into HEAD
Change-Id: I4bf7d32d65e19dfa1f0533fdd3b2295c50b13005
2013-11-22 11:06:11 -08:00
Jeff Brown
c4c92f1c73 am e17927e0: Merge "Add a platform library for remote display providers." into klp-dev
* commit 'e17927e0859778638781d75e33a3d4c5184583c4':
  Add a platform library for remote display providers.
2013-11-07 17:44:06 -08:00
Elliott Hughes
36e681b02a resolved conflicts for merge of 12f87a5b to klp-dev-plus-aosp
Change-Id: I8ce0a86bbaae0c1e3ce5ed46de628ea22ea17d16
2013-11-07 09:08:00 -08:00
Elliott Hughes
12f87a5b77 am a05365ce: Merge "Remove the hacks needed to support ash and mksh concurrently."
* commit 'a05365ceceaead86651f61f7ba66153e36b7be5d':
  Remove the hacks needed to support ash and mksh concurrently.
2013-11-07 08:35:17 -08:00
Elliott Hughes
a05365cece Merge "Remove the hacks needed to support ash and mksh concurrently." 2013-11-07 16:07:32 +00:00
Nick Kralevich
8eec26e276 am 7717bcba: am 240cd127: Merge "Move goldfish-specific policy rules to their own directory."
* commit '7717bcba28ce55bac10f6586feff89da569ff62b':
  Move goldfish-specific policy rules to their own directory.
2013-11-06 16:10:16 -08:00
Nick Kralevich
7717bcba28 am 240cd127: Merge "Move goldfish-specific policy rules to their own directory."
* commit '240cd127eb0a14515b37b2e691645a1e83ab31f9':
  Move goldfish-specific policy rules to their own directory.
2013-11-06 16:02:06 -08:00
Stephen Smalley
1d5352eaa3 Move goldfish-specific policy rules to their own directory.
Change-Id: I1bdd80f641db05fef4714654515c1e1fbb259794
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-11-06 10:24:14 -05:00
Jeff Brown
2cbae109be Add a platform library for remote display providers.
Bug: 11257292
Change-Id: Ia0207010c2f3ae143b483e9c1aa6643142740312
2013-11-05 22:17:57 -08:00
Elliott Hughes
32bfd70333 Remove the hacks needed to support ash and mksh concurrently.
We no longer have ash, and we'd rather not have unnecessary symbolic links
on the system.

Change-Id: Icfb1a51f1baaf1861c203f6ed93843b094deb65d
2013-11-05 11:13:49 -08:00
Alex Medina
f9f0581405 am 0068d25b: Include drawables for all densities - b/11270325
* commit '0068d25b4895162993118fe3b61d2775fa575e70':
  Include drawables for all densities - b/11270325
2013-10-18 18:17:47 -07:00
Alex Medina
0068d25b48 Include drawables for all densities - b/11270325
Change-Id: I0b1f9b930a13982756dca9428ca91aec0ef343f5
2013-10-18 13:42:42 -07:00
Jeff Sharkey
7732eb5bba am 53619434: Merge "Add blkid to all builds for use by vold." into klp-dev
* commit '53619434ed56043841256dfb2074662dbd0acc5e':
  Add blkid to all builds for use by vold.
2013-10-17 09:40:29 -07:00
Jeff Sharkey
1eb5eb1743 Add blkid to all builds for use by vold.
vold now uses blkid to extract UUID and label information from
inserted physical devices.

Bug: 11175082
Change-Id: I56ebe733ff85a498f6d3cbdcf21d40ddc6123f82
2013-10-16 16:31:57 -07:00
Jamie Gennis
1a63bb6619 am e652af1e: Merge "BoardConfig: Add and document vsync phase offset setting" into klp-dev
* commit 'e652af1e808b2b15e23bc472f9be6592735a0a8e':
  BoardConfig: Add and document vsync phase offset setting
2013-10-08 15:13:47 -07:00
Jamie Gennis
782f2ad375 BoardConfig: Add and document vsync phase offset setting
Bug: 10624956
Change-Id: I82def5730f9d09396809d4b8cd2ea44829b21f22
2013-10-07 18:01:17 -07:00
Ben Cheng
a698dab816 am 0b42554f: am 12eeb000: Merge "Add generic aarch64 board config and build rules."
* commit '0b42554fd8c7a43ca45504e4586f1eef578308de':
  Add generic aarch64 board config and build rules.
2013-10-07 14:42:10 -07:00
Ben Cheng
0b42554fd8 am 12eeb000: Merge "Add generic aarch64 board config and build rules."
* commit '12eeb000601883256f306c2c6932cda4d768e97a':
  Add generic aarch64 board config and build rules.
2013-10-07 14:40:42 -07:00
Ben Cheng
db4fc200c4 Add generic aarch64 board config and build rules.
Change-Id: I8b4a377596705dfa0a3bd234162d183ec2ae9530
2013-10-07 13:58:27 -07:00
Justin Koh
b49641c4fd am 752cd60d: Merge "Move DownloadProviderUi from core_minimal to core.mk" into klp-dev
* commit '752cd60d468136d95b9a040eede9e5ff884820a4':
  Move DownloadProviderUi from core_minimal to core.mk
2013-10-02 16:17:50 -07:00
Ying Wang
6a6db9432f am ab7b53b8: am 5d92a933: Merge "x86_64: Adding new target"
* commit 'ab7b53b8e09e3d346384a5257e8f7a440a53dfc0':
  x86_64: Adding new target
2013-10-02 15:06:02 -07:00
Ying Wang
ab7b53b8e0 am 5d92a933: Merge "x86_64: Adding new target"
* commit '5d92a933dcc1a9ddb99b8818c8a13e208ffc22ce':
  x86_64: Adding new target
2013-10-02 15:02:51 -07:00
Justin Koh
066375a869 Move DownloadProviderUi from core_minimal to core.mk
Move DownloadProviderUi from core_minimal to core.mk. This UI requires
DocumentsUi so it doesn't make sense to ship it on devices which are only
using core_minimal.

Change-Id: Id8a4f2a9835a05e9281596dbd5ca7b8e76062cd4
2013-10-02 14:32:15 -07:00
Pavel Chupin
fd82a49e04 x86_64: Adding new target
Add x86_64 Android builds. Compiler is expected to be able to understand
-m64 code generation option.

Change-Id: I99e7337c5a5766afc5e528a481bd21631ff44dd5
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-10-02 20:58:54 +04:00
Ben Gilad
1da0541b7b am d7992e95: Replace a dangling refeence to packages/apps/Phone.
* commit 'd7992e95879535fbb7034c1f8e86460027f4ea04':
  Replace a dangling refeence to packages/apps/Phone.
2013-10-02 09:35:16 -07:00
Ben Gilad
d7992e9587 Replace a dangling refeence to packages/apps/Phone.
Change-Id: I47b68510d19ccbaa2fc125c2a422fd1e857ec18e
2013-09-30 16:54:17 -07:00
Brian Carlstrom
a0cf24a805 am 71fc41df: Enable art for user builds
* commit '71fc41df1eea345949e8e838b573ac367a52f9c7':
  Enable art for user builds
2013-09-19 16:03:32 -07:00
Brian Carlstrom
71fc41df1e Enable art for user builds
Bug: 10069754
Change-Id: Iaaff33a97bd7b68b2e8d84cd0034b15dde8a4316
2013-09-19 15:07:28 -07:00
Brian Carlstrom
cd3641fab2 am 24cffbac: Merge "Add oatdump for ART to go with dexdump for Dalvik" into klp-dev
* commit '24cffbac65dfc1dd17f45dc008abc36140c81032':
  Add oatdump for ART to go with dexdump for Dalvik
2013-09-17 23:43:55 -07:00
Brian Carlstrom
24cffbac65 Merge "Add oatdump for ART to go with dexdump for Dalvik" into klp-dev 2013-09-18 06:41:37 +00:00
Jean-Michel Trivi
9532dca41f am 22b85cc1: Merge "Add loudness enhancer to platform" into klp-dev
* commit '22b85cc1144b0710a611ac8e0568b73fe3a52368':
  Add loudness enhancer to platform
2013-09-17 18:53:08 -07:00
Jean-Michel Trivi
22b85cc114 Merge "Add loudness enhancer to platform" into klp-dev 2013-09-18 01:48:35 +00:00
Brian Carlstrom
0354c908e2 Add oatdump for ART to go with dexdump for Dalvik
Bug: 10807447
Change-Id: I48d1bc0ca025215383161dbf160d4f9270d97496
2013-09-17 18:29:29 -07:00
Michael Jurka
c0db1fb812 am f52651ef: Merge "Add default WallpaperCropper to the build" into klp-dev
* commit 'f52651ef2791292ba6c50f98a6558e9e0a3b0b61':
  Add default WallpaperCropper to the build
2013-09-16 12:16:53 -07:00