OSDN Git Service
JP Abgrall [Thu, 27 Feb 2014 18:09:15 +0000 (18:09 +0000)]
am
a0bea538: (-s ours) am
031bff45: (-s ours) Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"
* commit '
a0bea538ae0511a24202d6b952b7e7bb8a606ac8':
DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
JP Abgrall [Thu, 27 Feb 2014 18:07:00 +0000 (10:07 -0800)]
am
031bff45: (-s ours) Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"
* commit '
031bff45d051b0cdfcfdca4e35a3ab213e105fce':
DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
JP Abgrall [Thu, 27 Feb 2014 18:04:35 +0000 (18:04 +0000)]
Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"
Ying Wang [Thu, 27 Feb 2014 17:24:45 +0000 (17:24 +0000)]
am
a90e346c: am
cd07521f: Merge "Revert "generic_x86: toggle 64bit binder ABI""
* commit '
a90e346c24d498af57360bd92ff738a1480f0598':
Revert "generic_x86: toggle 64bit binder ABI"
Ying Wang [Thu, 27 Feb 2014 17:22:03 +0000 (09:22 -0800)]
am
cd07521f: Merge "Revert "generic_x86: toggle 64bit binder ABI""
* commit '
cd07521f464985373fc4fe13812b5f465373bda5':
Revert "generic_x86: toggle 64bit binder ABI"
Ying Wang [Thu, 27 Feb 2014 17:19:33 +0000 (17:19 +0000)]
Merge "Revert "generic_x86: toggle 64bit binder ABI""
Ying Wang [Thu, 27 Feb 2014 17:19:13 +0000 (17:19 +0000)]
Revert "generic_x86: toggle 64bit binder ABI"
This reverts commit
e2525ade32afa72c0e4fe12fc8fab939e41782e6.
Change-Id: Ibaec151084ce4f00194a5a22c4be7531710b4a9f
Mark Salyzyn [Thu, 27 Feb 2014 16:26:54 +0000 (16:26 +0000)]
am
4c65c202: am
7fc3a06d: Merge "build: add logd"
* commit '
4c65c202355572f22b3cb48babf0436098807dc7':
build: add logd
Mark Salyzyn [Thu, 27 Feb 2014 16:21:08 +0000 (08:21 -0800)]
am
7fc3a06d: Merge "build: add logd"
* commit '
7fc3a06d7fe307332e808712fc8d02c3ed995f80':
build: add logd
Mark Salyzyn [Thu, 27 Feb 2014 16:03:57 +0000 (16:03 +0000)]
Merge "build: add logd"
JP Abgrall [Thu, 27 Feb 2014 04:05:14 +0000 (04:05 +0000)]
DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
This enables tcpdump for 64bit builds.
This reverts commit
24f99bd4b354789d7368cdee0c924e79e0a1517d.
Change-Id: Ic1413b2f3f66cedbe756d73656c90b3177ba66c0
JP Abgrall [Thu, 27 Feb 2014 02:21:22 +0000 (02:21 +0000)]
am
24bbd72d: (-s ours) am
5d0dd222: (-s ours) Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad"
* commit '
24bbd72d694083c0cb51fdf719ba079080f31b62':
DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
JP Abgrall [Thu, 27 Feb 2014 02:19:23 +0000 (18:19 -0800)]
am
5d0dd222: (-s ours) Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad"
* commit '
5d0dd222cef421d5f5bbde0bed3d898e9ca505f1':
DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
JP Abgrall [Thu, 27 Feb 2014 02:17:11 +0000 (02:17 +0000)]
Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad"
Ying Wang [Thu, 27 Feb 2014 01:30:08 +0000 (01:30 +0000)]
am
66a9b789: Merge "Include privileged apps with app zip file."
* commit '
66a9b789703b7fac5f57fa318209dc8211f800f7':
Include privileged apps with app zip file.
JP Abgrall [Wed, 26 Feb 2014 22:59:40 +0000 (22:59 +0000)]
DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
This is until aosp gets the latest libpcap+tcpdump currently only on internal.
This reverts commit
5c68e265ac2bfeb881f9cc87c50f8b947ddbd86c.
Change-Id: If6a990c72cb3a8d699cf0881f7d5fb8b725fdf2e
Ying Wang [Thu, 27 Feb 2014 01:25:13 +0000 (01:25 +0000)]
Merge "Include privileged apps with app zip file."
Nick Kralevich [Tue, 17 Jan 2012 21:48:32 +0000 (13:48 -0800)]
build: add logd
Original-Change-Id: I1b96d7e6dd823a83b07b312bf07792482e883789
Signed-off-by: Nick Kralevich <nnk@google.com>
* merge conflicts
* rename syslog to logd to avert confusion with bionic syslog
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Change-Id: I137fb639a80dd28d2f0042b3ae9b7d6eb5eb5bc4
Ying Wang [Wed, 26 Feb 2014 22:31:09 +0000 (22:31 +0000)]
am
9aa715a5: Merge "Remove external/tcpdump from 64-bit build blacklist."
* commit '
9aa715a579765edf0fd4cf2fa0c0146e1b6a7c3b':
Remove external/tcpdump from 64-bit build blacklist.
Nick Kralevich [Wed, 26 Feb 2014 22:31:01 +0000 (22:31 +0000)]
am
9edc9783: Merge "Add policy for MIPS emulator, fix x86 policy."
* commit '
9edc9783d21f59bc532e2b7b62ae2464ee976438':
Add policy for MIPS emulator, fix x86 policy.
Ying Wang [Wed, 26 Feb 2014 22:23:46 +0000 (22:23 +0000)]
Merge "Remove external/tcpdump from 64-bit build blacklist."
Ying Wang [Wed, 26 Feb 2014 22:18:21 +0000 (14:18 -0800)]
Remove external/tcpdump from 64-bit build blacklist.
Change-Id: I40b0c71120a5548072ecb2e552bdbd8c14283097
Nick Kralevich [Wed, 26 Feb 2014 21:37:29 +0000 (21:37 +0000)]
Merge "Add policy for MIPS emulator, fix x86 policy."
Ying Wang [Wed, 26 Feb 2014 20:06:26 +0000 (20:06 +0000)]
am
bbe5f88e: Merge "Conditionally include the \'samplecode\' rules."
* commit '
bbe5f88e1df32d1c998b424eb05ab99cc35c1e8b':
Conditionally include the 'samplecode' rules.
Ying Wang [Wed, 26 Feb 2014 19:58:58 +0000 (19:58 +0000)]
Merge "Conditionally include the 'samplecode' rules."
Ying Wang [Wed, 26 Feb 2014 19:55:38 +0000 (11:55 -0800)]
Conditionally include the 'samplecode' rules.
Not sure goal 'samplecode' is still used by anybody these days.
Change-Id: I808a021a6e4be6a97c4b5c256b94374c1b3dae47
Robert Craig [Wed, 26 Feb 2014 16:48:20 +0000 (11:48 -0500)]
Include privileged apps with app zip file.
Include apps that appear under /system/priv-app
to also be included with the zip of all the apps.
Change-Id: If4687cf4c471877f11d78b68bad96f1842e49d87
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Stephen Smalley [Wed, 26 Feb 2014 13:49:39 +0000 (08:49 -0500)]
Add policy for MIPS emulator, fix x86 policy.
The qemud and /dev/qemu_pipe policy bits copied to generic
and generic_x86 by I620d4aef84a5d4565abb1695db54ce1653612bce
are required for generic_mips as well. In testing, we
further saw other denials for generic_mips that correspond
exactly to what is already allowed in the generic sepolicy, so
just inherit the sepolicy files from generic for now.
We could do likewise for the generic_x86 sepolicy for the files that are
identical with generic if desired, but that is not done by this change.
The generic_x86 sepolicy was missing a rule for /sys/qemu_trace
moved to the generic sepolicy by the prior change, so fix that omission.
The generic*64 variants will need something similar, either by inheriting
from one of the existing sepolicy directories as in the MIPS
case or by forking their own copies as in the x86 case.
Change-Id: Iec7c8825734a3f96f7db8ae1d10dce1f30b22bdf
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Torne (Richard Coles) [Wed, 26 Feb 2014 11:09:29 +0000 (11:09 +0000)]
am
63002088: Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."
* commit '
630020883abc6c8b2c13876e3195ed6abcf4890f':
Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS.
Torne (Richard Coles) [Wed, 26 Feb 2014 11:04:03 +0000 (11:04 +0000)]
Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."
Ying Wang [Wed, 26 Feb 2014 02:38:31 +0000 (02:38 +0000)]
am
66331624: Merge "Fix prebuilt library dependency for multilib build"
* commit '
66331624b5422a608607a9924f174ba533573032':
Fix prebuilt library dependency for multilib build
Ying Wang [Wed, 26 Feb 2014 02:33:30 +0000 (02:33 +0000)]
Merge "Fix prebuilt library dependency for multilib build"
Ying Wang [Wed, 26 Feb 2014 02:26:29 +0000 (18:26 -0800)]
Fix prebuilt library dependency for multilib build
Also we don't need to include module_arch_supported.mk again, if we are
currently substituting the source build with LOCAL_PREBUILT_MODULE_FILE.
Change-Id: I444b0397d74c3153b398a050b762e49418062a86
Elliott Hughes [Wed, 26 Feb 2014 02:07:18 +0000 (02:07 +0000)]
am
9dba192b: Merge "oprofile/daemon doesn\'t build for x86_64."
* commit '
9dba192b76ee75c578a62dcef0160fc719a57914':
oprofile/daemon doesn't build for x86_64.
Elliott Hughes [Wed, 26 Feb 2014 02:02:30 +0000 (02:02 +0000)]
Merge "oprofile/daemon doesn't build for x86_64."
Ying Wang [Wed, 26 Feb 2014 01:37:45 +0000 (17:37 -0800)]
resolved conflicts for merge of
9057f619 to klp-modular-dev-plus-aosp
Change-Id: Ie8b363ede2a062a34962f9111b79df1ebc674c9e
Elliott Hughes [Wed, 26 Feb 2014 01:32:22 +0000 (17:32 -0800)]
oprofile/daemon doesn't build for x86_64.
We'll probably remove external/oprofile soon, but this gets us closer
to being able to turn on an x86_64 continuous build in the meantime.
Change-Id: Ic1d5331d41dafee9ffed222dc332afed2d4ae356
Ying Wang [Wed, 26 Feb 2014 01:21:11 +0000 (01:21 +0000)]
Merge "Remove external/wpa_supplicant_8 and external/android-clat"
Ying Wang [Wed, 26 Feb 2014 01:15:47 +0000 (17:15 -0800)]
Remove external/wpa_supplicant_8 and external/android-clat
from 64_bit_blacklist.mk.
They now build fine for 64-bit.
Change-Id: Ib73c8465b72cc7b40dae21441c3ea0bd25b7e6ba
Elliott Hughes [Wed, 26 Feb 2014 00:22:49 +0000 (00:22 +0000)]
am
25b55485: Merge "Take libcore off the LP64 blacklist."
* commit '
25b5548522220940f50ab5b4dfb3e2e691ad913b':
Take libcore off the LP64 blacklist.
Ying Wang [Wed, 26 Feb 2014 00:18:21 +0000 (00:18 +0000)]
am
f1ff3abd: Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir"
* commit '
f1ff3abd83cbc9884082c09bb9b1d4a5080134c1':
Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir
Elliott Hughes [Wed, 26 Feb 2014 00:18:04 +0000 (00:18 +0000)]
Merge "Take libcore off the LP64 blacklist."
Ying Wang [Wed, 26 Feb 2014 00:13:01 +0000 (00:13 +0000)]
Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir"
Ying Wang [Tue, 25 Feb 2014 19:18:40 +0000 (11:18 -0800)]
Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir
So a library can export the proto's include path that can be used with
both archs in multilib build.
Change-Id: Ia0f92f0b40e39dc3fa426c69c52139a0a8f04077
Elliott Hughes [Tue, 25 Feb 2014 23:54:26 +0000 (15:54 -0800)]
Take libcore off the LP64 blacklist.
Change-Id: I34bc49370ecdd37f83927c3829c775e404bcbd73
Nick Kralevich [Tue, 25 Feb 2014 21:58:45 +0000 (21:58 +0000)]
am
e7154870: Merge "Move qemud and /dev/qemu policy bits to emulator-specific sepolicy."
* commit '
e715487031036ecc75bfedb94b2d6c9dbd3bc98d':
Move qemud and /dev/qemu policy bits to emulator-specific sepolicy.
Nick Kralevich [Tue, 25 Feb 2014 21:54:39 +0000 (21:54 +0000)]
Merge "Move qemud and /dev/qemu policy bits to emulator-specific sepolicy."
Stephen Smalley [Tue, 25 Feb 2014 18:37:06 +0000 (13:37 -0500)]
Move qemud and /dev/qemu policy bits to emulator-specific sepolicy.
Change-Id: I620d4aef84a5d4565abb1695db54ce1653612bce
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Torne (Richard Coles) [Wed, 12 Feb 2014 14:24:41 +0000 (14:24 +0000)]
Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS.
For host executables and shared libraries, the global LDFLAGS were being
inserted into the linker command line after the module-specific ones,
making it impossible to override the default settings. Change the order
to match target linker invocations.
Change-Id: Icd5f6f83df9f27a5be97ddb197ee245c1ab8c2be
Ying Wang [Mon, 24 Feb 2014 18:10:29 +0000 (18:10 +0000)]
am
0e0c4879: Merge "generic_x86: toggle 64bit binder ABI"
* commit '
0e0c48796d9d0ebe415b1ccc9f67ae95f9c716c9':
generic_x86: toggle 64bit binder ABI
Ying Wang [Mon, 24 Feb 2014 18:05:33 +0000 (18:05 +0000)]
Merge "generic_x86: toggle 64bit binder ABI"
Ying Wang [Sat, 22 Feb 2014 00:45:52 +0000 (00:45 +0000)]
am
eb9b62e0: Merge "Make -rpath-link work with multilib."
* commit '
eb9b62e08d25ec9067a3f47634a2b8cf750230d8':
Make -rpath-link work with multilib.
Tim Murray [Sat, 22 Feb 2014 00:41:28 +0000 (00:41 +0000)]
am
254a88b9: Merge "Switch to LLVM 3.4 prebuilts in AOSP."
* commit '
254a88b9578883f3138be6991c7bcdb8393af188':
Switch to LLVM 3.4 prebuilts in AOSP.
Ying Wang [Sat, 22 Feb 2014 00:38:43 +0000 (00:38 +0000)]
Merge "Make -rpath-link work with multilib."
Ying Wang [Sat, 22 Feb 2014 00:17:05 +0000 (16:17 -0800)]
Make -rpath-link work with multilib.
Change-Id: If69ea6ed6cdbb657ed4005f8217d653e29626783
Tim Murray [Fri, 21 Feb 2014 21:52:15 +0000 (21:52 +0000)]
Merge "Switch to LLVM 3.4 prebuilts in AOSP."
Colin Cross [Thu, 20 Feb 2014 22:55:24 +0000 (22:55 +0000)]
am
b3bc6136: Merge "arm64: don\'t build emulator"
* commit '
b3bc61365bb71cc45d10c22762aa86a3b78f1329':
arm64: don't build emulator
Colin Cross [Thu, 20 Feb 2014 22:49:32 +0000 (22:49 +0000)]
Merge "arm64: don't build emulator"
Colin Cross [Thu, 20 Feb 2014 22:39:09 +0000 (14:39 -0800)]
arm64: don't build emulator
There is no emulator kernel yet, so don't try to build the emulator.
Change-Id: I714f5717f439b4e48a973f4355f2c6684af79764
Ying Wang [Thu, 20 Feb 2014 22:32:20 +0000 (22:32 +0000)]
am
9aadde67: Merge "Include in upper-level makefiles"
* commit '
9aadde673481043f650a420a104dde21a4c13f57':
Include $(BUILD_COPY_HEADERS) in upper-level makefiles
Ying Wang [Thu, 20 Feb 2014 22:24:09 +0000 (22:24 +0000)]
Merge "Include $(BUILD_COPY_HEADERS) in upper-level makefiles"
Ying Wang [Thu, 20 Feb 2014 21:54:43 +0000 (13:54 -0800)]
Include $(BUILD_COPY_HEADERS) in upper-level makefiles
This makes sure copy_headers.mk only be included onces, no matter
it's for the 1st arch or the 2nd arch.
Change-Id: I80a558fbdb52861f176bd27a21c302069a5cc3ce
Ying Wang [Thu, 20 Feb 2014 18:36:25 +0000 (18:36 +0000)]
am
9335001d: Merge "Strip all symbols on x86"
* commit '
9335001d5d15777522455d5f593a9a69719b12b7':
Strip all symbols on x86
Ying Wang [Thu, 20 Feb 2014 18:36:24 +0000 (18:36 +0000)]
am
e72beb53: Merge "Remove dead code."
* commit '
e72beb53a8f0644d65c3e218677e287c109d67c6':
Remove dead code.
Ying Wang [Thu, 20 Feb 2014 18:31:07 +0000 (18:31 +0000)]
Merge "Strip all symbols on x86"
Ying Wang [Thu, 20 Feb 2014 18:30:51 +0000 (18:30 +0000)]
Merge "Remove dead code."
Ying Wang [Thu, 20 Feb 2014 07:33:47 +0000 (07:33 +0000)]
am
f9538ea6: Merge "Add missing s to mips."
* commit '
f9538ea6261f373bdb993bc5d0a503b4ecbc0c22':
Add missing $(combo_2nd_arch_prefix)s to mips.
Ying Wang [Thu, 20 Feb 2014 04:31:29 +0000 (04:31 +0000)]
Merge "Add missing $(combo_2nd_arch_prefix)s to mips."
Elliott Hughes [Thu, 20 Feb 2014 02:47:50 +0000 (18:47 -0800)]
Add missing $(combo_2nd_arch_prefix)s to mips.
Change-Id: I91a5f2d92cc964cbaeb1c07f27eb56ea1a0d53cc
Ying Wang [Thu, 20 Feb 2014 02:25:55 +0000 (18:25 -0800)]
Remove dead code.
It seems the code was meant to add the toolchain to ANDROID_BUILD_PATHS
and then export to PATH by lunch.
But now we export the toolchain to PATH explicitly in envsetup.sh and
the code is unnecessary.
This reduces the places to change when we upgrade the gcc version.
It also fixed the bug that the mips toolchain was always exported
regardless of the target arch.
Change-Id: Iee3b895b4c4e0df8971c27c01b9ecbd591848b12
C. Sean Young [Wed, 19 Feb 2014 20:53:43 +0000 (12:53 -0800)]
Strip all symbols on x86
Strip all of the non-dynamic symbols on x86 targets,
instead of just the debug symbols.
Change-Id: Id799a6a8c8b0e8bf70977328e42e5efa23762f25
Ying Wang [Wed, 19 Feb 2014 18:26:36 +0000 (18:26 +0000)]
am
5aa50c66: Merge "Fix x86 config file to support 2nd ARCH build"
* commit '
5aa50c6637f88213661b29facaf05f072316dec0':
Fix x86 config file to support 2nd ARCH build
Ying Wang [Wed, 19 Feb 2014 18:23:10 +0000 (18:23 +0000)]
am
3d9c1c1a: Merge "Switch x86_64 to gcc-4.8"
* commit '
3d9c1c1a537ead6071165ea661507e0a9250dc4a':
Switch x86_64 to gcc-4.8
Ying Wang [Wed, 19 Feb 2014 18:19:21 +0000 (18:19 +0000)]
Merge "Fix x86 config file to support 2nd ARCH build"
Ying Wang [Wed, 19 Feb 2014 18:17:51 +0000 (18:17 +0000)]
Merge "Switch x86_64 to gcc-4.8"
Stephen Hines [Wed, 19 Feb 2014 17:03:00 +0000 (09:03 -0800)]
Switch to LLVM 3.4 prebuilts in AOSP.
Change-Id: I064e953fb1bf69e7e321616647aab88dcc39af76
Colin Cross [Wed, 19 Feb 2014 01:06:26 +0000 (01:06 +0000)]
am
4febec12: Merge "x86: set -msse2 for all builds"
* commit '
4febec12272a90456c5216cc10ccc059ba11552d':
x86: set -msse2 for all builds
Colin Cross [Wed, 19 Feb 2014 01:00:33 +0000 (01:00 +0000)]
Merge "x86: set -msse2 for all builds"
Colin Cross [Tue, 18 Feb 2014 23:49:48 +0000 (15:49 -0800)]
x86: set -msse2 for all builds
All supported x86 processors have SSE2.
Change-Id: Ib4a0511c456fe3185b0b902390860ad557aeedcf
Stephen Hines [Tue, 18 Feb 2014 23:12:37 +0000 (23:12 +0000)]
am
f1ad4d2d: Merge "Add bcc to the list of PRODUCT_PACKAGES to install."
* commit '
f1ad4d2d2eea9952963fd52fa56e9ab16b108618':
Add bcc to the list of PRODUCT_PACKAGES to install.
Stephen Hines [Tue, 18 Feb 2014 23:05:42 +0000 (23:05 +0000)]
Merge "Add bcc to the list of PRODUCT_PACKAGES to install."
Ying Wang [Tue, 18 Feb 2014 22:54:08 +0000 (22:54 +0000)]
am
0c0a4ce8: Remove the default sdk.atree if custom one is set.
* commit '
0c0a4ce8f4c40b47d34774c7f36c80ae7f8082fc':
Remove the default sdk.atree if custom one is set.
Ying Wang [Tue, 18 Feb 2014 22:29:59 +0000 (14:29 -0800)]
Remove the default sdk.atree if custom one is set.
Change-Id: I5d20b030db5ef29d7ff6eb64a0a1e11a4283e85d
Stephen Hines [Thu, 23 Jan 2014 03:50:43 +0000 (19:50 -0800)]
Add bcc to the list of PRODUCT_PACKAGES to install.
Bug:
7342767
As part of the process of sandboxing the online RenderScript compiler, we
need to install bcc.
Change-Id: Ia650bdcb760246f3f1e15ebb867f07d9802cdfbe
Ying Wang [Tue, 18 Feb 2014 19:17:53 +0000 (11:17 -0800)]
resolved conflicts for merge of
6ca56b6a to klp-modular-dev-plus-aosp
Change-Id: I8f647bb5ff9a4de1fbdbfb1dae169e547aeba3ce
Ying Wang [Tue, 18 Feb 2014 19:11:50 +0000 (19:11 +0000)]
Merge "Make the module existence check nonfatal" into klp-modular-dev
Pavel Chupin [Tue, 18 Feb 2014 09:59:07 +0000 (13:59 +0400)]
Switch x86_64 to gcc-4.8
x86 is already on gcc-4.8
Change-Id: I39b4298b705a6ad04cdaa434261c6b0d90d552ff
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Narayan Kamath [Mon, 17 Feb 2014 12:31:00 +0000 (12:31 +0000)]
am
2bea94ba: Merge "Fix up android.core CTS tests."
* commit '
2bea94bac78d8a8ed5030d1e09d48db677e1167d':
Fix up android.core CTS tests.
Narayan Kamath [Mon, 17 Feb 2014 12:30:59 +0000 (12:30 +0000)]
am
70a4a6a3: Merge "changing the rules following java package renaming for external/apache-harmony."
* commit '
70a4a6a3323885b0f2701b9a6fe3d2eea2152a23':
changing the rules following java package renaming for external/apache-harmony.
Narayan Kamath [Mon, 17 Feb 2014 12:30:58 +0000 (12:30 +0000)]
am
d4dc88b0: Merge "Adding apache-harmony to cts."
* commit '
d4dc88b0f5be3670187f2fe3bb659aaeec032d3a':
Adding apache-harmony to cts.
Narayan Kamath [Mon, 17 Feb 2014 12:30:58 +0000 (12:30 +0000)]
am
92e99b12: Merge "add jsr166 tests to cts. Bug:
10390711"
* commit '
92e99b128d170b28972ac3910090734e803c93e5':
add jsr166 tests to cts. Bug:
10390711
Narayan Kamath [Mon, 17 Feb 2014 12:25:25 +0000 (12:25 +0000)]
Merge "Fix up android.core CTS tests."
Narayan Kamath [Mon, 17 Feb 2014 12:25:23 +0000 (12:25 +0000)]
Merge "changing the rules following java package renaming for external/apache-harmony."
Narayan Kamath [Mon, 17 Feb 2014 12:25:21 +0000 (12:25 +0000)]
Merge "Adding apache-harmony to cts."
Narayan Kamath [Mon, 17 Feb 2014 12:25:18 +0000 (12:25 +0000)]
Merge "add jsr166 tests to cts. Bug:
10390711"
Narayan Kamath [Tue, 31 Dec 2013 15:15:41 +0000 (15:15 +0000)]
Fix up android.core CTS tests.
Fix several wrongly configured tests that were either
looking for tests in the wrong jar (apache-harmony-tests
instead of core-tests) or using the wrong prefix.
Also, this change creates subsets of the harmony tests based
on subpackage names (java.net, java.io, java.nio etc.) instead
of the earlier harmony groupings.
Change-Id: Iea0e20d23512611d1aac92b2f8219031b6396c77
Tsu Chiang Chuang [Mon, 29 Oct 2012 21:56:49 +0000 (14:56 -0700)]
changing the rules following java package renaming for
external/apache-harmony.
(cherry picked from commit
27b4b5ffe12b179fc0d24747f9ead2d5f52c871a)
Change-Id: Ia5a7b2d401f23dfdc556ef1982efd441ed1d1ae2
Tsu Chiang Chuang [Wed, 24 Oct 2012 23:47:49 +0000 (16:47 -0700)]
Adding apache-harmony to cts.
(cherry-picked from commit
5fef52e9c986184796ff1e5fe54390614ba318a6)
Change-Id: I9a6595f5e8bc30654a062e0917d3ecd3ba28ebc7
Tsu Chiang Chuang [Wed, 21 Aug 2013 18:46:03 +0000 (11:46 -0700)]
add jsr166 tests to cts.
Bug:
10390711
Change-Id: I512770e98f61995fc33043d35562dc3b213a4930
Qiming Shi [Mon, 17 Feb 2014 07:13:48 +0000 (15:13 +0800)]
Fix x86 config file to support 2nd ARCH build
Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026
Signed-off-by: Qiming Shi <qiming.shi@intel.com>