OSDN Git Service
Elliott Hughes [Wed, 26 Feb 2014 02:12:52 +0000 (02:12 +0000)]
am
4a122c96: am
9dba192b: Merge "oprofile/daemon doesn\'t build for x86_64."
* commit '
4a122c96f3abf0eb20c5b2c3db7cd067f5a919fb':
oprofile/daemon doesn't build for x86_64.
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:40:44 +0000 (01:40 +0000)]
am
12c909b2: resolved conflicts for merge of
9057f619 to klp-modular-dev-plus-aosp
* commit '
12c909b20c2a1f8be74914186e54c4143ddc263e':
Remove external/wpa_supplicant_8 and external/android-clat
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:26:37 +0000 (00:26 +0000)]
am
331272f9: am
25b55485: Merge "Take libcore off the LP64 blacklist."
* commit '
331272f94bc85c5eb9853e726c024375f691ab59':
Take libcore off the LP64 blacklist.
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:21:06 +0000 (00:21 +0000)]
am
4a0b06e8: am
f1ff3abd: Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir"
* commit '
4a0b06e80871aad1bc8a8493bdd74b9ff30a9a2f':
Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir
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 22:03:59 +0000 (22:03 +0000)]
am
b8d792d7: am
e7154870: Merge "Move qemud and /dev/qemu policy bits to emulator-specific sepolicy."
* commit '
b8d792d734a1470aa96062fe284a5d288e7bbc30':
Move qemud and /dev/qemu policy bits to emulator-specific sepolicy.
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."
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
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>
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>
Dirk Dougherty [Sat, 15 Feb 2014 18:20:12 +0000 (18:20 +0000)]
am
98756f3b: am
8a56079c: am
5c92d966: am
541b4941: New temporary templates set for dynamic content support.
* commit '
98756f3b7e16558ae4e17891237163ab8a23c462':
New temporary templates set for dynamic content support.
Dirk Dougherty [Sat, 15 Feb 2014 18:16:51 +0000 (18:16 +0000)]
am
8a56079c: am
5c92d966: am
541b4941: New temporary templates set for dynamic content support.
* commit '
8a56079c74765afa405a96bd025f2bddac4e17b6':
New temporary templates set for dynamic content support.
Dirk Dougherty [Sat, 15 Feb 2014 18:14:37 +0000 (18:14 +0000)]
am
5c92d966: am
541b4941: New temporary templates set for dynamic content support.
* commit '
5c92d966076b28024a9efd6c8456445e207748f1':
New temporary templates set for dynamic content support.
Dirk Dougherty [Sat, 15 Feb 2014 18:12:08 +0000 (18:12 +0000)]
am
541b4941: New temporary templates set for dynamic content support.
* commit '
541b494103857da31505ba745b0da5bdbe0499b9':
New temporary templates set for dynamic content support.
Dirk Dougherty [Sat, 15 Feb 2014 02:31:53 +0000 (18:31 -0800)]
New temporary templates set for dynamic content support.
Change-Id: I066e43cdebaf66c0d8b5e3622a286dc2c88c47b5
Ying Wang [Fri, 14 Feb 2014 23:08:08 +0000 (23:08 +0000)]
am
872d3c2c: Merge "gettop: fix symlink detection"
* commit '
872d3c2c6a07e4f1c171439449727a870dfaa59d':
gettop: fix symlink detection
Stephen Hines [Fri, 14 Feb 2014 23:07:59 +0000 (23:07 +0000)]
am
051e28fe: Merge "Fix incorrect x86 build rules."
* commit '
051e28fe2128a284ec7987f903f02b9f5826391b':
Fix incorrect x86 build rules.
Ying Wang [Fri, 14 Feb 2014 21:39:42 +0000 (13:39 -0800)]
Make the module existence check nonfatal
Now we have sdk variants that may inherit the non-existent module names
from the device product.
Change-Id: Ibe96a33cde650fd79ae4731561dcb674203c3b91
Ying Wang [Fri, 14 Feb 2014 21:20:17 +0000 (21:20 +0000)]
Merge "gettop: fix symlink detection"
Stephen Hines [Fri, 14 Feb 2014 20:32:29 +0000 (20:32 +0000)]
Merge "Fix incorrect x86 build rules."
Colin Cross [Fri, 14 Feb 2014 00:50:00 +0000 (00:50 +0000)]
Colin Cross [Fri, 14 Feb 2014 00:44:29 +0000 (00:44 +0000)]
Merge "fix build"
Colin Cross [Fri, 14 Feb 2014 00:41:50 +0000 (16:41 -0800)]
fix build
Include prebuilt_internal.mk for host builds.
Change-Id: I750d6f71b3a2c67b11536babb8b39060005f4ff4
Colin Cross [Fri, 14 Feb 2014 00:32:48 +0000 (16:32 -0800)]
resolved conflicts for merge of
2fbe5018 to klp-modular-dev-plus-aosp
Change-Id: I623332e427ce8bfcf1b17e708ccca1d50cdbeadd
Colin Cross [Fri, 14 Feb 2014 00:28:53 +0000 (00:28 +0000)]
am
3bbaab31: Merge changes I2514f66f,I71fed98d
* commit '
3bbaab31069045aea9ae33c1d995640e56182a82':
support LOCAL_MODULE_TARGET_ARCH for prebuilts
Add generated sources dir to the default include path
Colin Cross [Fri, 14 Feb 2014 00:24:47 +0000 (00:24 +0000)]
Merge "add linker64 and debuggerd64 to all products"
Colin Cross [Fri, 14 Feb 2014 00:24:16 +0000 (00:24 +0000)]
Merge changes I2514f66f,I71fed98d
* changes:
support LOCAL_MODULE_TARGET_ARCH for prebuilts
Add generated sources dir to the default include path
Colin Cross [Thu, 13 Feb 2014 06:04:28 +0000 (22:04 -0800)]
add linker64 and debuggerd64 to all products
Add linker64 and debuggerd64 to embedded.mk. They will be silently
ignored on 32-bit builds, and filtered out on 32-bit sdk builds.
Change-Id: I8c30ea65e2b7e224ee73cc9fbbcb7555d3be04b5
Ying Wang [Fri, 14 Feb 2014 00:09:58 +0000 (00:09 +0000)]
am
e2f06adb: Merge "Don\'t check the existence for the 64-bit modules for 32-bit SDK build."
* commit '
e2f06adb8873ede16f829690b4dbab07b8121aa8':
Don't check the existence for the 64-bit modules for 32-bit SDK build.
Colin Cross [Fri, 14 Feb 2014 00:09:57 +0000 (00:09 +0000)]
am
7ea5cd95: Merge "don\'t use LOCAL_*_arch for host builds"
* commit '
7ea5cd95b84c42c79f22aab7f6b8f851cc88a41f':
don't use LOCAL_*_arch for host builds
Ying Wang [Fri, 14 Feb 2014 00:03:12 +0000 (00:03 +0000)]
Merge "Don't check the existence for the 64-bit modules for 32-bit SDK build."
Ying Wang [Thu, 13 Feb 2014 23:56:34 +0000 (15:56 -0800)]
Don't check the existence for the 64-bit modules for 32-bit SDK build.
Change-Id: I0d5d6ecc07332bef6854466fd98380eb12fc08fc
Colin Cross [Thu, 13 Feb 2014 23:04:18 +0000 (15:04 -0800)]
support LOCAL_MODULE_TARGET_ARCH for prebuilts
Prebuilts often support only a single architecture, allow them to
use LOCAL_MODULE_TARGET_ARCH to specify it.
Change-Id: I2514f66f682ef267bbf1a1ab78510faff0a18b64
Colin Cross [Thu, 13 Feb 2014 21:41:52 +0000 (13:41 -0800)]
Add generated sources dir to the default include path
Change-Id: I71fed98dfbc0bf5efad069a251eee2e5ab2e5fe6
Colin Cross [Thu, 13 Feb 2014 23:00:40 +0000 (23:00 +0000)]
Merge "don't use LOCAL_*_arch for host builds"
Colin Cross [Thu, 13 Feb 2014 05:15:12 +0000 (21:15 -0800)]
don't use LOCAL_*_arch for host builds
The LOCAL_*_$(TARGET_ARCH) variables don't make sense for host
modules, only append use them for target modules.
Also complete the list of LOCAL_*_arch and LOCAL_*_32/64 to be
consistent.
Change-Id: I00c83e5c4e08ed9a844f9f99a79ce4bcc3f0bf11
Colin Cross [Thu, 13 Feb 2014 21:20:31 +0000 (21:20 +0000)]
am
f10efbc1: Merge "make 64-bit builds into multiarch builds"
* commit '
f10efbc15e458f50bb29fe9ad0653fb2e08fd8fb':
make 64-bit builds into multiarch builds
Colin Cross [Thu, 13 Feb 2014 21:15:00 +0000 (21:15 +0000)]
Merge "make 64-bit builds into multiarch builds"
OSDN Git Service
