OSDN Git Service
dcashman [Mon, 16 Jun 2014 17:57:56 +0000 (17:57 +0000)]
am
357842b1: Merge "Revert "Allow all domains access to /dev/qemu_trace.""
* commit '
357842b109db31c85aebb8d1c9f70885fe1cb07c':
Revert "Allow all domains access to /dev/qemu_trace."
dcashman [Mon, 16 Jun 2014 17:18:35 +0000 (17:18 +0000)]
am
96df14d6: Merge "Allow all domains access to /dev/qemu_trace."
* commit '
96df14d6b665b394fbc26108820cbfba8033bed0':
Allow all domains access to /dev/qemu_trace.
Ying Wang [Mon, 16 Jun 2014 16:29:27 +0000 (16:29 +0000)]
am
2f1f30a9: Merge "Trim down BUILD_FINGERPRINT."
* commit '
2f1f30a9b1d60e09115237db4052cac5c50ff4d5':
Trim down BUILD_FINGERPRINT.
dcashman [Mon, 16 Jun 2014 17:53:19 +0000 (17:53 +0000)]
Merge "Revert "Allow all domains access to /dev/qemu_trace.""
dcashman [Mon, 16 Jun 2014 17:45:16 +0000 (10:45 -0700)]
Revert "Allow all domains access to /dev/qemu_trace."
This reverts commit
b1b12f8ad49ecbba7dd6b9db2a0ca8fafa532d82.
dcashman [Fri, 13 Jun 2014 22:30:57 +0000 (15:30 -0700)]
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
dcashman [Mon, 16 Jun 2014 17:14:47 +0000 (17:14 +0000)]
Merge "Allow all domains access to /dev/qemu_trace."
Ying Wang [Mon, 16 Jun 2014 16:22:47 +0000 (16:22 +0000)]
Merge "Trim down BUILD_FINGERPRINT."
Ying Wang [Fri, 13 Jun 2014 01:42:53 +0000 (18:42 -0700)]
Trim down BUILD_FINGERPRINT.
Bug:
15593959
Change-Id: I90161045b5d5f2df726a4f69740f0875c8bfc69f
Elliott Hughes [Thu, 12 Jun 2014 23:53:57 +0000 (23:53 +0000)]
am
624220c1: Merge "Remove useless stuff from "AndroidConfig.h"."
* commit '
624220c18a6fd4cabbc75344248eb770985df93c':
Remove useless stuff from "AndroidConfig.h".
Nick Kralevich [Thu, 12 Jun 2014 21:03:37 +0000 (21:03 +0000)]
am
c80e876c: Merge "Add service_contexts to embedded.mk."
* commit '
c80e876cd2eab6452313a98c6ddeca403510784c':
Add service_contexts to embedded.mk.
Nick Kralevich [Thu, 12 Jun 2014 21:00:30 +0000 (21:00 +0000)]
Merge "Add service_contexts to embedded.mk."
Riley Spahn [Tue, 10 Jun 2014 00:24:18 +0000 (17:24 -0700)]
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
Elliott Hughes [Thu, 12 Jun 2014 23:51:42 +0000 (23:51 +0000)]
Merge "Remove useless stuff from "AndroidConfig.h"."
Elliott Hughes [Thu, 12 Jun 2014 22:17:31 +0000 (15:17 -0700)]
Remove useless stuff from "AndroidConfig.h".
The futex wrappers and memcmp16 are no longer available to anyone.
No one was checking for the existence of the SA_NOCLDWAIT constant,
and even if they wanted to, they could just check directly.
Change-Id: If8ac6c2617b76b23a2450f58fc03453f7f82a61f
Ying Wang [Wed, 11 Jun 2014 17:02:27 +0000 (17:02 +0000)]
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
Ying Wang [Wed, 11 Jun 2014 02:27:44 +0000 (02:27 +0000)]
am
cc2a47bf: Merge "Check existence of both 64-bit and 32-bit module variants."
* commit '
cc2a47bf64b87f228b10c8f83b1575eee2aa1e76':
Check existence of both 64-bit and 32-bit module variants.
Ying Wang [Wed, 11 Jun 2014 01:15:43 +0000 (01:15 +0000)]
am
b2ba5636: Merge "Revert "Don\'t rename host libraries if only one arch is build.""
* commit '
b2ba5636f187e7d2f3d2f0497bfaca68c5c7b06c':
Revert "Don't rename host libraries if only one arch is build."
Ying Wang [Wed, 11 Jun 2014 01:07:14 +0000 (01:07 +0000)]
am
c34f37c7: Merge "Allow to opt out both multilib in native test."
* commit '
c34f37c7b5d26e58a9666fc277379111a7c2ea4f':
Allow to opt out both multilib in native test.
Ying Wang [Wed, 11 Jun 2014 00:24:10 +0000 (00:24 +0000)]
am
cec9dc14: Merge "Don\'t rename host libraries if only one arch is build."
* commit '
cec9dc14185dd1df6704a4af226ffbb2a1b9cd87':
Don't rename host libraries if only one arch is build.
Ying Wang [Tue, 10 Jun 2014 23:28:52 +0000 (23:28 +0000)]
am
a45a5d27: Merge "Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn\'t restricted"
* commit '
a45a5d27972070895001571b7912655b0bd0931c':
Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted
Ying Wang [Tue, 10 Jun 2014 22:25:53 +0000 (22:25 +0000)]
am
02f98a26: Merge "Fix loophole in module expansion."
* commit '
02f98a26c9e305077f11a5e2f81494dd3a0a2a2c':
Fix loophole in module expansion.
Ying Wang [Wed, 11 Jun 2014 02:25:43 +0000 (02:25 +0000)]
Merge "Check existence of both 64-bit and 32-bit module variants."
Ying Wang [Wed, 11 Jun 2014 02:23:29 +0000 (19:23 -0700)]
Check existence of both 64-bit and 32-bit module variants.
- Do the module name resolving for both host and target modules.
- Check existence of both 64-bit and 32-bit module variants.
Change-Id: I8ada0e734efac6c8dafade8708fff9797b19a78d
Ying Wang [Wed, 11 Jun 2014 16:59:50 +0000 (16:59 +0000)]
Merge "AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15"
Ying Wang [Wed, 11 Jun 2014 01:03:22 +0000 (01:03 +0000)]
Merge "Allow to opt out both multilib in native test."
Ying Wang [Wed, 11 Jun 2014 00:52:20 +0000 (17:52 -0700)]
Allow to opt out both multilib in native test.
This fixes error no 64-bit libdvm for dalvik-vm-unit-tests.
Change-Id: Ieb21b3b636facbff32c62bca8bba1df6d21377c6
Ying Wang [Wed, 11 Jun 2014 00:21:04 +0000 (00:21 +0000)]
Merge "Don't rename host libraries if only one arch is build."
Ying Wang [Wed, 11 Jun 2014 00:18:08 +0000 (17:18 -0700)]
Don't rename host libraries if only one arch is build.
This makes it simpler to reference normal host modules by just their
original names even if they are built for the 2nd arch.
Change-Id: I49d32dad0dc523c458d5f9176993037d8695e6a5
Ying Wang [Tue, 10 Jun 2014 23:25:38 +0000 (23:25 +0000)]
Merge "Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted"
Ying Wang [Tue, 10 Jun 2014 23:21:50 +0000 (16:21 -0700)]
Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted
Otherwise we may end up conflict between LOCAL_MODULE_HOST_ARCH and the
default multilib mode.
Also removed the unneeded variants of LOCAL_MODULE_HOST_ARCH.
Change-Id: I9e5a0144da3cb6310be0ddf098738987e51305de
Ying Wang [Wed, 11 Jun 2014 01:12:28 +0000 (01:12 +0000)]
Merge "Revert "Don't rename host libraries if only one arch is build.""
Ying Wang [Wed, 11 Jun 2014 01:12:18 +0000 (01:12 +0000)]
Revert "Don't rename host libraries if only one arch is build."
This reverts commit
b1f7fb7a508bb6b093c8b37d65adc9a5a0836e6e.
Change-Id: Id7ea4803ab52659c1316ea9f1babf8117b667441
Ying Wang [Tue, 10 Jun 2014 22:18:55 +0000 (22:18 +0000)]
Merge "Fix loophole in module expansion."
Ying Wang [Tue, 10 Jun 2014 21:21:20 +0000 (14:21 -0700)]
Fix loophole in module expansion.
Previously we only expanded product_MODULES with LOCAL_REQUIRED_MODULES,
but not modules introduced by LOCAL_SHARED_LIBRARIES; Later we did a further
shared libary expansion in vendor_module_check.mk.
It couldn't track C in the following case:
A : B, by LOCAL_SHARED_LIBRARIES; B : C, by LOCAL_REQUIRED_MODULES.
With this change, we transformed the LOCAL_SHARED_LIBRARIES dependencies
into LOCAL_REQUIRED_MODULES dependencies before doing the required
module expansion and the loophole is closed.
All module names are now expanded to product_MODULES now and it makes
vendor_module_check.mk simpler.
Change-Id: I8835a478d2ce0ce10601a8449f446f07b01c2b7f
Ying Wang [Tue, 10 Jun 2014 20:33:04 +0000 (20:33 +0000)]
am
6cc4598d: Merge "Add global variable HOST_LIBRARY_PATH."
* commit '
6cc4598d18c660d4e253970bc875be5fa08c770b':
Add global variable HOST_LIBRARY_PATH.
Ying Wang [Tue, 10 Jun 2014 20:31:23 +0000 (20:31 +0000)]
Merge "Add global variable HOST_LIBRARY_PATH."
Elliott Hughes [Tue, 10 Jun 2014 19:25:57 +0000 (19:25 +0000)]
am
47cdacd5: Merge "Remove libportable from core_base.mk."
* commit '
47cdacd5e633c8256a5dd32c769b5469882fc0aa':
Remove libportable from core_base.mk.
Elliott Hughes [Tue, 10 Jun 2014 19:23:53 +0000 (19:23 +0000)]
Merge "Remove libportable from core_base.mk."
Elliott Hughes [Tue, 10 Jun 2014 19:19:01 +0000 (12:19 -0700)]
Remove libportable from core_base.mk.
Change-Id: I3fae0625c68db885bd2fba502d31fe3c524d4f47
Ying Wang [Tue, 10 Jun 2014 19:04:56 +0000 (12:04 -0700)]
Add global variable HOST_LIBRARY_PATH.
With multilib host build, the build system installs host
shared libraries to different directories depending on a
library's bitness:
- HOST_OUT_SHARED_LIBRARIES points to the library path of 64-bit;
- 2ND_HOST_OUT_SHARED_LIBRARIES points to the library path of 32-bit;
- If you don't care the bitness of the libraries and just want whatever
version the librareies are built by default, use HOST_LIBRARY_PATH.
Bug:
13751317
Change-Id:Id4c818941dc4ea35d795767c76f698529bd6aebb
Ying Wang [Tue, 10 Jun 2014 16:31:39 +0000 (16:31 +0000)]
am
c3838620: Merge "Switch to 32-bit-by-default host multilib build."
* commit '
c383862020034b3db4e365aaf501a84a35e85ffe':
Switch to 32-bit-by-default host multilib build.
Ying Wang [Tue, 10 Jun 2014 16:26:42 +0000 (16:26 +0000)]
Merge "Switch to 32-bit-by-default host multilib build."
Ying Wang [Mon, 9 Jun 2014 19:31:12 +0000 (12:31 -0700)]
Switch to 32-bit-by-default host multilib build.
Also we don't need to force LLVM built from source, for we already force
LLVM to be built as 32-bit.
Bug:
13751317
Change-Id: Ifadf1988d28b60cb06316de50f5bdc1834f1acc0
Ying Wang [Mon, 9 Jun 2014 22:57:48 +0000 (22:57 +0000)]
am
c0275247: Merge "build native tests for 32-bit and 64-bit"
* commit '
c02752473f958cb1b23ca2f7d3fd1973b665e3c4':
build native tests for 32-bit and 64-bit
Ying Wang [Mon, 9 Jun 2014 22:52:59 +0000 (22:52 +0000)]
Merge "build native tests for 32-bit and 64-bit"
Ying Wang [Mon, 9 Jun 2014 21:47:40 +0000 (21:47 +0000)]
am
5ad17493: Merge "Support .asm being compiled by yasm targeted for x86."
* commit '
5ad17493cdb329087459ef7cddaed20cb1bba707':
Support .asm being compiled by yasm targeted for x86.
Ying Wang [Mon, 9 Jun 2014 21:43:56 +0000 (21:43 +0000)]
Merge "Support .asm being compiled by yasm targeted for x86."
Stephen Hines [Fri, 6 Jun 2014 21:17:40 +0000 (21:17 +0000)]
am
1a8f0d3b: Merge "Move comment out of recipe section"
* commit '
1a8f0d3b6dc316034e1e3b28702fead4108ec8d3':
Move comment out of recipe section
Stephen Hines [Fri, 6 Jun 2014 21:07:24 +0000 (21:07 +0000)]
Merge "Move comment out of recipe section"
Stephen Hines [Fri, 6 Jun 2014 19:51:47 +0000 (12:51 -0700)]
Move comment out of recipe section
If we keep a comment in the recipe, it prints out whenever that component
gets built.
Change-Id: Idb99a9edc02cfb87e35e59b7fd37588b928b98a5
Ying Wang [Fri, 6 Jun 2014 18:24:31 +0000 (18:24 +0000)]
am
d0f0918b: Merge "Reenable ccache."
* commit '
d0f0918b8fa2a1794050a3cecf3ad3943ad378ab':
Reenable ccache.
Ying Wang [Fri, 6 Jun 2014 18:21:09 +0000 (18:21 +0000)]
Merge "Reenable ccache."
Ying Wang [Fri, 6 Jun 2014 18:17:34 +0000 (11:17 -0700)]
Reenable ccache.
The previous commit
994c84fb virtually disabled ccache, due to the
deferred evaluation of CC_WRAPPER/CXX_WRAPPER.
Change-Id: Ie0d70a23a55190bd9b24b72edc9158b6976e1d5d
Ying Wang [Fri, 6 Jun 2014 02:05:47 +0000 (19:05 -0700)]
Support .asm being compiled by yasm targeted for x86.
Change-Id: Icd6626a082facf920b0e49e2fbe8861e94400552
Tim Murray [Wed, 4 Jun 2014 19:05:45 +0000 (19:05 +0000)]
am
e564c0cb: Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools."
* commit '
e564c0cbd08c728d84e62308c741b30f3bd542f8':
Switch name from tblgen -> llvm-tblgen for consistency with upstream tools.
Tim Murray [Wed, 4 Jun 2014 19:00:38 +0000 (19:00 +0000)]
Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools."
Qiwen Zhao [Wed, 4 Jun 2014 18:27:18 +0000 (18:27 +0000)]
am
e8e7ebbd: (-s ours) Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
* commit '
e8e7ebbde46df2a4dafc4c90a53abd911d1255ec':
Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
Qiwen Zhao [Wed, 4 Jun 2014 18:21:21 +0000 (11:21 -0700)]
Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
This reverts commit
a5abefbbb527490dd76e34780dc2bfc6ed6a437d.
Qiwen Zhao [Wed, 4 Jun 2014 17:12:13 +0000 (17:12 +0000)]
am
a5abefbb: (-s ours) Revert "DO NOT MERGE: Combine emulator test projects into a single apk"
* commit '
a5abefbbb527490dd76e34780dc2bfc6ed6a437d':
Revert "DO NOT MERGE: Combine emulator test projects into a single apk"
Qiwen Zhao [Wed, 4 Jun 2014 17:02:29 +0000 (10:02 -0700)]
Revert "DO NOT MERGE: Combine emulator test projects into a single apk"
This reverts commit
0ced06ea0f20cf8bd6a1a2b2e34531f04f621c00.
Steve Moyer [Wed, 4 Jun 2014 16:55:53 +0000 (16:55 +0000)]
am
37773821: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk
* commit '
37773821f150778c48ef3519407d8ee71dd66a30':
DO NOT MERGE: Combine emulator test projects into a single apk
Steve Moyer [Wed, 4 Jun 2014 16:55:52 +0000 (16:55 +0000)]
am
008dc16c: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk
* commit '
008dc16cb06976620c0fa1e51942f2d1c6af54f3':
DO NOT MERGE: Combine emulator test projects into a single apk
Steve Moyer [Fri, 7 Feb 2014 19:46:08 +0000 (11:46 -0800)]
DO NOT MERGE: Combine emulator test projects into a single apk
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests
Conflicts:
target/product/sdk.mk
Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
Steve Moyer [Fri, 7 Feb 2014 19:46:08 +0000 (11:46 -0800)]
DO NOT MERGE: Combine emulator test projects into a single apk
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests
Conflicts:
target/product/sdk.mk
Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
Serban Constantinescu [Thu, 29 May 2014 16:41:03 +0000 (17:41 +0100)]
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>
Stephen Hines [Wed, 4 Jun 2014 01:28:44 +0000 (18:28 -0700)]
Switch name from tblgen -> llvm-tblgen for consistency with upstream tools.
Change-Id: I7735fd88104ff95001dd5f88a1c387df9af993ad
Primiano Tucci [Tue, 3 Jun 2014 09:29:50 +0000 (09:29 +0000)]
Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler."
Ying Wang [Tue, 3 Jun 2014 01:22:51 +0000 (01:22 +0000)]
am
40b7e342: Merge "Move sdk staging dir to a product-specific dir"
* commit '
40b7e34240be756bbf1542b63eef6332024d067e':
Move sdk staging dir to a product-specific dir
Ying Wang [Tue, 3 Jun 2014 01:20:29 +0000 (01:20 +0000)]
Merge "Move sdk staging dir to a product-specific dir"
Ying Wang [Mon, 2 Jun 2014 23:16:53 +0000 (16:16 -0700)]
Move sdk staging dir to a product-specific dir
So we can do incremental build across different SDK products.
Change-Id: If3f082e4b92d00e7ccda980610e1d967d44da622
Nick Kralevich [Mon, 2 Jun 2014 19:25:21 +0000 (19:25 +0000)]
am
c706ea79: Merge "Include selinux_version file with builds."
* commit '
c706ea79629792f4432774643887f5681e8f145d':
Include selinux_version file with builds.
Nick Kralevich [Mon, 2 Jun 2014 19:23:11 +0000 (19:23 +0000)]
Merge "Include selinux_version file with builds."
Primiano Tucci [Mon, 2 Jun 2014 16:37:38 +0000 (17:37 +0100)]
Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler.
This is to make it possible to wrap the compiler invocations with
custom wrappers (e.g., distcc/goma) by setting the CC_WRAPPER,
CXX_WRAPPER, JAVAC_WRAPPER variables in the build environment (without
having to know in advance the path to the compiler)
Change-Id: Ide800c24f0c2ebbb1cfb358bd8f99ec8a9d41253
Stephen Hines [Fri, 30 May 2014 23:04:37 +0000 (23:04 +0000)]
am
a8b65126: Merge "Add -shared to clang LDFLAGS."
* commit '
a8b65126cae5335d4c8b31fbf7700907fd2c48dd':
Add -shared to clang LDFLAGS.
Stephen Hines [Fri, 30 May 2014 22:59:48 +0000 (22:59 +0000)]
Merge "Add -shared to clang LDFLAGS."
Nick Kralevich [Fri, 30 May 2014 22:56:11 +0000 (22:56 +0000)]
am
a42e0f50: Merge "arm64: restore relro/now"
* commit '
a42e0f50162721bc54c113ef1ed3058cfb38ae67':
arm64: restore relro/now
Nick Kralevich [Fri, 30 May 2014 22:52:34 +0000 (22:52 +0000)]
Merge "arm64: restore relro/now"
Nick Kralevich [Fri, 30 May 2014 22:45:24 +0000 (15:45 -0700)]
arm64: restore relro/now
The bug which required this option has been fixed.
Bug:
11434996
Change-Id: I7ab7e2e8ba7b993281902832d01b3ee3ba9e06ef
Nick Kralevich [Fri, 30 May 2014 18:23:41 +0000 (18:23 +0000)]
am
61cf065a: Merge "Use a separate policy for the recovery image."
* commit '
61cf065ae9247a200208dc7df0234e03caff3605':
Use a separate policy for the recovery image.
Nick Kralevich [Fri, 30 May 2014 18:20:48 +0000 (18:20 +0000)]
Merge "Use a separate policy for the recovery image."
Andrew Hsieh [Fri, 30 May 2014 07:46:14 +0000 (07:46 +0000)]
am
5c2c70de: Merge "Add -latomic to all target builds"
* commit '
5c2c70de88a6c126460c88cfa64561d7cb2cc030':
Add -latomic to all target builds
Andrew Hsieh [Fri, 30 May 2014 07:44:00 +0000 (07:44 +0000)]
Merge "Add -latomic to all target builds"
Tim Murray [Thu, 29 May 2014 22:10:44 +0000 (15:10 -0700)]
Add -shared to clang LDFLAGS.
TOT clang doesn't do the right thing with regards to -pie without this.
Change-Id: Ic14cfb25d96359eb18899c09ebaf1d311e937d01
Stephen Smalley [Thu, 29 May 2014 20:41:03 +0000 (16:41 -0400)]
Use a separate policy for the recovery image.
Only the recovery image needs to include the recovery domain
in its policy, so create a separate policy for the recovery image
and replace the root policy with this one when building the
recovery image.
Depends on the change with the same Change-Id in external/sepolicy.
Change-Id: I444107f9821eabf4164ba07a44d03bd71e719989
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Dave Allison [Thu, 29 May 2014 19:57:50 +0000 (19:57 +0000)]
am
2a2ba735: Merge "Add libsigchain to the embedded.mk makefile"
* commit '
2a2ba735df028a6168368a399b6df27a6ec33fa4':
Add libsigchain to the embedded.mk makefile
Dave Allison [Thu, 29 May 2014 19:51:50 +0000 (19:51 +0000)]
Merge "Add libsigchain to the embedded.mk makefile"
Brian Carlstrom [Thu, 29 May 2014 19:40:02 +0000 (19:40 +0000)]
am
e0df9d95: Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"
* commit '
e0df9d9577c19975adbf6e5a3489946c8f91ad1e':
Only enable WITH_DEXPREOPT by default for libdvm.so
Brian Carlstrom [Thu, 29 May 2014 19:39:49 +0000 (19:39 +0000)]
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
Brian Carlstrom [Thu, 29 May 2014 19:36:37 +0000 (19:36 +0000)]
Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"
Brian Carlstrom [Thu, 29 May 2014 19:36:35 +0000 (19:36 +0000)]
Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
Andrew Hsieh [Thu, 29 May 2014 09:47:27 +0000 (02:47 -0700)]
Add -latomic to all target builds
Projects using stdatomic.h needs libatomic.a in case compiler can't
expand all __atomic* intrinsics. eg, __atomic_is_lock_free in
armeabi/mips.
Adding libatomic.a globally makes more sense than adding
"LOCAL_LDLIB += -latomic " in each project including <stdatomic.h>.
Projects don't need atomic operations won't get redundant DT_NEEDED
entry because libatomic.a is not a shared library.
Change-Id: I81dbf524544c848e667e18ab5eeabff75b5063ef
Brian Carlstrom [Thu, 29 May 2014 05:13:07 +0000 (22:13 -0700)]
Only enable WITH_DEXPREOPT by default for libdvm.so
Bug:
14298175
(cherry picked from commit
9f8e214a919097284a88cb19a1b85ceafc202a67)
Change-Id: I96ba4e198b7bc1b7d9a502c432590f41c87d05c4
Brian Carlstrom [Thu, 29 May 2014 04:27:47 +0000 (21:27 -0700)]
Remove dependencies on runtime_libdvm and libdvm.so in general
Bug:
14298175
(cherry picked from commit
bf8a374a92e327efed95892fe67e6917a89c6c2b)
Change-Id: I183d1ff078a54c422305d8798ea200855265ebb6
Ying Wang [Wed, 28 May 2014 23:38:46 +0000 (23:38 +0000)]
am
b3bed595: Merge "Add a dummy build recipe for generated RS cpp files."
* commit '
b3bed5952b44e69dc9e1988beb4092303084ef61':
Add a dummy build recipe for generated RS cpp files.
Ying Wang [Wed, 28 May 2014 23:33:35 +0000 (23:33 +0000)]
Merge "Add a dummy build recipe for generated RS cpp files."
Ying Wang [Wed, 28 May 2014 23:28:58 +0000 (23:28 +0000)]
am
65afd710: Merge "Add a dummy build recipe for the proto generated header files"
* commit '
65afd710a592390671beb5da15a87b127a5f2125':
Add a dummy build recipe for the proto generated header files
Ying Wang [Wed, 28 May 2014 23:26:01 +0000 (23:26 +0000)]
Merge "Add a dummy build recipe for the proto generated header files"
Ying Wang [Wed, 28 May 2014 23:17:09 +0000 (16:17 -0700)]
Add a dummy build recipe for generated RS cpp files.
Previously the RS cpp files are generated by the timestamp rule. Though
we have the generated RS cpp files depend on the timestamp file, we
don't have a build recipe. In such case gmake does some "optimization"
that it skip recompiling the generated cpp files, because it assumes the
generated cpp files are already up to date even if the rs files have
been updated.
Bug:
15313144
Change-Id: Ie69ecd2c788057d3619f9c7d2a125d44c4a534a1
Ying Wang [Fri, 14 Feb 2014 02:04:00 +0000 (18:04 -0800)]
Add a dummy build recipe for the proto generated header files
This fixed issue that gnumake skip updating the cpp file that includes
the generated header file when the .proto file gets updated.
For example:
Say a.cc includes b.pb.h, since b.pb.h is just byproduct of the rule
that generates b.pb.cc, and though we have dependency "b.pb.h :
b.pb.cc", but we don't have build recipe for that rule.
Gmake stupidly thinks that b.pb.h must not be updated in that case so
it skips all targets that depends on b.pb.h!
With the dumy build recipe, gmake now doesn't skip the depedent targets.
Bug:
13009798
Change-Id: I39adc09b7656bdd023f578fb8933667944fd974c