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

1469 Commits

Author SHA1 Message Date
Baligh Uddin 0a74bf180a Merge "Add new locales for Platform (L) release" 2014-06-26 18:07:29 +00:00
Baligh Uddin c8ae20330c Add new locales for Platform (L) release 
Bug: 13437459
Change-Id: Ic186d288469b503118513a437de3a2ef446e34fc
 2014-06-26 22:40:06 +00:00
Nick Vaccaro 56eb2f983e Add logd to core_tiny.mk (for logcat functionality) 
Bug: 15143878
Change-Id: Ief73aac31b0d4689d38c734dc23f0d20cdcdea17
 2014-06-26 19:35:40 +00:00
Narayan Kamath 4c5d3daef5 am 6fdf121c: Fix 64 bit emulator booting (again). 
* commit '6fdf121c192944f13255a8908df802051fec6535':
  Fix 64 bit emulator booting (again).
 2014-06-23 19:46:09 +00:00
Narayan Kamath 6fdf121c19 Fix 64 bit emulator booting (again). 
Not only should they inherit from core_64_bit.mk, we should
inherit from that first to make sure sdk.mk doesn't override
those values with other cruft.

Change-Id: Ibcd3c47b5be92544c1e86b6e85608b875c468461
 2014-06-23 17:52:53 +01:00
Brian Carlstrom ed9f839d03 am 515907a9: am 696f9d3e: am e0be9135: Merge "Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64" 
* commit '515907a98c3ddff2be42479364fd685103d06fe2':
  Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64
 2014-06-20 23:14:35 +00:00
Brian Carlstrom 515907a98c am 696f9d3e: am e0be9135: Merge "Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64" 
* commit '696f9d3e9cedc221cf907a5cc49f4e6533033372':
  Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64
 2014-06-20 22:40:34 +00:00
Brian Carlstrom 696f9d3e9c am e0be9135: Merge "Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64" 
* commit 'e0be9135a249ee5d60c6b897e7d538b1afb94b29':
  Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64
 2014-06-20 20:58:52 +00:00
Tsu Chiang Chuang 39175e172c Merge "Make default 64-bit primary, 32-bit secondary" into lmp-preview-dev 2014-06-20 20:43:34 +00:00
Narayan Kamath 31033fe08d SDK targets should inherit from core_64_bit.mk 
bug: 15661143

(cherry picked from commit e78ba32d23)

Change-Id: Icf9d0a7d429f848ca6163a8658c6e5f208fdd039
 2014-06-20 17:10:26 +01:00
Brian Carlstrom 85455b6cce Make default 64-bit primary, 32-bit secondary 
This is required to get aarch64 & x86_64 emulators booting
on lmp-preview-dev. Without this change, the system_server
is a 32 bit process but java only apps that use the
"android.uid.system" shared UID are dex2oated to 64 bit and
won't work correctly.

The correct fix needs build system changes, so this is the
easiest fix for now.

Note that this happens to work on volantis because the package
manager adjusts their ABI correctly during boot. That can't
happen on emulators because of dex-preopt; dex2oat can't oatify
a dex file from inside an existing oat file.

(cherry picked from commit d795046319)

Change-Id: Id94bcc382e90b279e726f2d1d0350fc60a5020df
 2014-06-20 14:24:32 +01:00
Brian Carlstrom 6bf07cc4de Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64 
Change-Id: Ia856159017f6228dbfd5a7100e3731b82e6e8fe4
 2014-06-20 13:09:25 -07:00
Brian Carlstrom 8fd9944e8f am 32d25fda: am dab766a7: Merge "Switch from core to core-libart" 
* commit '32d25fdabfaadc95292b43a29b695d8229333bcf':
  Switch from core to core-libart
 2014-06-19 02:17:54 +00:00
Brian Carlstrom 32d25fdabf am dab766a7: Merge "Switch from core to core-libart" 
* commit 'dab766a7312b1313c89930b5307f33f0baec1549':
  Switch from core to core-libart
 2014-06-19 02:14:26 +00:00
Brian Carlstrom b1dafb1804 Switch from core to core-libart 
Bug: 14298175
Change-Id: I1db40e7c67322d80a108b2b88e6d2e6d275d7898
 2014-06-18 17:42:32 -07:00
Brian Carlstrom 0d073451e7 am 9a954de3: am 8fb55d06: Merge "Remove some uses of the deprecated WITH_HOST_DALVIK." 
* commit '9a954de366bad8ba2cce2cb6c917a1bec7c61c77':
  Remove some uses of the deprecated WITH_HOST_DALVIK.
 2014-06-18 20:51:14 +00:00
Brian Carlstrom 9a954de366 am 8fb55d06: Merge "Remove some uses of the deprecated WITH_HOST_DALVIK." 
* commit '8fb55d06c7bd153e673c1372b3af75bcb849ed9d':
  Remove some uses of the deprecated WITH_HOST_DALVIK.
 2014-06-18 20:46:53 +00:00
Ian Rogers a00ba56c63 Remove some uses of the deprecated WITH_HOST_DALVIK. 
Bug: 13751317.
Change-Id: I4beb81089b4ad7dac4d87571509389d1dae22bf3
 2014-06-18 13:38:44 -07:00
Narayan Kamath 6db9e1c887 Merge changes Ib9d1863c,I2a6eb327 
* changes:
  SDK targets should inherit from core_64_bit.mk
  Fix issue in symlinking 64 bit executables.
 2014-06-17 21:55:55 +00:00
Brian Carlstrom 55fa2ea206 resolved conflicts for merge of 8fd9944e to master 
Change-Id: I1ceda92267675d4ca460b6f990c0acea4b4812a8
 2014-06-18 19:25:30 -07:00
Daniel Rosenberg 0df5e7270b Added filesystem management tools to core_minimal.mk and core_tiny.mk 
Required for supporting resizing asecs

Change-Id: If7de23aa4baf97f3d0ccec423e52534f379f0881
Signed-off-by: Daniel Rosenberg <drosen@google.com>
 2014-06-18 23:15:20 +00:00
Brian Carlstrom 85b70c039f am 0d073451: am 9a954de3: am 8fb55d06: Merge "Remove some uses of the deprecated WITH_HOST_DALVIK." 
* commit '0d073451e7a453ccfb952505b27ec1effdc3a674':
  Remove some uses of the deprecated WITH_HOST_DALVIK.
 2014-06-18 21:40:31 +00:00
Nick Kralevich f9172a61d7 am 2eb95ac2: am ad6107c3: Merge "Coalesce generic_x86 and generic sepolicy where possible." 
* commit '2eb95ac202429d930545043d742ab443bedbf357':
  Coalesce generic_x86 and generic sepolicy where possible.
 2014-06-17 16:56:57 +00:00
Nick Kralevich 2eb95ac202 am ad6107c3: Merge "Coalesce generic_x86 and generic sepolicy where possible." 
* commit 'ad6107c3e9901ce520eedcad7770a3a9e4f327d8':
  Coalesce generic_x86 and generic sepolicy where possible.
 2014-06-17 16:51:14 +00:00
Narayan Kamath e78ba32d23 SDK targets should inherit from core_64_bit.mk 
bug: 15661143
Change-Id: Ib9d1863c7acf7b607a027f4945ee4755624967b3
 2014-06-17 17:43:14 +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
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
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
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
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
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 2e5371ae92 Remove libportable from core_base.mk. 
(cherry picked from commit 4e8c6991e5)

Change-Id: Icefe7dccbca87798d4ec0761bf90aa169253839e
 2014-06-16 16:52:36 -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
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 42971a6ad7 Revert "Allow all domains access to /dev/qemu_trace." 
This reverts commit b1b12f8ad4.

(cherry picked from commit 097e840b06)

Change-Id: I89a9a0879a415c177091852a579c6dfd8c8a5b0a
 2014-06-16 12:16:32 -07:00
dcashman 4b445e8998 am 3aeceecd: am cd978db2: am 96df14d6: Merge "Allow all domains access to /dev/qemu_trace." 
* commit '3aeceecddf2c7ee7f785e7e16c54d8bb99e3c9f1':
  Allow all domains access to /dev/qemu_trace.
 2014-06-16 18:11:30 +00:00
dcashman f1d5f8805c am 8dea5006: am 357842b1: Merge "Revert "Allow all domains access to /dev/qemu_trace."" 
* commit '8dea5006c53e105f5a7181e5d915d88462de69ae':
  Revert "Allow all domains access to /dev/qemu_trace."
 2014-06-16 18:03:01 +00:00
dcashman 8dea5006c5 am 357842b1: Merge "Revert "Allow all domains access to /dev/qemu_trace."" 
* commit '357842b109db31c85aebb8d1c9f70885fe1cb07c':
  Revert "Allow all domains access to /dev/qemu_trace."
 2014-06-16 17:57:56 +00:00
dcashman 3aeceecddf am cd978db2: am 96df14d6: Merge "Allow all domains access to /dev/qemu_trace." 
* commit 'cd978db20ed0d8dffb1686ef23b968d70561f7cf':
  Allow all domains access to /dev/qemu_trace.
 2014-06-16 17:23:52 +00:00
dcashman cd978db20e am 96df14d6: Merge "Allow all domains access to /dev/qemu_trace." 
* commit '96df14d6b665b394fbc26108820cbfba8033bed0':
  Allow all domains access to /dev/qemu_trace.
 2014-06-16 17:18:35 +00:00
Steve Moyer 16e2e04730 DO NOT MERGE: Combine emulator test projects into a single apk 
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests

Conflicts:
	target/product/sdk.mk

Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
 2014-06-16 09:53:34 -07:00
dcashman 097e840b06 Revert "Allow all domains access to /dev/qemu_trace." 
This reverts commit b1b12f8ad4.
 2014-06-16 10:45:16 -07:00