OSDN Git Service
Doug Zongker [Thu, 20 Feb 2014 16:33:35 +0000 (16:33 +0000)]
Merge "rebuild recovery patch in sign_target_files_apks"
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
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:38:00 +0000 (21:38 +0000)]
am
481fed17: am
f10efbc1: Merge "make 64-bit builds into multiarch builds"
* commit '
481fed17fad5141154d8cf9532c0803ade24a6a6':
make 64-bit builds into multiarch builds
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"
Doug Zongker [Thu, 13 Feb 2014 18:58:24 +0000 (10:58 -0800)]
rebuild recovery patch in sign_target_files_apks
The target_files zip should now contain the recovery-from-boot patch
and the script to install it. This means that sign_target_files_apks,
which generates a signed target_files from an unsigned target_files,
now needs to recompute the patch and script (taking into account the
key replacement, property changes, etc., that it does) so its output
contains the correct patch.
Change-Id: I18afd73864ba5c480b7ec11de19d1f5e7763a8c0
Stephen Hines [Thu, 13 Feb 2014 11:21:12 +0000 (03:21 -0800)]
Fix incorrect x86 build rules.
combo/TARGET_x86*.mk mistakenly added TARGET_GLOBAL_CFLAGS to their
linker command lines. This results in clang builds not working properly,
since they strip some unknown flags from TARGET_GLOBAL_CFLAGS.
Change-Id: I60a1ff5df70305323134435e4ae107ea7acfe8ea
Ying Wang [Thu, 13 Feb 2014 11:27:22 +0000 (11:27 +0000)]
am
5768ac91: am
5c7039fb: Merge "Remove dead code."
* commit '
5768ac917ca0e08a6a356159e0a8837f1bcfc7ff':
Remove dead code.
Colin Cross [Tue, 28 Jan 2014 22:35:16 +0000 (14:35 -0800)]
make 64-bit builds into multiarch builds
Also enable the 64-bit binder interface and make them only use ART.
Change-Id: I05de41ce348c14722c84a658f745659bde5ba423
Ying Wang [Thu, 13 Feb 2014 01:45:38 +0000 (01:45 +0000)]
am
5c7039fb: Merge "Remove dead code."
* commit '
5c7039fb069c040759df0a5a15241dd7f8b2f9b7':
Remove dead code.
Ying Wang [Thu, 13 Feb 2014 01:39:41 +0000 (01:39 +0000)]
Merge "Remove dead code."
Ying Wang [Thu, 13 Feb 2014 01:38:46 +0000 (17:38 -0800)]
Remove dead code.
Change-Id: Ia36a04037e15cbf296f375f3ece9a7e977fdca1e
Colin Cross [Wed, 12 Feb 2014 23:00:21 +0000 (23:00 +0000)]
am
2c32144b: resolved conflicts for merge of
7cd7bd65 to klp-modular-dev-plus-aosp
* commit '
2c32144b328e0191fa32bf342dc7eb01d6174b6e':
HACK: add 64-bit directory blacklist
add support for module supported or unsupported target architectures
Ying Wang [Wed, 12 Feb 2014 23:00:19 +0000 (23:00 +0000)]
am
0b7197a6: am
cd958154: Merge "Refactor a little bit and do the validation on also default.prop."
* commit '
0b7197a612459caf2cdac8b9f0c0b8c5365b7837':
Refactor a little bit and do the validation on also default.prop.
Ying Wang [Wed, 12 Feb 2014 23:00:18 +0000 (23:00 +0000)]
am
4170e2be: am
fd841351: Merge "Support custom sdk.atree files." into klp-modular-dev
* commit '
4170e2be8e7493f2ad1abd33ba74638d9d421b3b':
Support custom sdk.atree files.
Ying Wang [Wed, 12 Feb 2014 23:00:17 +0000 (23:00 +0000)]
am
ca23f57c: am
de90b030: Merge "A build property\'s value is returned empty in runtime when its length exceeds 92 symbols (91 valid symbols + \0). It is better to catch that issue on earlier stage, i.e. fail the build with an appropriate message."
* commit '
ca23f57c419e99ae49714c71ad9eb2a689435580':
A build property's value is returned empty in runtime when its length exceeds 92 symbols (91 valid symbols + \0). It is better to catch that issue on earlier stage, i.e. fail the build with an appropriate message.
Ying Wang [Wed, 12 Feb 2014 22:58:06 +0000 (14:58 -0800)]
resolved conflicts for merge of
b6d53f0b to master
Change-Id: Id01809e2a72ca8ba13594621690273fc6f982095
Ying Wang [Wed, 12 Feb 2014 22:47:33 +0000 (22:47 +0000)]
am
1968f286: am
b12cce10: Merge "Refine module name resolving in multilib build"
* commit '
1968f286d69c36692bd5788fa8745ed16ccc03cb':
Refine module name resolving in multilib build
Elliott Hughes [Wed, 12 Feb 2014 22:47:32 +0000 (22:47 +0000)]
am
1e317e77: am
993ffb80: Merge "Add all-S-files-under."
* commit '
1e317e77fa86ee0450e8a7b1b2ab5bd51720189f':
Add all-S-files-under.
Colin Cross [Wed, 12 Feb 2014 21:06:30 +0000 (13:06 -0800)]
resolved conflicts for merge of
7cd7bd65 to klp-modular-dev-plus-aosp
Change-Id: Ib4f062a59d442b29b9782fd8c0328fd551c3a32a
Ying Wang [Wed, 12 Feb 2014 21:01:03 +0000 (21:01 +0000)]
am
cd958154: Merge "Refactor a little bit and do the validation on also default.prop."
* commit '
cd958154a5bdb753274a338e799c3ece96ea9c5c':
Refactor a little bit and do the validation on also default.prop.
Ying Wang [Wed, 12 Feb 2014 20:58:02 +0000 (20:58 +0000)]
am
fd841351: Merge "Support custom sdk.atree files." into klp-modular-dev
* commit '
fd841351efaeb241f0b499231671772caa21f19e':
Support custom sdk.atree files.