OSDN Git Service
Colin Cross [Fri, 21 Feb 2014 13:54:00 +0000 (13:54 +0000)]
am
6da37a0f: am
b3bc6136: Merge "arm64: don\'t build emulator"
* commit '
6da37a0fd37ebc8d79b9119a13f80207d5560aaf':
arm64: don't build emulator
Ying Wang [Fri, 21 Feb 2014 04:19:45 +0000 (04:19 +0000)]
am
0c9c0bfc: am
9aadde67: Merge "Include in upper-level makefiles"
* commit '
0c9c0bfcc6f2d10fa7235f48b0174a1a120ca599':
Include $(BUILD_COPY_HEADERS) in upper-level makefiles
Ying Wang [Thu, 20 Feb 2014 23:02:03 +0000 (23:02 +0000)]
am
e9bb9870: am
9335001d: Merge "Strip all symbols on x86"
* commit '
e9bb9870027429b56e42604802b07c1c3d7a8a4e':
Strip all symbols on x86
Ying Wang [Thu, 20 Feb 2014 23:01:57 +0000 (23:01 +0000)]
am
fab0fe3b: am
e72beb53: Merge "Remove dead code."
* commit '
fab0fe3b647f364a61c84f4048d36b1d68a51226':
Remove dead code.
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
Mark Salyzyn [Thu, 20 Feb 2014 22:50:03 +0000 (22:50 +0000)]
Merge "build: add logd"
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
Doug Zongker [Thu, 20 Feb 2014 21:34:10 +0000 (21:34 +0000)]
Merge "add --block flag to ota_from_target_files"
Doug Zongker [Thu, 20 Feb 2014 21:22:07 +0000 (13:22 -0800)]
add --block flag to ota_from_target_files
Add the --block flag to this script to control whether block-based OTA
packages are generated (defaults to off). Make the full OTA package
produced by "make otapackage" continue to produce a block-based OTA.
Also fix a problem where block incremental OTAs didn't ever succeed,
and the --no_signing option never worked.
Change-Id: I610d0b4abed4b8b65fbe8ce0abaeec6cf52e14a1
Ying Wang [Thu, 20 Feb 2014 21:28:00 +0000 (21:28 +0000)]
am
a5e79db0: am
f9538ea6: Merge "Add missing s to mips."
* commit '
a5e79db0791340e0b6837903c234c3f97d4c5332':
Add missing $(combo_2nd_arch_prefix)s to mips.
Geremy Condra [Thu, 20 Feb 2014 21:10:38 +0000 (21:10 +0000)]
Merge "Add support for block incremental OTAs"
Geremy Condra [Fri, 7 Feb 2014 03:45:10 +0000 (19:45 -0800)]
Add support for block incremental OTAs
Change-Id: Ie72015e34ed8d7595a5c74c8df41cba73275afab
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.
Steve Moyer [Thu, 20 Feb 2014 18:33:05 +0000 (18:33 +0000)]
Merge "Combine emulator test projects into a single apk"
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."
Doug Zongker [Thu, 20 Feb 2014 16:47:29 +0000 (08:47 -0800)]
img_from_target_files doesn't need releasetools extensions
This argument is superfluous; we don't need to compute its value or
pass it to the script.
Change-Id: I567a5c0b67060f8fcc0bf83e5bfa0272312b9124
Doug Zongker [Thu, 20 Feb 2014 16:33:35 +0000 (16:33 +0000)]
Merge "rebuild recovery patch in sign_target_files_apks"
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
Steve Moyer [Wed, 19 Feb 2014 01:46:19 +0000 (17:46 -0800)]
Combine emulator test projects into a single apk
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests
Change-Id: I39e02fbe2cf9761607dfb4c2f0d6c4906e8b1e51
Ying Wang [Wed, 19 Feb 2014 18:34:48 +0000 (18:34 +0000)]
am
21ec64b1: am
5aa50c66: Merge "Fix x86 config file to support 2nd ARCH build"
* commit '
21ec64b16914dfd05e07558b00ada867b7aa8b6e':
Fix x86 config file to support 2nd ARCH build
Ying Wang [Wed, 19 Feb 2014 18:31:16 +0000 (18:31 +0000)]
am
32e93384: am
3d9c1c1a: Merge "Switch x86_64 to gcc-4.8"
* commit '
32e93384b73746c54f8bc0e8a7b818acc5c1b00e':
Switch x86_64 to gcc-4.8
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"
Colin Cross [Wed, 19 Feb 2014 01:12:40 +0000 (01:12 +0000)]
am
c798836a: am
4febec12: Merge "x86: set -msse2 for all builds"
* commit '
c798836a82584744a02a26c57f2733fcb0b0e0cf':
x86: set -msse2 for all builds
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:18:06 +0000 (23:18 +0000)]
am
515f379f: am
f1ad4d2d: Merge "Add bcc to the list of PRODUCT_PACKAGES to install."
* commit '
515f379f1dd14e7564ad99dec42549a263863166':
Add bcc to the list of PRODUCT_PACKAGES to install.
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 23:00:02 +0000 (23:00 +0000)]
am
f1339406: am
0c0a4ce8: Remove the default sdk.atree if custom one is set.
* commit '
f133940642722c45a37aad718423f3dac58233c0':
Remove the default sdk.atree if custom one is set.
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
Doug Zongker [Tue, 18 Feb 2014 19:29:40 +0000 (19:29 +0000)]
Merge "bump releasetools python requirement to 2.7"
Ying Wang [Tue, 18 Feb 2014 19:24:39 +0000 (19:24 +0000)]
am
52cefc36: resolved conflicts for merge of
6ca56b6a to klp-modular-dev-plus-aosp
* commit '
52cefc36cf4718cd85e6e35832b2a8674ba9e838':
Make the module existence check nonfatal
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
Doug Zongker [Tue, 18 Feb 2014 18:57:07 +0000 (10:57 -0800)]
bump releasetools python requirement to 2.7
These scripts already use some post-2.4 features, so let's make it
official: Python 2.7 is needed to run them.
Change-Id: I256e9ed99b0b62abe4e22a7b1f811acb7419e88e
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 13:10:32 +0000 (13:10 +0000)]
am
0003192c: am
2bea94ba: Merge "Fix up android.core CTS tests."
* commit '
0003192c32ff9672a3974709912acc853053c7a8':
Fix up android.core CTS tests.
Narayan Kamath [Mon, 17 Feb 2014 13:10:31 +0000 (13:10 +0000)]
am
2a1a308f: (-s ours) am
70a4a6a3: Merge "changing the rules following java package renaming for external/apache-harmony."
* commit '
2a1a308f3bb3f9559461380eb04bfaa0a5554c32':
changing the rules following java package renaming for external/apache-harmony.
Narayan Kamath [Mon, 17 Feb 2014 13:05:03 +0000 (13:05 +0000)]
am
35513f4c: (-s ours) am
d4dc88b0: Merge "Adding apache-harmony to cts."
* commit '
35513f4c92707745025e039187b0b91783a39af3':
Adding apache-harmony to cts.
Narayan Kamath [Mon, 17 Feb 2014 12:59:35 +0000 (12:59 +0000)]
am
6b835426: (-s ours) am
92e99b12: Merge "add jsr166 tests to cts. Bug:
10390711"
* commit '
6b83542627e28c09b08c0cf131fc9f0f3c30627f':
add jsr166 tests to cts. Bug:
10390711
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:25:38 +0000 (18:25 +0000)]
am
bdaf9012: am
98756f3b: am
8a56079c: am
5c92d966: am
541b4941: New temporary templates set for dynamic content support.
* commit '
bdaf90122ae93469175304be6bee4ad0f0375639':
New temporary templates set for dynamic content support.
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
Stephen Hines [Sat, 15 Feb 2014 00:21:51 +0000 (00:21 +0000)]
Merge "Switch to Clang 3.4 prebuilts."
Ying Wang [Fri, 14 Feb 2014 23:41:20 +0000 (23:41 +0000)]
am
595e1f46: am
872d3c2c: Merge "gettop: fix symlink detection"
* commit '
595e1f46919f79e23f4b09d50de99ef291a9821a':
gettop: fix symlink detection
Stephen Hines [Fri, 14 Feb 2014 23:41:20 +0000 (23:41 +0000)]
am
c4206df9: am
051e28fe: Merge "Fix incorrect x86 build rules."
* commit '
c4206df9e8b59d1e9e948033e02ec08620f31c8b':
Fix incorrect x86 build rules.
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."
Torne (Richard Coles) [Fri, 14 Feb 2014 10:49:30 +0000 (10:49 +0000)]
Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."
Stephen Hines [Fri, 14 Feb 2014 08:56:50 +0000 (00:56 -0800)]
Switch to Clang 3.4 prebuilts.
Change-Id: Ic8b0a7db4bb8ea96013e6b8c2f1fcdb80b6a7b03
Ying Wang [Fri, 14 Feb 2014 02:29:52 +0000 (02:29 +0000)]
Merge "Add a dummy build recipe for the proto generated header files"
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
Colin Cross [Fri, 14 Feb 2014 00:58:46 +0000 (00:58 +0000)]
Colin Cross [Fri, 14 Feb 2014 00:51:53 +0000 (00:51 +0000)]
am
a0eb50ac: resolved conflicts for merge of
2fbe5018 to klp-modular-dev-plus-aosp
* commit '
a0eb50accabe83b18bd3fe3b9d6417a4718af9e2':
add linker64 and debuggerd64 to all products
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:35:33 +0000 (00:35 +0000)]
am
9b2077d4: am
3bbaab31: Merge changes I2514f66f,I71fed98d
* commit '
9b2077d4b969e9f8598242915f094552c5d78ad5':
support LOCAL_MODULE_TARGET_ARCH for prebuilts
Add generated sources dir to the default include path
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:15:42 +0000 (00:15 +0000)]
am
1e8fec5b: am
e2f06adb: Merge "Don\'t check the existence for the 64-bit modules for 32-bit SDK build."
* commit '
1e8fec5baea381604a2bf197bfb091eeb7aa36ef':
Don't check the existence for the 64-bit modules for 32-bit SDK build.
Colin Cross [Fri, 14 Feb 2014 00:15:42 +0000 (00:15 +0000)]
am
4048cf3a: am
7ea5cd95: Merge "don\'t use LOCAL_*_arch for host builds"
* commit '
4048cf3a70dd6405f7ff08b8a3d714d1a7b7d446':
don't use LOCAL_*_arch for host builds
OSDN Git Service
