Justin Koh
007f8c804f
am 0e35df2a
: Add ContactsProvider to core_tiny.
...
* commit '0e35df2a7c77a6308106fa9a48f90c4729b9b8f3':
Add ContactsProvider to core_tiny.
2014-05-05 17:46:55 +00:00
Justin Koh
0e35df2a7c
Add ContactsProvider to core_tiny.
...
Add ContactsProvider to core_tiny: this is necessary to pass CTS.
Change-Id: I159109740f329e5c540ffb6f1cd1b1a7f9429d86
2014-05-04 16:31:02 -07:00
Ying Wang
0a694f4c57
am c564b691
: Remove libs from target/product/base.mk.
...
* commit 'c564b691d55d4dcede7ce46248b1a87acf3d2618':
Remove libs from target/product/base.mk.
2014-04-25 16:13:55 +00:00
Ying Wang
c564b691d5
Remove libs from target/product/base.mk.
...
LatinIME has libjni_latinime as dependency, so we don't need it in
PRODUCT_PACKAGES;
Moved libpac close to PacProcesser, which requires libpac.
Change-Id: I8674d76bcfde4c0e1f1b04bc96e636022d008576
2014-04-24 17:12:58 -07:00
Ian Rogers
77efd7b4cd
am f1d5dcdd
: am 850299f6
: Merge "Make the zygote 64-bit for the x86-64 emulator."
...
* commit 'f1d5dcdd30e1f181cc1fce6d99f0f3aa589c8edd':
Make the zygote 64-bit for the x86-64 emulator.
2014-04-22 15:45:44 +00:00
Ian Rogers
f1d5dcdd30
am 850299f6
: Merge "Make the zygote 64-bit for the x86-64 emulator."
...
* commit '850299f6a6a831d47af68a3004a62df21b5fee3a':
Make the zygote 64-bit for the x86-64 emulator.
2014-04-22 15:43:04 +00:00
Ian Rogers
d4186e8c1f
Make the zygote 64-bit for the x86-64 emulator.
...
Change-Id: I4ad5d1ef2406e947176c8e180822b25c04fc83f0
2014-04-18 17:09:33 -07:00
Ying Wang
25e75abac2
am 6e3bbf64
: am 0ac89b45
: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
...
* commit '6e3bbf64b2c8ac49b5b1e1ff368a120118c04e65':
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
2014-04-15 23:36:05 +00:00
Ying Wang
6e3bbf64b2
am 0ac89b45
: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
...
* commit '0ac89b459542ef88a8c61f45f0d6b680f9931ddf':
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
2014-04-15 23:34:34 +00:00
Ying Wang
e948255ac6
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
...
Bug: 11368415
Bug: 14087863
Change-Id: I05d406d174ea1d1bf67c7922c03950e700978baa
2014-04-15 14:42:27 -07:00
Steve Moyer
b9d6f6f15c
Merge "DO NOT MERGE: Combine emulator test projects into a single apk"
2014-04-04 16:32:06 +00:00
Steve Moyer
0ced06ea0f
DO NOT MERGE: Combine emulator test projects into a single apk
...
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests
Conflicts:
target/product/sdk.mk
Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
2014-04-03 16:01:06 -07:00
Greg Hackmann
0fd37501c4
am f518e838
: am f1750876
: Merge "Revert "HACK: disable emulator on x86_64""
...
* commit 'f518e8380cc5d4e1a25ca5fad161a7cd7e7e78dd':
Revert "HACK: disable emulator on x86_64"
2014-04-02 23:04:57 +00:00
Greg Hackmann
f175087608
Merge "Revert "HACK: disable emulator on x86_64""
2014-04-02 22:53:45 +00:00
Colin Cross
0396b10235
am 578f7ec4
: am 45db0e05
: Merge "aosp_arm64: increase userdata image size"
...
* commit '578f7ec487c2c00581cdc9807d0d24883ba4406a':
aosp_arm64: increase userdata image size
2014-04-02 17:39:56 +00:00
Colin Cross
45db0e058a
Merge "aosp_arm64: increase userdata image size"
2014-04-02 17:28:22 +00:00
Colin Cross
d46c7381c8
aosp_arm64: increase userdata image size
...
Increase userdata image size to allow make tests to builds with
extra tests to fit.
Change-Id: I2fea99d5a39816e78595215481b60ee51eb9182f
2014-04-02 09:17:29 -07:00
Narayan Kamath
b6cc842128
am 2c9552b7
: am aafbbe7e
: Merge "Add a default value for ro.zygote."
...
* commit '2c9552b78486ae1592303932dc70e00ff487d76f':
Add a default value for ro.zygote.
2014-04-01 16:33:26 +00:00
Greg Hackmann
dc01136bea
Revert "HACK: disable emulator on x86_64"
...
This reverts commit 4562c5bcb3
.
2014-03-31 16:54:52 -07:00
Narayan Kamath
39fd21a2df
Add a default value for ro.zygote.
...
Also makes sure the correct init config file is
copied across.
Change-Id: I281d00dab17f780bda21bf3fbc35418df18dffb1
2014-03-31 12:33:45 +01:00
Mark Renouf
50449c9cfa
am 37f3c5cc
: Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
...
* commit '37f3c5cc1de11f7b316c2d03ed8f6951d4f95372':
Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
2014-03-21 16:22:07 +00:00
Mark Renouf
37f3c5cc1d
Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
...
Change-Id: I8a6bad054ac22592f0d341bb3ebbe4cc74828698
2014-03-21 11:50:35 -04:00
Ying Wang
996f3826f7
am c5a56344
: am 1c43aaea
: Merge "Remove the redundant DISABLE_DEXPREOPT"
...
* commit 'c5a563447a68c30dd998b7cd6f8f8c30693edc37':
Remove the redundant DISABLE_DEXPREOPT
2014-03-20 20:18:38 +00:00
Ying Wang
c6848b398d
Remove the redundant DISABLE_DEXPREOPT
...
To disable dexpreopt, use just:
WITH_DEXPREOPT=false
Change-Id: I5804f3774f8ec50eb16c5336776dbce0c28b16d9
2014-03-20 13:01:31 -07:00
Ying Wang
46d69e9914
am 9ce34617
: am 4f9d6f57
: Merge "Fix embedded build"
...
* commit '9ce34617a001338093b0de85443925a37a967f0d':
Fix embedded build
2014-03-20 19:36:32 +00:00
Ying Wang
8c7e74ee05
Fix embedded build
...
1) Disable dexpreopt if DALVIK_VM_LIB isn't set up by the product.
2) DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES is moved to config.mk,
for it's only decided by target arch.
3) Move Java module input from embedded.mk to base.mk.
Change-Id: Ife70b0cd8cee2e5c92f356c808affa56f494b49a
2014-03-20 12:13:10 -07:00
Nick Kralevich
cea2ad87ff
am e623b4c2
: am f2fd6d9a
: Merge "Allow shell serial_device read-write access"
...
* commit 'e623b4c2c2b585ad19627e13347474b70377c78b':
Allow shell serial_device read-write access
2014-03-19 16:49:21 +00:00
Nick Kralevich
f2fd6d9af2
Merge "Allow shell serial_device read-write access"
2014-03-19 16:37:40 +00:00
Nick Kralevich
b20966f803
Allow shell serial_device read-write access
...
When starting the emulator, the system console writes entries
to /dev/ttyS2. We need to allow the writes, otherwise this generates
denials when you run "emulator -verbose -logcat '*:v' -show-kernel"
Addresses the following denial:
type=1400 audit(1395076594.320:446): avc: denied { read write } for pid=5600 comm="sh" path="/dev/ttyS2" dev="tmpfs" ino=1487 scontext=u:r:shell:s0 tcontext=u:object_r:serial_device:s0 tclass=chr_file
Bug: 13506702
Change-Id: I3729537cabb0bf8e8b2905d3def43a293bb1081f
2014-03-18 15:17:35 -07:00
Greg Hackmann
2521d0d23a
am 5a4183f3
: am 267afcde
: Merge "HACK: disable emulator on x86_64"
...
* commit '5a4183f3916f2666edfa4a6f1d0f4f7da07cd52e':
HACK: disable emulator on x86_64
2014-03-18 19:28:33 +00:00
Greg Hackmann
4562c5bcb3
HACK: disable emulator on x86_64
...
The build system and qemu disagree about where the x86_64 kernel should
live; disable the emulator until that's resolved
Change-Id: Ia7a2745ee8f3f4211ce39f8d851d5d860acbf62b
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-03-18 11:13:37 -07:00
Colin Cross
8213b719c8
am 6e92ade0
: am db24577b
: Merge "Work in progress to enable build system support for Clang."
...
* commit '6e92ade0a6cd8aea8f074fdc44f375ef2f1d50b7':
Work in progress to enable build system support for Clang.
2014-03-15 23:59:32 +00:00
Tim Murray
b5f333bbef
Work in progress to enable build system support for Clang.
...
Change-Id: I278b48bcd976afcbde8d86261da9b9b9efc9002c
2014-03-14 00:39:03 -07:00
Victoria Lease
14a5be0174
am 4e965ac6
: am 38626e63
: Merge "Add external/google-fonts/*/fonts.mk."
...
* commit '4e965ac6f56de2071a381ed37e4a9899062e5ab2':
Add external/google-fonts/*/fonts.mk.
2014-03-03 23:42:48 +00:00
Victoria Lease
8da3a02c1f
Add external/google-fonts/*/fonts.mk.
...
Bug: 12384866
Change-Id: I30abb9fb962a59b46be1cb9f12b099ea29850a50
2014-02-28 15:35:07 -08:00
Ying Wang
529a772eec
am a90e346c
: am cd07521f
: Merge "Revert "generic_x86: toggle 64bit binder ABI""
...
* commit 'a90e346c24d498af57360bd92ff738a1480f0598':
Revert "generic_x86: toggle 64bit binder ABI"
2014-02-27 17:24:45 +00:00
Ying Wang
cd07521f46
Merge "Revert "generic_x86: toggle 64bit binder ABI""
2014-02-27 17:19:34 +00:00
Ying Wang
32d35a71ff
Revert "generic_x86: toggle 64bit binder ABI"
...
This reverts commit e2525ade32
.
Change-Id: Ibaec151084ce4f00194a5a22c4be7531710b4a9f
2014-02-27 17:19:13 +00:00
Mark Salyzyn
b8424c7925
am 4c65c202
: am 7fc3a06d
: Merge "build: add logd"
...
* commit '4c65c202355572f22b3cb48babf0436098807dc7':
build: add logd
2014-02-27 16:26:54 +00:00
Mark Salyzyn
7fc3a06d7f
Merge "build: add logd"
2014-02-27 16:03:58 +00:00
Nick Kralevich
1884833c3a
build: add logd
...
Original-Change-Id: I1b96d7e6dd823a83b07b312bf07792482e883789
Signed-off-by: Nick Kralevich <nnk@google.com>
* merge conflicts
* rename syslog to logd to avert confusion with bionic syslog
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Change-Id: I137fb639a80dd28d2f0042b3ae9b7d6eb5eb5bc4
2014-02-26 15:39:38 -08:00
Nick Kralevich
65f26a769a
am 9edc9783
: Merge "Add policy for MIPS emulator, fix x86 policy."
...
* commit '9edc9783d21f59bc532e2b7b62ae2464ee976438':
Add policy for MIPS emulator, fix x86 policy.
2014-02-26 22:31:01 +00:00
Stephen Smalley
1c0e1cde7b
Add policy for MIPS emulator, fix x86 policy.
...
The qemud and /dev/qemu_pipe policy bits copied to generic
and generic_x86 by I620d4aef84a5d4565abb1695db54ce1653612bce
are required for generic_mips as well. In testing, we
further saw other denials for generic_mips that correspond
exactly to what is already allowed in the generic sepolicy, so
just inherit the sepolicy files from generic for now.
We could do likewise for the generic_x86 sepolicy for the files that are
identical with generic if desired, but that is not done by this change.
The generic_x86 sepolicy was missing a rule for /sys/qemu_trace
moved to the generic sepolicy by the prior change, so fix that omission.
The generic*64 variants will need something similar, either by inheriting
from one of the existing sepolicy directories as in the MIPS
case or by forking their own copies as in the x86 case.
Change-Id: Iec7c8825734a3f96f7db8ae1d10dce1f30b22bdf
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-02-26 09:12:55 -05:00
Nick Kralevich
b8d792d734
am e7154870
: Merge "Move qemud and /dev/qemu policy bits to emulator-specific sepolicy."
...
* commit 'e715487031036ecc75bfedb94b2d6c9dbd3bc98d':
Move qemud and /dev/qemu policy bits to emulator-specific sepolicy.
2014-02-25 21:58:45 +00:00
Stephen Smalley
768ff518f0
Move qemud and /dev/qemu policy bits to emulator-specific sepolicy.
...
Change-Id: I620d4aef84a5d4565abb1695db54ce1653612bce
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-02-25 13:49:57 -05:00
Ying Wang
4a2e083fa5
am 0e0c4879
: Merge "generic_x86: toggle 64bit binder ABI"
...
* commit '0e0c48796d9d0ebe415b1ccc9f67ae95f9c716c9':
generic_x86: toggle 64bit binder ABI
2014-02-24 18:10:29 +00:00
Ying Wang
0e0c48796d
Merge "generic_x86: toggle 64bit binder ABI"
2014-02-24 18:05:34 +00:00
Colin Cross
6da37a0fd3
am b3bc6136
: Merge "arm64: don\'t build emulator"
...
* commit 'b3bc61365bb71cc45d10c22762aa86a3b78f1329':
arm64: don't build emulator
2014-02-20 22:55:24 +00:00
Colin Cross
15b1c8377d
arm64: don't build emulator
...
There is no emulator kernel yet, so don't try to build the emulator.
Change-Id: I714f5717f439b4e48a973f4355f2c6684af79764
2014-02-20 14:39:09 -08:00
Stephen Hines
515f379f1d
am f1ad4d2d
: Merge "Add bcc to the list of PRODUCT_PACKAGES to install."
...
* commit 'f1ad4d2d2eea9952963fd52fa56e9ab16b108618':
Add bcc to the list of PRODUCT_PACKAGES to install.
2014-02-18 23:12:37 +00:00