OSDN Git Service
Nick Kralevich [Mon, 15 Jun 2015 22:04:47 +0000 (22:04 +0000)]
am
dcac4582: Merge "Add support for LOCAL_DETECT_INTEGER_OVERFLOWS"
* commit '
dcac45820e4ce7faad4dbfd187f8b788964c9981':
Add support for LOCAL_DETECT_INTEGER_OVERFLOWS
Nick Kralevich [Mon, 15 Jun 2015 21:54:30 +0000 (21:54 +0000)]
Merge "Add support for LOCAL_DETECT_INTEGER_OVERFLOWS"
Nick Kralevich [Sun, 14 Jun 2015 18:38:30 +0000 (11:38 -0700)]
Add support for LOCAL_DETECT_INTEGER_OVERFLOWS
Add build system support for LOCAL_DETECT_INTEGER_OVERFLOWS. When enabled,
an attempt to perform an integer arithmetic operation which overflows
will result in a call to abort(). This is intended for security
sensitive code, where integer overflow operations are not expected
nor desirable.
Two classes of underflows/overflows are detected and blocked:
1) Signed integer underflow/overflow.
2) Unsigned integer underflow/overflows.
Signed integer overflows are undefined behavior, according to the
C standard. Unsigned integer overflows are defined behavior, but
still undesirable in security sensitive code.
Only clang is supported today. gcc has -ftrapv for handling signed
integer overflow, but it's widely considered broken
(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=35412) and we're
deliberately avoiding it's use here.
Change-Id: Ib4918dc84e37e83d4205e5035544545d91671e5f
Vaguely-Related-Bug:
11859726
Dan Albert [Fri, 12 Jun 2015 19:59:13 +0000 (19:59 +0000)]
am
46cb2ee3: Merge "Force some clang Werrors that *will* break things."
* commit '
46cb2ee3cb120a1c03241e9e2aa66d76c890c486':
Force some clang Werrors that *will* break things.
Dan Albert [Fri, 12 Jun 2015 19:52:19 +0000 (19:52 +0000)]
Merge "Force some clang Werrors that *will* break things."
Jeff Vander Stoep [Fri, 12 Jun 2015 17:44:49 +0000 (17:44 +0000)]
am
ed6e4d19: Merge "selinux: add tools to dev path"
* commit '
ed6e4d1933cc0a68cd2eb3b7a83d5f0ccefac553':
selinux: add tools to dev path
Jeff Vander Stoep [Fri, 12 Jun 2015 17:37:24 +0000 (17:37 +0000)]
Merge "selinux: add tools to dev path"
Jeff Vander Stoep [Fri, 12 Jun 2015 16:56:39 +0000 (09:56 -0700)]
selinux: add tools to dev path
Adds audit2allow to the path. No build required.
Bug:
21724977
Change-Id: Ide320a56b9cdbfa426b978443f6df07fa2a38fbc
Dan Albert [Wed, 10 Jun 2015 23:33:43 +0000 (16:33 -0700)]
Force some clang Werrors that *will* break things.
Clang is really aggressive at optimizing a handful of cases (read:
clang will ruin your day some if you write bad code). Fortunately, it
also emits a warning when it's about to do this.
To prevent anyone from suffering from these optimizations, make these
warnings errors and make them impossible to disable.
Change-Id: I5e10bb0fc2ca23190017da716b3b84635577a0bd
Ying Wang [Tue, 9 Jun 2015 16:32:52 +0000 (16:32 +0000)]
am
1b96592a: Merge "Add build_verity_metadata.py to dist-tools"
* commit '
1b96592aab7a8e3d357a4e09f685968edcfe05b9':
Add build_verity_metadata.py to dist-tools
Ying Wang [Tue, 9 Jun 2015 16:20:49 +0000 (16:20 +0000)]
Merge "Add build_verity_metadata.py to dist-tools"
Narayan Kamath [Tue, 9 Jun 2015 10:12:12 +0000 (10:12 +0000)]
am
7d2c71cf: Merge "Remove duplicate CTS tests from libcore cts packages."
* commit '
7d2c71cf90cc8da55c8b8faad5910267c23ae542':
Remove duplicate CTS tests from libcore cts packages.
Narayan Kamath [Tue, 9 Jun 2015 10:03:16 +0000 (10:03 +0000)]
Merge "Remove duplicate CTS tests from libcore cts packages."
Narayan Kamath [Mon, 1 Jun 2015 13:45:55 +0000 (14:45 +0100)]
Remove duplicate CTS tests from libcore cts packages.
The catch all "org" package was catching several thousand
org.apache.harmony.tests.* tests that are already covered by
other packages. Replace the catch-all org.* with specific prefixes.
Needs additional support in CollectAllTests to handle multiple
prefixes. This is implemented in the companion change.
bug:
20862863
(cherry picked from commit
cf7fbcd03d9f13d1c2fe6e65f02247feadec136d)
Change-Id: I1d28f91cfca098ccdcd62e88bb486b433d9c29d8
Mark Salyzyn [Tue, 9 Jun 2015 00:00:37 +0000 (00:00 +0000)]
am
911637bf: Merge "Add missing shared libraries to dist tools"
* commit '
911637bf33b2f8994fc93eb8ea6e4a8428122e13':
Add missing shared libraries to dist tools
Mark Salyzyn [Mon, 8 Jun 2015 23:51:32 +0000 (23:51 +0000)]
Merge "Add missing shared libraries to dist tools"
Ying Wang [Mon, 8 Jun 2015 23:48:24 +0000 (23:48 +0000)]
am
8e42131b: Merge "Strip path from verity_signer_cmd in the target-files meta data."
* commit '
8e42131ba2aa4fd12395e2c122ab62c9991e6f72':
Strip path from verity_signer_cmd in the target-files meta data.
Ying Wang [Mon, 8 Jun 2015 23:39:24 +0000 (23:39 +0000)]
Merge "Strip path from verity_signer_cmd in the target-files meta data."
Ying Wang [Mon, 8 Jun 2015 19:15:13 +0000 (19:15 +0000)]
am
080f57ae: Merge "Remove the unnecessary full_x86_64 and full_mips64."
* commit '
080f57aed7ac0f03c5db216dafe5023b032525ed':
Remove the unnecessary full_x86_64 and full_mips64.
Ying Wang [Mon, 8 Jun 2015 19:00:59 +0000 (19:00 +0000)]
Merge "Remove the unnecessary full_x86_64 and full_mips64."
Ying Wang [Mon, 8 Jun 2015 18:57:26 +0000 (11:57 -0700)]
Remove the unnecessary full_x86_64 and full_mips64.
For historical reason, the aosp_* products were named full_*.
We keep the full, full_x86 and full_mips in case some tools still
reference these legacy names; But no reason the have the full_* product
names for the new 64-bit archs.
Change-Id: I240ed0c6ded0ded2d80603bd0c5ff24750999afc
Claes Elgemark [Thu, 4 Jun 2015 08:07:44 +0000 (10:07 +0200)]
Add build_verity_metadata.py to dist-tools
Preserve path as it is referenced by build_image.py.
Change-Id: Id6833d243b5a15b4ee5e0013340aeb2cd35f3578
Claes Elgemark [Wed, 3 Jun 2015 06:35:52 +0000 (08:35 +0200)]
Add missing shared libraries to dist tools
Add missing libraries used by e2fsck and build_verity_tree.
Change-Id: I8bf0341300863ef0090b395b2aba0b7a952f6b58
Ying Wang [Wed, 3 Jun 2015 17:11:11 +0000 (17:11 +0000)]
am
3a35aa1a: Merge "Add selinux and verity support to custom image generation."
* commit '
3a35aa1a2c1f3af3216875dd59a5bb21629b7c7f':
Add selinux and verity support to custom image generation.
Ying Wang [Wed, 3 Jun 2015 17:11:10 +0000 (17:11 +0000)]
am
b7e6e8bb: Merge "Support to configure and build multiple custom images."
* commit '
b7e6e8bb6d00dc2677b297e548aff92f97066ab5':
Support to configure and build multiple custom images.
Ying Wang [Wed, 3 Jun 2015 16:59:01 +0000 (16:59 +0000)]
Merge "Add selinux and verity support to custom image generation."
Ying Wang [Wed, 3 Jun 2015 16:58:46 +0000 (16:58 +0000)]
Merge "Support to configure and build multiple custom images."
Ying Wang [Sat, 21 Mar 2015 00:43:02 +0000 (17:43 -0700)]
Add selinux and verity support to custom image generation.
New custom image configuration variables:
- CUSTOM_IMAGE_SELINUX, set to "true" if the image supports selinux.
- CUSTOM_IMAGE_SUPPORT_VERITY, set to "true" if the product supports verity.
- CUSTOM_IMAGE_VERITY_BLOCK_DEVICE
Also changed the staging directory name to the mount point, like we do
for other images built by the build system.
Bug:
19609718
Change-Id: I6bbf06b79eee63e4c77834f2e6f1d5a7f7e00a12
(cherry picked from commit
7d51a4029590b58e22071eed919d59a0ff205bef)
Ying Wang [Fri, 13 Mar 2015 01:30:39 +0000 (18:30 -0700)]
Support to configure and build multiple custom images.
Build additional images requested by the product makefile.
This script gives the ability to build multiple additional images and
you can configure what modules/files to include in each image.
1. Define PRODUCT_CUSTOM_IMAGE_MAKEFILES in your product makefile.
PRODUCT_CUSTOM_IMAGE_MAKEFILES is a list of makefiles.
Each makefile configures an image.
For image configuration makefile foo/bar/xyz.mk, the built image
file name
will be xyz.img. So make sure they won't conflict.
2. In each image's configuration makefile, you can define variables:
- CUSTOM_IMAGE_MOUNT_POINT, the mount point, such as "oem", "odm"
etc.
- CUSTOM_IMAGE_PARTITION_SIZE
- CUSTOM_IMAGE_FILE_SYSTEM_TYPE
- CUSTOM_IMAGE_DICT_FILE, a text file defining a dictionary
accepted by BuildImage() in tools/releasetools/build_image.py.
- CUSTOM_IMAGE_MODULES, a list of module names you want to include
in the image; Not only the module itself will be installed to proper
path in the image, you can also piggyback additional files/directories
with the module's LOCAL_PICKUP_FILES.
- CUSTOM_IMAGE_COPY_FILES, a list of "<src>:<dest>" to be copied to
the image. <dest> is relativ to the root of the image.
To build all those images, run "make custom_images".
Bug:
19609718
Change-Id: Ic73587e08503a251be27797c7b00329716051927
(cherry picked from commit
5fcf1094f9cf4d57c2598237f99621f254130d71)
Mark Salyzyn [Wed, 3 Jun 2015 16:52:50 +0000 (16:52 +0000)]
am
9ec84792: Merge "goldfish: rename goldfish_logcat.te to logd.te"
* commit '
9ec84792b8f3faad150c68909055046b3bc272c1':
goldfish: rename goldfish_logcat.te to logd.te
Ying Wang [Wed, 3 Jun 2015 16:52:49 +0000 (16:52 +0000)]
am
9fed6369: Merge "Add VeritySigner.jar to ota tools"
* commit '
9fed6369b6ee4ad07a0313fa5321047be1d79b85':
Add VeritySigner.jar to ota tools
Mark Salyzyn [Wed, 3 Jun 2015 16:45:26 +0000 (16:45 +0000)]
Merge "goldfish: rename goldfish_logcat.te to logd.te"
Ying Wang [Wed, 3 Jun 2015 16:42:17 +0000 (16:42 +0000)]
Merge "Add VeritySigner.jar to ota tools"
Claes Elgemark [Tue, 2 Jun 2015 09:59:32 +0000 (11:59 +0200)]
Add VeritySigner.jar to ota tools
Used by verity_signer
Change-Id: I6e2b654144b40573c3f3c0dc0d1c943889ffcd7d
Tao Bao [Wed, 3 Jun 2015 16:40:08 +0000 (16:40 +0000)]
am
54310d1a: Merge "Fix the wrong error message"
* commit '
54310d1a0dc7a3ceaaee9f4cee7b1f8b7bfbf7de':
Fix the wrong error message
Tao Bao [Wed, 3 Jun 2015 16:30:20 +0000 (16:30 +0000)]
Merge "Fix the wrong error message"
Tao Bao [Wed, 3 Jun 2015 16:24:08 +0000 (09:24 -0700)]
Fix the wrong error message
apply_patch_space() checks the free space on /cache, not /system.
Change-Id: I70996d5cd5a81fe4871ee738bddb1437e8df6fb9
Mark Salyzyn [Wed, 3 Jun 2015 16:00:46 +0000 (16:00 +0000)]
am
b37ac46b: Merge "goldfish: logcat -Q in logd domain"
* commit '
b37ac46bb40e24b1014010735abc5e63802ca3bb':
goldfish: logcat -Q in logd domain
Mark Salyzyn [Wed, 3 Jun 2015 16:00:14 +0000 (09:00 -0700)]
goldfish: rename goldfish_logcat.te to logd.te
Bug:
19608716
Change-Id: I5c76648a4bcbbb15a033465e8af66b12af6e0a18
Mark Salyzyn [Wed, 3 Jun 2015 15:47:18 +0000 (15:47 +0000)]
Merge "goldfish: logcat -Q in logd domain"
Mark Salyzyn [Wed, 3 Jun 2015 14:50:31 +0000 (07:50 -0700)]
goldfish: logcat -Q in logd domain
Deal with a build failure in conflict with cl/152105
Bug:
19608716
Change-Id: I1078046db3b159c1baf0a22435c3e777424453a1
Claes Elgemark [Tue, 2 Jun 2015 09:03:27 +0000 (11:03 +0200)]
Strip path from verity_signer_cmd in the target-files meta data.
Strip path to be able to use outside a build e.g.
when resigning using the dist tools zip.
Change-Id: I492dcfd5791b66c17ae2e751cc8f67127e97b800
Tao Bao [Tue, 2 Jun 2015 18:14:40 +0000 (18:14 +0000)]
am
708c4623: Merge "Add post-install verification for BBOTAs"
* commit '
708c462311afd63592a3adcc0e47c0c850b73444':
Add post-install verification for BBOTAs
Tao Bao [Tue, 2 Jun 2015 18:02:28 +0000 (18:02 +0000)]
Merge "Add post-install verification for BBOTAs"
Yohann Roussel [Tue, 2 Jun 2015 13:07:52 +0000 (13:07 +0000)]
am
ea6de994: (-s ours) Merge "[DO NOT MERGE] Add support for RMTYPEDEF with Jack"
* commit '
ea6de994788bf90559ee75fc638328aa90d6853b':
[DO NOT MERGE] Add support for RMTYPEDEF with Jack
Yohann Roussel [Tue, 2 Jun 2015 12:58:37 +0000 (12:58 +0000)]
Merge "[DO NOT MERGE] Add support for RMTYPEDEF with Jack"
Yohann Roussel [Wed, 20 May 2015 15:52:15 +0000 (17:52 +0200)]
[DO NOT MERGE] Add support for RMTYPEDEF with Jack
Bug:
21099584
(cherry-picked from commit
5b2c6e26dbda66a2245f987db0428c2bf2eb7c95)
Change-Id: I39aa1f24780c216e978ef743098ca7ac65b2962e
Tao Bao [Mon, 1 Jun 2015 20:40:49 +0000 (13:40 -0700)]
Add post-install verification for BBOTAs
Similar to the assertations in file-based OTA, we perform verification
for block-based OTAs (BBOTAs) after updating a partition, for both of
the incremental and full OTAs. It increases the update time (~20s on
Nexus 6), but will capture unnoticed errors right away.
Bug:
21500869
Change-Id: I89ac8fe623b855721b7affd07cf9426a23433ab0
Clay Murphy [Mon, 1 Jun 2015 19:16:46 +0000 (19:16 +0000)]
am
b7bb040c: Merge "Docs: Update link to new Community page location"
* commit '
b7bb040c75922795b47434e09cd09842ad11fd46':
Docs: Update link to new Community page location
Clay Murphy [Mon, 1 Jun 2015 19:04:56 +0000 (19:04 +0000)]
Merge "Docs: Update link to new Community page location"
Ying Wang [Mon, 1 Jun 2015 18:37:12 +0000 (18:37 +0000)]
am
91c2f705: Merge "Add /lib[64] to host binary\'s rpath."
* commit '
91c2f7053d131cb9449eccfda97ec80130dbf451':
Add $ORIGIN/lib[64] to host binary's rpath.
Ying Wang [Mon, 1 Jun 2015 18:29:13 +0000 (18:29 +0000)]
Merge "Add $ORIGIN/lib[64] to host binary's rpath."
Ying Wang [Mon, 1 Jun 2015 17:43:29 +0000 (10:43 -0700)]
Add $ORIGIN/lib[64] to host binary's rpath.
Normally the binaries use the exsiting $ORIGIN/../lib[64] with binaries
in the bin subdirectory;
For historical reason the binaries in the SDK package don't have a bin
subdirectory. This workaround enables them to work in the existing SDK
directory structure.
Bug:
21301578
Change-Id: Ibebfbfb8b30e81e7bbaf13a21bb205f3f0282d24
(cherry-pick from commit
4fe7bfd373d99dedfd2e63135da5189478bb0138)
Chih-Hung Hsieh [Fri, 29 May 2015 20:28:08 +0000 (20:28 +0000)]
am
c2be68e4: Merge "Remove gcc 4.9 workaround."
* commit '
c2be68e4f688f61ea5c23183b8eaeb4e34aa1c56':
Remove gcc 4.9 workaround.
Chih-Hung Hsieh [Fri, 29 May 2015 20:16:23 +0000 (20:16 +0000)]
Merge "Remove gcc 4.9 workaround."
Chih-Hung Hsieh [Fri, 29 May 2015 17:23:15 +0000 (10:23 -0700)]
Remove gcc 4.9 workaround.
The gcc 4.9 devirtualization bug was fixed with a cherry pick of r212222.
BUG:
19872411
Change-Id: I6d9677f112402fe84d70da770f364392398e9cc9
(cherry picked from commit
ad2494bb79932c4f2fd55f51e9b0d58676502558)
Ying Wang [Fri, 29 May 2015 17:09:13 +0000 (17:09 +0000)]
am
6106f320: Merge "Do not add \'adb\' to persist.sys.usb.config if already there"
* commit '
6106f320d3cf4b76774046faf2d843c5b13db593':
Do not add 'adb' to persist.sys.usb.config if already there
Ying Wang [Fri, 29 May 2015 16:55:04 +0000 (16:55 +0000)]
Merge "Do not add 'adb' to persist.sys.usb.config if already there"
Oreste Salerno [Wed, 20 May 2015 16:44:48 +0000 (16:44 +0000)]
Do not add 'adb' to persist.sys.usb.config if already there
The 'adb' configuration might have already been added by a
device-specific Makefile, so add it only if it's not already there.
Change-Id: I6f96645f44c96f6f827cc8c842a8b769f92be13a
Elliott Hughes [Fri, 29 May 2015 04:54:33 +0000 (04:54 +0000)]
am
1a81a0ef: Merge "[MIPS] Do not use compact branches until GDB supports them"
* commit '
1a81a0efca84990648a0b0f023b8a270226303ae':
[MIPS] Do not use compact branches until GDB supports them
Elliott Hughes [Fri, 29 May 2015 04:41:26 +0000 (04:41 +0000)]
Merge "[MIPS] Do not use compact branches until GDB supports them"
Christopher Ferris [Thu, 28 May 2015 22:30:55 +0000 (22:30 +0000)]
am
6bd0bbd5: Merge "Portable way to color"
* commit '
6bd0bbd5ebf059affcb826dc7a4a874bae0b09c4':
Portable way to color
Christopher Ferris [Thu, 28 May 2015 22:00:09 +0000 (22:00 +0000)]
Merge "Portable way to color"
David Srbecky [Thu, 28 May 2015 18:53:20 +0000 (18:53 +0000)]
am
cb46fa78: Merge "Pass --no-generate-debug-info to dex2oat."
* commit '
cb46fa780c6d87baebcadbf22567d78836f12295':
Pass --no-generate-debug-info to dex2oat.
David Srbecky [Thu, 28 May 2015 18:37:35 +0000 (18:37 +0000)]
Merge "Pass --no-generate-debug-info to dex2oat."
David Srbecky [Thu, 28 May 2015 15:32:55 +0000 (16:32 +0100)]
Pass --no-generate-debug-info to dex2oat.
The two flags have been merged and renamed in ART.
Change-Id: Iffc1dcc6764367239d6f45a3598cdb2c5d5d5013
Clay Murphy [Thu, 28 May 2015 01:37:02 +0000 (18:37 -0700)]
Docs: Update link to new Community page location
Bug:
21277510
Change-Id: I527e4efe264cbcf61bce997bed9086f1cb060c83
Tao Bao [Wed, 27 May 2015 16:24:47 +0000 (16:24 +0000)]
am
a8990025: Merge "Use zipalign -p to page align .so files"
* commit '
a89900257f144d149c844febc02f04ef9aedaeaa':
Use zipalign -p to page align .so files
Tao Bao [Wed, 27 May 2015 16:12:31 +0000 (16:12 +0000)]
Merge "Use zipalign -p to page align .so files"
Brian Carlstrom [Fri, 22 May 2015 22:51:19 +0000 (15:51 -0700)]
Use zipalign -p to page align .so files
Bug:
21400810
Change-Id: Ie3adf26dd3a51acfdb0faa23dc8ca1b206fb3727
(cherry picked from commit
903186f938a447e459720f6825382470ebb77e37)
Nikola Veljkovic [Mon, 25 May 2015 09:16:10 +0000 (11:16 +0200)]
[MIPS] Do not use compact branches until GDB supports them
GDB does not yet have support for compact branches, and is unable to
set a breakpoint on them. Turn compact branch generation off, until
GDB is fixed.
Change-Id: Ie7d6fb891e9934f8fc645fe9cf8f706be15a5f77
Yohann Roussel [Thu, 21 May 2015 09:49:23 +0000 (09:49 +0000)]
am
b888668a: (-s ours) Merge "[DO NOT MERGE] Compile using Jack."
* commit '
b888668aa5657a69e67be966784ffce54149a66c':
[DO NOT MERGE] Compile using Jack.
Yohann Roussel [Thu, 21 May 2015 09:23:38 +0000 (09:23 +0000)]
Merge "[DO NOT MERGE] Compile using Jack."
Tao Bao [Wed, 20 May 2015 20:40:55 +0000 (20:40 +0000)]
am
25c285a2: Merge "Fix the permission setting in common.ZipWriteStr()"
* commit '
25c285a26d50facb8c3af6dcf4aafdd9e6c048ef':
Fix the permission setting in common.ZipWriteStr()
Tao Bao [Wed, 20 May 2015 20:27:58 +0000 (20:27 +0000)]
Merge "Fix the permission setting in common.ZipWriteStr()"
Tao Bao [Wed, 20 May 2015 16:32:18 +0000 (09:32 -0700)]
Fix the permission setting in common.ZipWriteStr()
When passing a ZipInfo instance to common.ZipWriteStr(), the
external_attr attribute should not be overwritten unless specified.
We didn't have the issue previously because we were calling
ZipFile.writestr() directly until [1] merged.
[1] commit
2ed665a033c587b276b1615516e5354e2ace47cd.
Bug: http://b/
21309935
Change-Id: I374ccd40c174ff9259844f38bdbf187dfe82552d
Yohann Roussel [Mon, 8 Sep 2014 12:45:14 +0000 (14:45 +0200)]
Nick Kralevich [Tue, 19 May 2015 00:36:01 +0000 (00:36 +0000)]
am
c3b58d4a: Merge "Allow goldfish-setup to put the emulator in WiFi-only mode"
* commit '
c3b58d4a8fd89df6122b7b2fdcd7975dc6e2c45b':
Allow goldfish-setup to put the emulator in WiFi-only mode
Nick Kralevich [Tue, 19 May 2015 00:23:43 +0000 (00:23 +0000)]
Merge "Allow goldfish-setup to put the emulator in WiFi-only mode"
Yu Ning [Mon, 18 May 2015 09:11:37 +0000 (17:11 +0800)]
Allow goldfish-setup to put the emulator in WiFi-only mode
The goldfish-setup service (essentially /system/etc/init.goldfish.sh)
executes the following commands when certain conditions are met:
setprop ro.radio.noril yes
stop ril-daemon
so as to stop the RIL daemon and emulate a WiFi-only device. Both would
fail, though, because goldfish-setup does not have the permissions to
set relevant properties.
This CL modifies the emulator's SELinux policy to grant the necessary
permissions. It is a step towards fixing the ril-daemon-keeps-getting-
killed-and-restarted problem with the new ("ranchu") emulator, which
does not support telephony emulation yet. (The other step is to have
init start goldfish-setup, which will be done in a seperate CL.)
Change-Id: Ice7e7898804b7353ac4a8c49d871b1b2571d7a5f
Signed-off-by: Yu Ning <yu.ning@intel.com>
Nick Kralevich [Mon, 18 May 2015 16:59:31 +0000 (16:59 +0000)]
am
94b4f9a5: Merge "Label /dev/ttyGF* as serial_device"
* commit '
94b4f9a5cfde89b6202db3a8269b24a0917f9ab2':
Label /dev/ttyGF* as serial_device
Nick Kralevich [Mon, 18 May 2015 16:51:18 +0000 (16:51 +0000)]
Merge "Label /dev/ttyGF* as serial_device"
Yu Ning [Mon, 18 May 2015 06:52:22 +0000 (14:52 +0800)]
Label /dev/ttyGF* as serial_device
In goldfish kernel 3.10, the goldfish_tty device instantiates virtual
serial ports as /dev/ttyGF* (e.g. /dev/ttyGF0), not as /dev/ttyS* as in
goldfish kernel 3.4. However, in the emulator's SELinux security policy,
there is no specific security context assigned to /dev/ttyGF*, and the
one inherited from /dev (u:object_r:device:s0) prevents services such as
qemud and goldfish-logcat from reading and writing ttyGF*. Consequently,
qemud terminates abnormally on the classic x86_64 emulator:
init: Service 'qemud' (pid XXX) exited with status 1
Fix this issue by assigning /dev/ttyGF* the same security context as
/dev/ttyS*.
Change-Id: Ia7394dc217bd82f566c4d1b7eda3cc8ce3ac612f
Signed-off-by: Yu Ning <yu.ning@intel.com>
Jacky Cao [Fri, 15 May 2015 14:12:53 +0000 (22:12 +0800)]
Portable way to color
Change-Id: I62ae1da772f4e3eb80ed26aca89ebe47aff8efa7
Elliott Hughes [Fri, 15 May 2015 21:01:18 +0000 (21:01 +0000)]
am
c340a306: Merge "Explain __USE_MINGW_ANSI_STDIO."
* commit '
c340a30641ca4ed5c40612f3bfe36b41fadca0c0':
Explain __USE_MINGW_ANSI_STDIO.
Elliott Hughes [Fri, 15 May 2015 20:52:55 +0000 (20:52 +0000)]
Merge "Explain __USE_MINGW_ANSI_STDIO."
Nick Kralevich [Fri, 15 May 2015 19:34:43 +0000 (19:34 +0000)]
am
e89b6f5d: Merge "Update device to use set_prop() macro"
* commit '
e89b6f5df1b971c27ec85efb5dd41b9012930dcc':
Update device to use set_prop() macro
Nick Kralevich [Fri, 15 May 2015 19:26:56 +0000 (19:26 +0000)]
Merge "Update device to use set_prop() macro"
Nick Kralevich [Fri, 15 May 2015 13:10:55 +0000 (13:10 +0000)]
am
cea991d7: Merge "Label /dev/goldfish_pipe as qemu_device"
* commit '
cea991d7785d9a6f1f520f2d82f946930ef21bf1':
Label /dev/goldfish_pipe as qemu_device
Nick Kralevich [Fri, 15 May 2015 13:00:25 +0000 (13:00 +0000)]
Merge "Label /dev/goldfish_pipe as qemu_device"
Neil Fuller [Fri, 15 May 2015 09:30:35 +0000 (09:30 +0000)]
am
abf5ef8f: Merge "Add tzdatacheck to image"
* commit '
abf5ef8fdd96cee524f8d6518b19f8092d6a6e46':
Add tzdatacheck to image
Neil Fuller [Fri, 15 May 2015 09:09:44 +0000 (09:09 +0000)]
Merge "Add tzdatacheck to image"
Yu Ning [Thu, 14 May 2015 16:00:35 +0000 (00:00 +0800)]
Label /dev/goldfish_pipe as qemu_device
In goldfish kernel 3.10, qemu_pipe has been renamed to goldfish_pipe.
However, in the emulator's SELinux policy, there is no specific security
context assigned to /dev/goldfish_pipe, and the one inherited from /dev
(u:object_r:device:s0) prevents various processes (qemud, qemu-props,
etc.) from reading and writing goldfish_pipe. Consequently, the classic
x86_64 emulator will not boot if GPU emulation is enabled ("-gpu host"),
and does not render the UI correctly if launched with "-gpu off".
Fix this issue by assigning /dev/goldfish_pipe the same security context
as /dev/qemu_pipe.
This CL also benefits the new ("ranchu") emulator, where all supported
ABIs (arm64, mips64, x86 and x86_64) use 3.10-based kernels. Without
this fix, the new emulator boots and works, but there are avc denials
related to goldfish_pipe.
Last but not least, it is now possible to boot the classic x86 emulator
with a 3.10-based kernel instead of the current 3.4-based one, without
disabling SELinux.
Change-Id: Iad979c0ee9d0a410be12b83ac1bef9476b50a6dc
Signed-off-by: Yu Ning <yu.ning@intel.com>
Elliott Hughes [Fri, 15 May 2015 03:55:49 +0000 (20:55 -0700)]
Explain __USE_MINGW_ANSI_STDIO.
Change-Id: I6900a7cddfb5aa4365c3e0f6f6f0fa9203c0fe43
Ying Wang [Thu, 14 May 2015 16:26:33 +0000 (16:26 +0000)]
am
df5c798f: Merge "[MIPS] Temporarily disable Mips shared-textrel errors"
* commit '
df5c798f368bc16a858281b4d5d0ecc2b7040cfe':
[MIPS] Temporarily disable Mips shared-textrel errors
Ying Wang [Thu, 14 May 2015 16:11:58 +0000 (16:11 +0000)]
Merge "[MIPS] Temporarily disable Mips shared-textrel errors"
Jeff Vander Stoep [Thu, 14 May 2015 15:41:45 +0000 (15:41 +0000)]
am
7033819e: Merge "Remove unused #include <selinux/android.h>"
* commit '
7033819eeba08f9e550bc50fd1b01625d5f7e673':
Remove unused #include <selinux/android.h>
Jeff Vander Stoep [Thu, 14 May 2015 15:27:50 +0000 (15:27 +0000)]
Merge "Remove unused #include <selinux/android.h>"
Neil Fuller [Wed, 13 May 2015 16:47:29 +0000 (17:47 +0100)]
Add tzdatacheck to image
Bug:
21110439
Bug:
19941636
(cherry picked from commit
7d18a684177064a74dafbba8cc2f270f911936bf)
Change-Id: I29ab303d2695ba1cadf70c2d2f4440d34a8cede9
Jeff Vander Stoep [Wed, 13 May 2015 21:24:04 +0000 (14:24 -0700)]
Remove unused #include <selinux/android.h>
Change-Id: Iebc59784c7318edb1c1f686e040ed581259bdd5a