Geremy Condra
0ac3b5d8e5
Add verity build targets for verity-enabled devices.
...
Change-Id: Ia9fa8e7ebe01b63e50d61071d36165a6a820c6c4
2014-03-17 20:18:49 -07:00
Andy McFadden
68e1654aed
Remove "screenshot"
...
Remove the old "screenshot" utility, which has been replaced
by "screencap".
Change-Id: I5bad1fdad308339e4a16ce92f2a65e2437b1be65
2014-03-11 13:51:57 -07:00
Victoria Lease
c9b7f3d6a1
am 3c14d21a
: am 14a5be01
: am 4e965ac6
: am 38626e63
: Merge "Add external/google-fonts/*/fonts.mk."
...
* commit '3c14d21a2a62398322479e015fecdb43652fb331':
Add external/google-fonts/*/fonts.mk.
2014-03-03 23:49:36 +00: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
2fa191d777
am 3fd8a4fe
: am 529a772e
: am a90e346c
: am cd07521f
: Merge "Revert "generic_x86: toggle 64bit binder ABI""
...
* commit '3fd8a4feae8c384ea04ce50452092a0079553f0e':
Revert "generic_x86: toggle 64bit binder ABI"
2014-02-27 17:30:05 +00: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
8e6f18d7d2
am e9513f95
: am 65f26a76
: am 9edc9783
: Merge "Add policy for MIPS emulator, fix x86 policy."
...
* commit 'e9513f95c930977086a2b3ec370646e500866652':
Add policy for MIPS emulator, fix x86 policy.
2014-02-26 22:39:05 +00: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
b4f4dc9685
am 61b71bb2
: am b8d792d7
: am e7154870
: Merge "Move qemud and /dev/qemu policy bits to emulator-specific sepolicy."
...
* commit '61b71bb211dc6c1d9cb85a25232d8b0234bfe13c':
Move qemud and /dev/qemu policy bits to emulator-specific sepolicy.
2014-02-25 22:07:14 +00: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
Nicolas Prevot
c1b2536f63
Making ManagedProvisioning present in all phones/tablets.
...
Change-Id: Icf004835f526e5e6a2798fc5a0003c25d837289d
2014-02-25 10:04:12 +00:00
Ying Wang
0fad566932
am 4a2e083f
: am 0e0c4879
: Merge "generic_x86: toggle 64bit binder ABI"
...
* commit '4a2e083fa532d94610f07f8a0ae8f32216231266':
generic_x86: toggle 64bit binder ABI
2014-02-24 18:16:50 +00: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
9d82efbce7
am 6da37a0f
: am b3bc6136
: Merge "arm64: don\'t build emulator"
...
* commit '6da37a0fd37ebc8d79b9119a13f80207d5560aaf':
arm64: don't build emulator
2014-02-21 13:54:00 +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
Mark Salyzyn
5bcb2c86d7
Merge "build: add logd"
2014-02-20 22:50:03 +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
Steve Moyer
6bbb6a1fe3
Combine emulator test projects into a single apk
...
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests
Change-Id: I39e02fbe2cf9761607dfb4c2f0d6c4906e8b1e51
2014-02-19 10:39:20 -08:00
Stephen Hines
a0d13d81d6
am 515f379f
: am f1ad4d2d
: Merge "Add bcc to the list of PRODUCT_PACKAGES to install."
...
* commit '515f379f1dd14e7564ad99dec42549a263863166':
Add bcc to the list of PRODUCT_PACKAGES to install.
2014-02-18 23:18:06 +00: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
Stephen Hines
816b86f759
Add bcc to the list of PRODUCT_PACKAGES to install.
...
Bug: 7342767
As part of the process of sandboxing the online RenderScript compiler, we
need to install bcc.
Change-Id: Ia650bdcb760246f3f1e15ebb867f07d9802cdfbe
2014-02-18 14:21:39 -08:00
Colin Cross
b01233f26f
am a0eb50ac
: resolved conflicts for merge of 2fbe5018
to klp-modular-dev-plus-aosp
...
* commit 'a0eb50accabe83b18bd3fe3b9d6417a4718af9e2':
add linker64 and debuggerd64 to all products
2014-02-14 00:51:53 +00:00
Colin Cross
a0eb50acca
resolved conflicts for merge of 2fbe5018
to klp-modular-dev-plus-aosp
...
Change-Id: I623332e427ce8bfcf1b17e708ccca1d50cdbeadd
2014-02-13 16:32:48 -08:00
Colin Cross
381435353d
add linker64 and debuggerd64 to all products
...
Add linker64 and debuggerd64 to embedded.mk. They will be silently
ignored on 32-bit builds, and filtered out on 32-bit sdk builds.
Change-Id: I8c30ea65e2b7e224ee73cc9fbbcb7555d3be04b5
2014-02-13 16:23:33 -08:00
Colin Cross
59dc65a28a
am 481fed17
: am f10efbc1
: Merge "make 64-bit builds into multiarch builds"
...
* commit '481fed17fad5141154d8cf9532c0803ade24a6a6':
make 64-bit builds into multiarch builds
2014-02-13 21:38:00 +00:00
Colin Cross
481fed17fa
am f10efbc1
: Merge "make 64-bit builds into multiarch builds"
...
* commit 'f10efbc15e458f50bb29fe9ad0653fb2e08fd8fb':
make 64-bit builds into multiarch builds
2014-02-13 21:20:31 +00:00
Colin Cross
930b5fbcb9
make 64-bit builds into multiarch builds
...
Also enable the 64-bit binder interface and make them only use ART.
Change-Id: I05de41ce348c14722c84a658f745659bde5ba423
2014-02-12 19:49:47 -08:00
Ying Wang
e6a65a5f15
resolved conflicts for merge of b6d53f0b
to master
...
Change-Id: Id01809e2a72ca8ba13594621690273fc6f982095
2014-02-12 14:58:06 -08:00
Ying Wang
b6d53f0b31
am bec954d0
: Merge "Clean up dangling module names"
...
* commit 'bec954d05e0eeec178c796d2332ee9a86becb5dc':
Clean up dangling module names
2014-02-12 19:22:52 +00:00
Ying Wang
d18e570fba
Clean up dangling module names
...
Those modules have disappeared from the source tree.
https://code.google.com/p/android/issues/detail?id=61210
Change-Id: Iab369d2f591f46eb86b9fccf2087515edf974662
2014-02-11 17:28:30 -08:00
Ying Wang
1eba3c14c7
am 484c7dec
: am ba46260f
: Merge "Runtime resource overlay, iteration 2"
...
* commit '484c7dec798c8ba068f282d1d4398bfdd9b634d3':
Runtime resource overlay, iteration 2
2014-02-11 19:41:03 +00:00
Ying Wang
484c7dec79
am ba46260f
: Merge "Runtime resource overlay, iteration 2"
...
* commit 'ba46260f8dee97138d2eb456560b45eb9f914930':
Runtime resource overlay, iteration 2
2014-02-11 19:34:55 +00:00
Ying Wang
ba46260f8d
Merge "Runtime resource overlay, iteration 2"
2014-02-11 19:27:59 +00:00
Justin Koh
f26c96edc5
resolved conflicts for merge of 34cb6460
to master
...
Change-Id: I46982ef15b479e55b5cdf2f446577fbaa1356cea
2014-02-11 11:26:14 -08:00
Justin Koh
34cb646077
am f0c58da0
: Change core_tiny to not be minimal font footprint.
...
* commit 'f0c58da07d6ebcff215338c1cd1f4410786c1858':
Change core_tiny to not be minimal font footprint.
2014-02-11 18:59:47 +00:00
Justin Koh
f0c58da07d
Change core_tiny to not be minimal font footprint.
...
Change core_tiny to not be minimal font footprint: UX really wants roboto
condensed. Checked /proc/meminfo before and after the change and didn't
see much difference.
Change-Id: I94072f674ff678dfdbddd66d3792e63245e5e7da
2014-02-11 10:28:11 -08:00
Octavian Purdila
e2525ade32
generic_x86: toggle 64bit binder ABI
...
Change-Id: I60b8d98ff1f1ba5f242d256279e27d780b5dabf9
Signed-off-by: Octavian Purdila <octavian.purdila@intel.com>
2014-02-11 13:32:15 +08:00
Steve Moyer
60250d42a1
Merge "Adding SmsTest to sdk build"
2014-02-11 00:42:16 +00:00
David 'Digit' Turner
35cfe9e8af
am cc57457c
: am 145562fc
: Merge "Add missing font files to SDK system images."
...
* commit 'cc57457c880fdf5e85dd07b11fa61928ca692b45':
Add missing font files to SDK system images.
2014-02-10 13:29:51 +00:00
David 'Digit' Turner
cc57457c88
am 145562fc
: Merge "Add missing font files to SDK system images."
...
* commit '145562fcef979e4fea946987717618dba6148aeb':
Add missing font files to SDK system images.
2014-02-10 12:10:22 +00:00
David 'Digit' Turner
145562fcef
Merge "Add missing font files to SDK system images."
2014-02-10 11:31:18 +00:00