p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
18,925 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

18925 Commits

Author SHA1 Message Date
Narayan Kamath 79bc52af37 Fix issue in symlinking 64 bit executables. 
We were not inspecting the value of TARGET_SUPPORTS_{32,64}_BIT_APPS
so we'd sometimes create the wrong symlink if TARGET_IS_64_BIT was
true.

bug: 15661143

Change-Id: I2a6eb3278445fcd14bc9dc9312f41f972ea77971
 2014-06-17 17:02:51 +01:00
Nick Kralevich 7be1a5197f am 331f4d58: am cc7aebb8: Merge "Restore generic_x86 sepolicy zygote.te file." 
* commit '331f4d5863137e5fd5d59f9a407de2a7227a5c23':
  Restore generic_x86 sepolicy zygote.te file.
 2014-06-17 13:50:14 +00:00
Nick Kralevich 331f4d5863 am cc7aebb8: Merge "Restore generic_x86 sepolicy zygote.te file." 
* commit 'cc7aebb8d30f01029f43be730c27c794b8f39aa6':
  Restore generic_x86 sepolicy zygote.te file.
 2014-06-17 13:44:53 +00:00
Narayan Kamath b60ccd6672 am ae65e2eb: am d73ec26a: Merge "Make default 64-bit primary, 32-bit secondary" 
* commit 'ae65e2eb8d5f530d4292a5c70bac113f18900e9d':
  Make default 64-bit primary, 32-bit secondary
 2014-06-17 10:05:13 +00:00
Narayan Kamath ae65e2eb8d am d73ec26a: Merge "Make default 64-bit primary, 32-bit secondary" 
* commit 'd73ec26a19e82cefca45e3c80b37b015d423bda7':
  Make default 64-bit primary, 32-bit secondary
 2014-06-17 09:56:18 +00:00
Nick Kralevich cc7aebb8d3 Merge "Restore generic_x86 sepolicy zygote.te file." 2014-06-17 05:00:50 +00:00
Stephen Smalley 78eee96a72 Restore generic_x86 sepolicy zygote.te file. 
I87d0976800557d73064e2da038315b0d019d7a60 removed zygote.te from
generic/sepolicy and generic/BoardConfig.mk but also incorrectly
removed it from generic_x86/BoardConfig.mk, even though
generic_x86/sepolicy/zygote.te still exists and contains rules
needed on the x86 emulator.  Otherwise the zygote fails with
execmem denials on the x86 emulator.

(x86 emulator is also broken currently due to yaffs2 /cache yielding
unlabeled denials, but that is unrelated to this change).

Change-Id: Ie36ed4ed7ba478a377f9a0d4383d006b49bde5cc
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2014-06-17 09:20:17 -04:00
Nick Kralevich ad6107c3e9 Merge "Coalesce generic_x86 and generic sepolicy where possible." 2014-06-17 04:58:57 +00:00
Stephen Smalley a49411f49b Coalesce generic_x86 and generic sepolicy where possible. 
We originally forked a complete copy of generic/sepolicy into
generic_x86/sepolicy, but we can instead inherit from it and
merely add rules as needed under generic_x86/sepolicy.

Change-Id: I21e1a1425ce08676a8ea69685a4761db3bfde628
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2014-06-17 09:35:56 -04:00
Steve Moyer 97f49221ad Merge "DO NOT MERGE: Combine emulator test projects into a single apk" into stage-aosp-master 2014-06-17 04:56:28 +00:00
Ying Wang cd3d5fa8d3 Merge "Less spammy ProGuard." 2014-06-17 04:56:28 +00:00
Ying Wang f864d502ab Less spammy ProGuard. 
Change-Id: I465921b878c4ed6ec5d564704801e435d1aaa63c
 2014-06-17 11:53:31 -07:00
Steve Moyer 39af631d03 am 7091bbf9: (-s ours) am 97f49221: (-s ours) Merge "DO NOT MERGE: Combine emulator test projects into a single apk" into stage-aosp-master 
* commit '7091bbf92ac8d80a664cb347b7f65899f0ba36eb':
  DO NOT MERGE: Combine emulator test projects into a single apk
 2014-06-17 18:06:36 +00:00
Nick Kralevich 06b895ea48 am f9172a61: am 2eb95ac2: am ad6107c3: Merge "Coalesce generic_x86 and generic sepolicy where possible." 
* commit 'f9172a61d742ac048fced2c264585068a42527b3':
  Coalesce generic_x86 and generic sepolicy where possible.
 2014-06-17 18:06:10 +00:00
Narayan Kamath d73ec26a19 Merge "Make default 64-bit primary, 32-bit secondary" 2014-06-17 04:39:21 +00:00
Brian Carlstrom d795046319 Make default 64-bit primary, 32-bit secondary 
Change-Id: I2613a5072e2778307eebdc95d81f184f748ce9f5
 2014-06-16 23:59:43 -07:00
Doug Zongker 3fd79a352e Merge "full support for OTA of vendor partitions" 2014-06-17 03:47:23 +00:00
Nick Kralevich e96f961efc am 7be1a519: am 331f4d58: am cc7aebb8: Merge "Restore generic_x86 sepolicy zygote.te file." 
* commit '7be1a5197ffb97aebc8a175b7a5dcbed248ac8a7':
  Restore generic_x86 sepolicy zygote.te file.
 2014-06-17 13:54:23 +00:00
Narayan Kamath 9d62dbc532 resolved conflicts for merge of b60ccd66 to master 
Change-Id: I731af090c472d70a6c0627cef87239dc6df91645
 2014-06-17 11:11:35 +01:00
smain@google.com b75b32830c am 5c1d21b4: am 95948b88: add script and style for toggling which IDE instructions to show. 
* commit '5c1d21b458880bcc466bc353bc9afbef8e439afc':
  add script and style for toggling which IDE instructions to show.
 2014-06-17 03:28:49 +00:00
smain@google.com 5c1d21b458 am 95948b88: add script and style for toggling which IDE instructions to show. 
* commit '95948b88ec17e5b0f5b9cdcc43b08989cec2a34a':
  add script and style for toggling which IDE instructions to show.
 2014-06-17 03:24:12 +00:00
smain@google.com 95948b88ec add script and style for toggling which IDE instructions to show. 
Change-Id: Ief094a4f58c7ebb4625948d6639fed713adcc0c7
 2014-06-16 19:25:14 -07:00
Ying Wang acba9f7691 am cc033aba: am fe86a7c1: am a530bd40: Merge "Also include the binaries for the 2nd arch." 
* commit 'cc033aba814a0954b713c571d3eeb105f533fd7b':
  Also include the binaries for the 2nd arch.
 2014-06-17 01:46:53 +00:00
Ying Wang e3447a8df1 am d0052bc7: (-s ours) am e6b3692b: am c17e0f92: Merge "Explicit record the modules\' built-file:installed-file" 
* commit 'd0052bc70ae084e9e37c01f596d54f71380e49cf':
  Explicit record the modules' built-file:installed-file
 2014-06-17 01:46:52 +00:00
Ying Wang 53f2ced491 am 696af13a: (-s ours) am a307bbc7: am fcb077ea: Merge "Put modules with install path to system/ to DATA/ in the zip file." 
* commit '696af13a6775602ee0aecb148610a55486d69db0':
  Put modules with install path to system/ to DATA/ in the zip file.
 2014-06-17 01:40:19 +00:00
dcashman 6672745d18 am cac1fc6d: am 5bb6eeb9: am d9c312b5: Merge "Allow all domains access to /dev/qemu_trace." 
* commit 'cac1fc6dd5daf5f03bacf8749f888d196985fda8':
  Allow all domains access to /dev/qemu_trace.
 2014-06-17 01:30:39 +00:00
Elliott Hughes b107fdd6a9 am 2e5371ae: Remove libportable from core_base.mk. 
* commit '2e5371ae929185de23c1d9160e865f81a51a7f6e':
  Remove libportable from core_base.mk.
 2014-06-17 00:28:36 +00:00
Ying Wang cc033aba81 am fe86a7c1: am a530bd40: Merge "Also include the binaries for the 2nd arch." 
* commit 'fe86a7c1531ac85d634b7fde16ce008ca28118fb':
  Also include the binaries for the 2nd arch.
 2014-06-16 23:53:39 +00:00
Ying Wang d0052bc70a am e6b3692b: am c17e0f92: Merge "Explicit record the modules\' built-file:installed-file" 
* commit 'e6b3692b8357b52b0a67e12be450e1ccfda5ffb5':
  Explicit record the modules' built-file:installed-file
 2014-06-16 23:53:38 +00:00
Ying Wang 696af13a67 am a307bbc7: am fcb077ea: Merge "Put modules with install path to system/ to DATA/ in the zip file." 
* commit 'a307bbc7dcc8ce533743ba829039de1f3f979beb':
  Put modules with install path to system/ to DATA/ in the zip file.
 2014-06-16 23:53:37 +00:00
Elliott Hughes 2e5371ae92 Remove libportable from core_base.mk. 
(cherry picked from commit 4e8c6991e5)

Change-Id: Icefe7dccbca87798d4ec0761bf90aa169253839e
 2014-06-16 16:52:36 -07:00
Ying Wang fe86a7c153 am a530bd40: Merge "Also include the binaries for the 2nd arch." 
* commit 'a530bd4025ddf5d37510fca9de62e2dec3f2d7cb':
  Also include the binaries for the 2nd arch.
 2014-06-16 23:50:26 +00:00
Ying Wang e6b3692b83 am c17e0f92: Merge "Explicit record the modules\' built-file:installed-file" 
* commit 'c17e0f92c570931ece4ae9c7ca27ecef5734113f':
  Explicit record the modules' built-file:installed-file
 2014-06-16 23:50:25 +00:00
Ying Wang a307bbc7dc am fcb077ea: Merge "Put modules with install path to system/ to DATA/ in the zip file." 
* commit 'fcb077ea018da08e02fa3791089f7760f4bf1869':
  Put modules with install path to system/ to DATA/ in the zip file.
 2014-06-16 23:50:25 +00:00
Ying Wang c947b4a8ae Also include the binaries for the 2nd arch. 
Also include the binaries for the 2nd arch when building module
packages.

Change-Id: I50d2c7451a77cbccdb365c8efea6c77f5147fde6
 2014-06-16 16:34:40 -07:00
dcashman cac1fc6dd5 am 5bb6eeb9: am d9c312b5: Merge "Allow all domains access to /dev/qemu_trace." 
* commit '5bb6eeb9de791086d9129c49aeabcff65df845da':
  Allow all domains access to /dev/qemu_trace.
 2014-06-16 23:04:18 +00:00
dcashman 5bb6eeb9de am d9c312b5: Merge "Allow all domains access to /dev/qemu_trace." 
* commit 'd9c312b51ae404f3c0a49997b5cb9ed6ad84df86':
  Allow all domains access to /dev/qemu_trace.
 2014-06-16 22:59:28 +00:00
Doug Zongker c8b4e849f1 full support for OTA of vendor partitions 
Make vendor partition a first-class member of the OTA system (for
target_files that contain a VENDOR/ subdirectory).

Build vendor images in a way that is compatible with block-based OTA.
Support updating the vendor partition in both full and incremental,
block and file OTAs.  In most cases this is handled by refactoring the
existing code to handle the system partition to handle either, and
then calling it twice.

Currently we don't support incremental OTAs from a target-files
without a VENDOR subdirectory to one with one, or vice versa.  To add
or remove a vendor partition a full OTA will need to be done.

Bug: 15544685
Change-Id: I9cb9a1267060bd9683a9bea19b43a26b5a43800d
 2014-06-16 15:39:54 -07:00
Elliott Hughes 53caaaf6f8 am 0f41ad79: am 1ffda9be: Merge "Remove unused hosts." 
* commit '0f41ad79932bf7e69d3bfab73f8ecf3c28956727':
  Remove unused hosts.
 2014-06-16 22:23:27 +00:00
Elliott Hughes 0f41ad7993 am 1ffda9be: Merge "Remove unused hosts." 
* commit '1ffda9be60c64337085bbc65b2a0658b7c1c79b9':
  Remove unused hosts.
 2014-06-16 22:18:50 +00:00
Ying Wang c17e0f92c5 Merge "Explicit record the modules' built-file:installed-file" 2014-06-16 22:13:20 +00:00
Ying Wang 74c9850c79 Explicit record the modules' built-file:installed-file 
- This simplifies the logic to get the mapping of built-file to
  installed-file. Previously we used file suffix matching which is error
  prone and not scalable.
- With this change the .odex files will be included automatically.

Bug: 13585955
Change-Id: I4599abf93b9d501bac7aca7758d7f3aee21b3e36
 2014-06-16 16:41:48 -07:00
Ying Wang 03270b97ca Put modules with install path to system/ to DATA/ in the zip file. 
Change-Id: I3948c28bb3f988d57da41d6eb8f97da4e20b0e86
 2014-06-16 16:41:23 -07:00
dcashman d9c312b51a Merge "Allow all domains access to /dev/qemu_trace." 2014-06-16 21:55:56 +00:00
JP Abgrall a6e63c2e87 Merge "core: Fixup assert-max-image-size/assert-max-file-size usage" 2014-06-16 21:50:51 +00:00
Ying Wang d64f3c6ee6 am c947b4a8: Also include the binaries for the 2nd arch. 
* commit 'c947b4a8aec947f4dd6177e3bbd692a144b0a60c':
  Also include the binaries for the 2nd arch.
 2014-06-16 23:42:56 +00:00
Elliott Hughes 7ec725d41f resolved conflicts for merge of 53caaaf6 to master 
Change-Id: I20d265364b09c64d3637e57f500e934ee2310887
 2014-06-16 15:34:25 -07:00
JP Abgrall 0ed7cec97a core: Fixup assert-max-image-size/assert-max-file-size usage 
- Remove the incorrectly used (and unused) 3rd arg to assert-max-image-size
- Remove test for fstype in assert-max-file-size() as it was always
  set to a value leading to 0.

Change-Id: I0a1182fcc85c6c3801d45731e691b9bb38657606
Signed-off-by: JP Abgrall <jpa@google.com>
 2014-06-16 14:20:40 -07:00
dcashman 38a261a82b Allow all domains access to /dev/qemu_trace. 
/dev/qemu_trace is used by memcheck on qemu to get memory allocation events
from all processes on the system.  Allow all domains to access this device, and
other qemu-specific devices.

Addresses the following denials:
type=1400 audit(1402674828.500:3): avc:  denied  { read write } for  pid=44 comm="servicemanager" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:servicemanager:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.500:4): avc:  denied  { open } for  pid=44 comm="servicemanager" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:servicemanager:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.520:5): avc:  denied  { read write } for  pid=42 comm="logd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:logd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.520:6): avc:  denied  { open } for  pid=42 comm="logd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:logd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.610:7): avc:  denied  { read write } for  pid=48 comm="debuggerd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:debuggerd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.610:8): avc:  denied  { open } for  pid=48 comm="debuggerd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:debuggerd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.000:9): avc: denied { read write } for pid=47 comm="netd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.000:10): avc: denied { open } for pid=47 comm="netd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.180:11): avc: denied { read write } for pid=53 comm="installd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:installd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.200:12): avc: denied { read write } for pid=45 comm="vold" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:vold:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.200:13): avc: denied { open } for pid=53 comm="installd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:installd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.200:14): avc: denied { open } for pid=45 comm="vold" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:vold:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.280:15): avc: denied { read write } for pid=54 comm="keystore" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:keystore:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.280:16): avc: denied { open } for pid=54 comm="keystore" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:keystore:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674830.580:17): avc: denied { read write } for pid=51 comm="drmserver" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:drmserver:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674830.580:18): avc: denied { open } for pid=51 comm="drmserver" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:drmserver:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674930.860:22): avc: denied { read write } for pid=655 comm="iptables" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674930.870:23): avc: denied { open } for pid=655 comm="iptables" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file

Bug: 15570479
Change-Id: I87d0976800557d73064e2da038315b0d019d7a60
 2014-06-16 14:17:05 -07:00
dcashman 54d0203db0 am f1d5f880: am 8dea5006: am 357842b1: Merge "Revert "Allow all domains access to /dev/qemu_trace."" 
* commit 'f1d5f8805c654bc03eb0eb35b76f3d5b6cdddfbd':
  Revert "Allow all domains access to /dev/qemu_trace."
 2014-06-16 20:51:46 +00:00