openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
19,301 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

1509 Commits

Author SHA1 Message Date
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
dcashman b1b12f8ad4 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: I4999a1eb5c25b4238c53fe1e989bcf5fed1ae355
 2014-06-16 10:10:38 -07:00
Adam Lesinski bd55fc56e1 am b9c024c6: am e20af003: Merge "Add drm framework library to core_tiny" into klp-modular-dev 
* commit 'b9c024c674968c6b05101a8de65108a62917cf17':
  Add drm framework library to core_tiny
 2014-06-13 22:26:48 +00:00
Wink Saville 2d5486a006 Merge "Merge kwd to master" 2014-06-13 21:09:46 +00:00
Adam Lesinski b9c024c674 am e20af003: Merge "Add drm framework library to core_tiny" into klp-modular-dev 
* commit 'e20af003e443ff2fd38a446613ecc28f0d10330a':
  Add drm framework library to core_tiny
 2014-06-13 20:47:33 +00:00
Nick Kralevich 08ccd188e0 am 64dd84a9: am 003f84fb: am c80e876c: Merge "Add service_contexts to embedded.mk." 
* commit '64dd84a94f468b0e70996c55411d2be08c985267':
  Add service_contexts to embedded.mk.
 2014-06-12 21:16:52 +00:00
Nick Kralevich 64dd84a94f am 003f84fb: am c80e876c: Merge "Add service_contexts to embedded.mk." 
* commit '003f84fbbbffa0eb0b6958a2f7f4a120206decc8':
  Add service_contexts to embedded.mk.
 2014-06-12 21:10:20 +00:00
Nick Kralevich 003f84fbbb am c80e876c: Merge "Add service_contexts to embedded.mk." 
* commit 'c80e876cd2eab6452313a98c6ddeca403510784c':
  Add service_contexts to embedded.mk.
 2014-06-12 21:03:37 +00:00
Riley Spahn 8b834ecedb Add service_contexts to embedded.mk. 
Add service_contexts to embedded.mk to support MAC checks in the
service manager.

Bug: 12909011
Change-Id: I31f4f4e1acb2be8167f2f11f93c936c18303135a
 2014-06-12 20:45:58 +00:00
Wink Saville 273c22cbc0 Merge kwd to master 
Add ims-common support from kwd

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
 2014-06-11 15:21:03 -07:00
Ying Wang fa3aebf762 am b3529761: am 2d4a27ee: am d707b5aa: Merge "AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15" 
* commit 'b3529761af24d19cd8cefa2c93f91920f0dfb28f':
  AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15
 2014-06-11 21:38:20 +00:00
Elliott Hughes 59c9bea1da am b5153477: am c7504124: am 47cdacd5: Merge "Remove libportable from core_base.mk." 
* commit 'b5153477107fd0cba9e073c4445c11c78ee35c92':
  Remove libportable from core_base.mk.
 2014-06-11 19:34:31 +00:00
Ying Wang b3529761af am 2d4a27ee: am d707b5aa: Merge "AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15" 
* commit '2d4a27ee6cbd779b17eb8cd07dcbb9ff3bc8b2c0':
  AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15
 2014-06-11 17:06:02 +00:00
Ying Wang 2d4a27ee6c am d707b5aa: Merge "AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15" 
* commit 'd707b5aa74730103a1978b2b47713b24bd2a7017':
  AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15
 2014-06-11 17:02:27 +00:00
Ying Wang d707b5aa74 Merge "AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15" 2014-06-10 22:15:14 +00:00
Elliott Hughes b515347710 am c7504124: am 47cdacd5: Merge "Remove libportable from core_base.mk." 
* commit 'c75041243c1c189e6972eb8680c83f1b17dacfd7':
  Remove libportable from core_base.mk.
 2014-06-10 19:27:47 +00:00
Elliott Hughes c75041243c am 47cdacd5: Merge "Remove libportable from core_base.mk." 
* commit '47cdacd5e633c8256a5dd32c769b5469882fc0aa':
  Remove libportable from core_base.mk.
 2014-06-10 19:25:57 +00:00
Elliott Hughes 4e8c6991e5 Remove libportable from core_base.mk. 
Change-Id: I3fae0625c68db885bd2fba502d31fe3c524d4f47
 2014-06-10 12:19:01 -07:00
Lajos Molnar f1831cb022 am 93d45370: core_base.mk: add hevc software decoder 
* commit '93d45370bea37e2c1e5931181fef12c67e9d2f98':
  core_base.mk: add hevc software decoder
 2014-06-06 23:03:31 +00:00
Adam Lesinski b300792c65 Add drm framework library to core_tiny 
Change-Id: If6a451a9b26789ad8689722425a2a34372c123d9
 2014-06-06 15:55:01 -07:00
Lajos Molnar 93d45370be core_base.mk: add hevc software decoder 
Bug: 14571712
Change-Id: I41c57023c6bcba73859b61052cacfd4ffd02e3dd
 2014-06-05 22:29:49 -07:00
Adam Lesinski c1dd8b4e67 Merge commit '2f9a705e' into manualmerge 
Conflicts:
	target/product/core_tiny.mk

Change-Id: I6d2f57be8d4e65768d51f6db65d78295d1d3e3fa
 2014-06-05 15:27:26 -07:00
Adam Lesinski 2f9a705e5e am 3f1b5c52: Merge "The public Telephony APIs must be present in all Android products" into klp-modular-dev 
* commit '3f1b5c52d27165fc5aa0fbf443f10e8ad3e81ab7':
  The public Telephony APIs must be present in all Android products
 2014-06-05 22:21:32 +00:00
Eric Laurent e807ab0269 Merge "add sound trigger service library" 2014-06-05 15:33:10 +00:00
Eric Laurent b0baa27f3d add sound trigger service library 
Change-Id: I444396c5a1df13ad59c2a236849e9c729faed956
 2014-06-04 15:37:15 -07:00
Qiwen Zhao e8e7ebbde4 Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk"" 
This reverts commit a5abefbbb5.
 2014-06-04 11:21:21 -07:00
Qiwen Zhao a5abefbbb5 Revert "DO NOT MERGE: Combine emulator test projects into a single apk" 
This reverts commit 0ced06ea0f.
 2014-06-04 10:02:29 -07:00
Steve Moyer 37773821f1 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-04 09:41:24 -07:00
Steve Moyer 008dc16cb0 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-04 09:38:32 -07:00
Serban Constantinescu 93694e63ee AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15 
A sensible default for the 32bit CPU_VARIANT of an ARM64 build is
cortex-a15. Please note that the AArch32 execution state of ARMv8
is a superset of ARMv7.

Change-Id: Id2b655172750e04609ae9ba22d621fe83cd69b1a
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
 2014-06-04 16:19:24 +01:00
Adam Lesinski 40703e9473 The public Telephony APIs must be present in all Android products 
Change-Id: I8d510a422b00b65beed2675c611301e20fd1356f
 2014-06-03 21:12:25 -07:00
Dave Allison 7f73ca804a Add libsigchain to the embedded.mk makefile 
This library is used in a LD_PRELOAD environment variable and the linker shows
a warning if it is not present.  This change is to added it to all targets so
that the warning is not shown.  If ART is not provided on the device this
library has no effect.

Change-Id: I81f01b66fa9c78048534f4bcfc04d62b18057a03
 2014-06-02 15:53:31 -07:00
Nick Kralevich e2618cdc52 am 362d2d41: am 333005f1: am c706ea79: Merge "Include selinux_version file with builds." 
* commit '362d2d4123a755a3e39a2015cf49da7db24a26ad':
  Include selinux_version file with builds.
 2014-06-02 19:29:10 +00:00
Nick Kralevich 362d2d4123 am 333005f1: am c706ea79: Merge "Include selinux_version file with builds." 
* commit '333005f1bfa7dc36d327ddb45fdf8fa2d38ca768':
  Include selinux_version file with builds.
 2014-06-02 19:27:04 +00:00
Nick Kralevich 333005f1bf am c706ea79: Merge "Include selinux_version file with builds." 
* commit 'c706ea79629792f4432774643887f5681e8f145d':
  Include selinux_version file with builds.
 2014-06-02 19:25:21 +00:00
Nick Kralevich c706ea7962 Merge "Include selinux_version file with builds." 2014-06-02 19:23:12 +00:00
Ying Wang 21e9474252 am b541ab6c: Support to build 64-bit unbundled binaries. 
* commit 'b541ab6c51734530ed615e307f8912f32e616967':
  Support to build 64-bit unbundled binaries.
 2014-05-30 01:02:44 +00:00
Ying Wang b541ab6c51 Support to build 64-bit unbundled binaries. 
Change-Id: I4656c983d60aaf535ce4d14528c28ae8cef98fd8
 2014-05-29 17:57:40 -07:00
Dave Allison 7127da62c8 am faa2d249: am f4115cdf: am 2a2ba735: Merge "Add libsigchain to the embedded.mk makefile" 
* commit 'faa2d24991682e31804f8cfcdc16a4f09fb4dbad':
  Add libsigchain to the embedded.mk makefile
 2014-05-29 21:09:56 +00:00
Dave Allison faa2d24991 am f4115cdf: am 2a2ba735: Merge "Add libsigchain to the embedded.mk makefile" 
* commit 'f4115cdfac6bfde8e3d7cab1e7782d078d764209':
  Add libsigchain to the embedded.mk makefile
 2014-05-29 21:06:26 +00:00
Brian Carlstrom 8fe9c76d9a resolved conflicts for merge of 2267c22b to klp-modular-dev-plus-aosp 
Change-Id: I636a1ebd2f68e2c505875bf3333f18a8977a0e2c
 2014-05-29 14:01:24 -07:00
Dave Allison f4115cdfac am 2a2ba735: Merge "Add libsigchain to the embedded.mk makefile" 
* commit '2a2ba735df028a6168368a399b6df27a6ec33fa4':
  Add libsigchain to the embedded.mk makefile
 2014-05-29 19:57:50 +00:00
Dave Allison 2a2ba735df Merge "Add libsigchain to the embedded.mk makefile" 2014-05-29 19:51:50 +00:00
Brian Carlstrom 2267c22b3d am f2a2406b: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general" 
* commit 'f2a2406b8c01e71603feaa5eaccd75d26ea76804':
  Remove dependencies on runtime_libdvm and libdvm.so in general
 2014-05-29 19:39:49 +00:00
Brian Carlstrom 1e60fe58f0 Remove dependencies on runtime_libdvm and libdvm.so in general 
Bug: 14298175

(cherry picked from commit bf8a374a92)

Change-Id: I183d1ff078a54c422305d8798ea200855265ebb6
 2014-05-29 09:37:25 -07:00
Brian Carlstrom 5da48a3394 am bf8a374a: Remove dependencies on runtime_libdvm and libdvm.so in general 
* commit 'bf8a374a92e327efed95892fe67e6917a89c6c2b':
  Remove dependencies on runtime_libdvm and libdvm.so in general
 2014-05-29 16:37:19 +00:00
Brian Carlstrom bf8a374a92 Remove dependencies on runtime_libdvm and libdvm.so in general 
Bug: 14298175
Change-Id: I8441b64dc33543a912aebcfb8fdf76114ec50abe
 2014-05-28 21:27:47 -07:00
Elliott Hughes 7c9a8e6400 am 55b2c360: am ad319779: am 4afe808c: Merge "Fix all the system image sizes." 
* commit '55b2c3600fcbdc6bd0dbf3319eb219188553429c':
  Fix all the system image sizes.
 2014-05-28 18:01:54 +00:00
Elliott Hughes 55b2c3600f am ad319779: am 4afe808c: Merge "Fix all the system image sizes." 
* commit 'ad319779ff31f9c03b05b65ae84bc2b81ba0d9ee':
  Fix all the system image sizes.
 2014-05-28 04:07:39 +00:00
Elliott Hughes ad319779ff am 4afe808c: Merge "Fix all the system image sizes." 
* commit '4afe808c640ac2bfdd1e665d322b7c9fbe38a974':
  Fix all the system image sizes.
 2014-05-28 04:04:36 +00:00
Elliott Hughes 368600b1e8 Fix all the system image sizes. 
x86 just bit me. I did manage to build mips today, but I assume it
can't be long before we hit the limit there too if every other target
has hit it already.

Change-Id: I28dfe3b4f9565cb79e0bf6b0ffc55a9d6e64a9b0
 2014-05-27 16:47:44 -07:00
Narayan Kamath 7d55bea91f resolved conflicts for merge of 38c3c930 to master 
Change-Id: I88bb5131ce15bc5a4d7a7870d33c78fc9d952bb2
 2014-05-27 12:29:41 +01:00
Narayan Kamath 38c3c9309f am 6c2ae327: am 8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary." 
* commit '6c2ae327665396958ba6f08dc72bc30b3455d046':
  Switch x86_64 emulator to 64 bit primary.
 2014-05-27 11:23:34 +00:00
Narayan Kamath 06db73241a resolved conflicts for merge of 0f99bb3d to klp-modular-dev-plus-aosp 
Change-Id: I9be144d41d8ad3c4792f5ca2a3b8aaa65a77530f
 2014-05-27 12:21:22 +01:00
Narayan Kamath 6c2ae32766 am 8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary." 
* commit '8d3b9c9e456e1d62a025d2eb3a03f2566823d2e3':
  Switch x86_64 emulator to 64 bit primary.
 2014-05-27 11:15:57 +00:00
Narayan Kamath 0f99bb3d0b am 7b31bd3e: Merge "Remove hardcoded TARGET_PREFER_32_BIT_APPS." 
* commit '7b31bd3e8f25b9b232204d4b64399d78d6e41163':
  Remove hardcoded TARGET_PREFER_32_BIT_APPS.
 2014-05-27 11:15:56 +00:00
Narayan Kamath 8d3b9c9e45 Merge "Switch x86_64 emulator to 64 bit primary." 2014-05-27 11:13:42 +00:00
Narayan Kamath 7b31bd3e8f Merge "Remove hardcoded TARGET_PREFER_32_BIT_APPS." 2014-05-27 11:12:34 +00:00
Narayan Kamath 62da5fd161 Switch x86_64 emulator to 64 bit primary. 
Also siezes the opportunity to remove the hardcoded
TARGET_PREFER_32_BIT_APPS directing in core_64_bit.mk.
This avoids the need for further hacks but needs supporting
changes to a few apps to force them to 32 bit.

Change-Id: I36ba9e5f5b08dd87d6a4afc27961a436306eed99
 2014-05-27 12:12:00 +01:00
Narayan Kamath 214c53a022 Remove hardcoded TARGET_PREFER_32_BIT_APPS. 
This isn't required any longer, besides individual products
should be allowed to set this value themselves.

(cherry picked from commit 7b9347a7f9)

Change-Id: If459eab32c6e7831596224ad3503baefbf028133
 2014-05-27 12:08:33 +01:00
Lorenzo Colitti 87b6b24f86 Merge "Build EthernetService." 2014-05-22 05:57:58 +00:00