OSDN Git Service
Ying Wang [Thu, 31 Jul 2014 18:00:25 +0000 (18:00 +0000)]
am
e1a77930: Merge "Update host linux toolchain to gcc 4.8"
* commit '
e1a77930448a93b52e6b4dbbd9aca5ad861844d4':
Update host linux toolchain to gcc 4.8
Ying Wang [Thu, 31 Jul 2014 17:25:48 +0000 (17:25 +0000)]
am
38868b9b: Merge "BuildBootImage: Add secondstage image support"
* commit '
38868b9bedf63578ed8ec8d426064e94f81ad862':
BuildBootImage: Add secondstage image support
Elliott Hughes [Wed, 30 Jul 2014 23:25:19 +0000 (23:25 +0000)]
am
d23798bf: Merge "[MIPSR6] Add mips64r6 and mips32r6 targets"
* commit '
d23798bfdc9bb34909177c3c5f06f0c97cc9897e':
[MIPSR6] Add mips64r6 and mips32r6 targets
Elliott Hughes [Wed, 30 Jul 2014 23:25:19 +0000 (23:25 +0000)]
am
0b3c42cb: Merge "[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains"
* commit '
0b3c42cbc848726d83cea953a41c333856182cf9':
[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains
Ying Wang [Thu, 31 Jul 2014 17:05:36 +0000 (17:05 +0000)]
Merge "BuildBootImage: Add secondstage image support"
Benoit Fradin [Mon, 14 Jul 2014 19:00:43 +0000 (21:00 +0200)]
BuildBootImage: Add secondstage image support
The AOSP bootimage format allows the use of a second stage image
however the BuildBootableImage function does not allows the "second"
optional argument. This patch adds the support of this argument.
Change-Id: I8ed9d9e56449945c2d42fc908269921c394f68c0
Signed-off-by: Benoit Fradin <benoit.fradin@intel.com>
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
Ying Wang [Wed, 30 Jul 2014 17:26:00 +0000 (17:26 +0000)]
am
717bc3a3: Merge "Don\'t fail the build for dangling module names."
* commit '
717bc3a3b7ea2d8835523d01ba020332fb76ac5a':
Don't fail the build for dangling module names.
Ying Wang [Wed, 30 Jul 2014 16:40:53 +0000 (16:40 +0000)]
am
bb164eb6: Merge "Fix 64 bit emulator booting (again)."
* commit '
bb164eb64036b8e49309bc82eb0800562eaf9852':
Fix 64 bit emulator booting (again).
Ying Wang [Wed, 30 Jul 2014 16:40:52 +0000 (16:40 +0000)]
am
4b323c62: Merge "SDK targets should inherit from core_64_bit.mk"
* commit '
4b323c62564337c96e0e0694c14d64f1c57182ee':
SDK targets should inherit from core_64_bit.mk
Ying Wang [Wed, 30 Jul 2014 16:40:52 +0000 (16:40 +0000)]
am
b0da8265: Merge "Add SDK product for arm64, x86_64 and mips64."
* commit '
b0da8265b21035641c964826e17c215972036669':
Add SDK product for arm64, x86_64 and mips64.
Ying Wang [Wed, 30 Jul 2014 16:40:51 +0000 (16:40 +0000)]
am
8f509bad: Merge "Remove the unused large_emu_hw.mk"
* commit '
8f509bad6d1eaa9928ff54eca220ba3e72214ac7':
Remove the unused large_emu_hw.mk
Brian Carlstrom [Wed, 30 Jul 2014 16:33:06 +0000 (16:33 +0000)]
am
073dc97c: Merge "Add PROP_NAME_MAX validation"
* commit '
073dc97cf2d8417709f4c77808a4cd6e8f17575e':
Add PROP_NAME_MAX validation
Ying Wang [Wed, 30 Jul 2014 16:38:03 +0000 (16:38 +0000)]
Merge "SDK targets should inherit from core_64_bit.mk"
Narayan Kamath [Tue, 17 Jun 2014 16:43:14 +0000 (17:43 +0100)]
SDK targets should inherit from core_64_bit.mk
bug:
15661143
(cherry picked from commit
e78ba32d23dd3a1f3df1b861b1b17fced45801b0)
Change-Id: Icf9d0a7d429f848ca6163a8658c6e5f208fdd039
Ying Wang [Tue, 29 Apr 2014 19:48:06 +0000 (12:48 -0700)]
Add SDK product for arm64, x86_64 and mips64.
Bug:
14411602
Change-Id: Ia609321864ddade27df97448c8037f25c4ef99aa
Ying Wang [Thu, 21 Nov 2013 00:41:18 +0000 (16:41 -0800)]
Remove the unused large_emu_hw.mk
Change-Id: Iea8330e00983f4eac44d8a072c1bf185afcf6a80
Conflicts:
target/product/large_emu_hw.mk
Brian Carlstrom [Wed, 30 Jul 2014 16:30:10 +0000 (16:30 +0000)]
Merge "Add PROP_NAME_MAX validation"
Ying Wang [Wed, 30 Jul 2014 16:17:10 +0000 (16:17 +0000)]
am
7a739f35: Merge "Use hermetic host toolchains."
* commit '
7a739f35857f7c3b7d2de24c56c6eb86bc4818d7':
Use hermetic host toolchains.
Ying Wang [Wed, 30 Jul 2014 16:17:06 +0000 (16:17 +0000)]
am
aea1cae4: Merge "Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."""
* commit '
aea1cae4f5a3fcc5e6ecdca24409f102469b411b':
Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
Elliott Hughes [Wed, 30 Jul 2014 23:21:32 +0000 (23:21 +0000)]
Merge "[MIPSR6] Add mips64r6 and mips32r6 targets"
Brian Carlstrom [Tue, 29 Jul 2014 23:08:25 +0000 (16:08 -0700)]
Add PROP_NAME_MAX validation
Change-Id: I49179c83ae163de6f6fb398c5de60c5d296ca009
Ying Wang [Wed, 30 Jul 2014 16:37:30 +0000 (16:37 +0000)]
Merge "Add SDK product for arm64, x86_64 and mips64."
Ying Wang [Wed, 30 Jul 2014 16:14:03 +0000 (16:14 +0000)]
Merge "Use hermetic host toolchains."
Ying Wang [Wed, 30 Jul 2014 16:13:38 +0000 (16:13 +0000)]
Merge "Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."""
Ying Wang [Tue, 29 Jul 2014 21:08:33 +0000 (14:08 -0700)]
Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
This reverts commit
a4f84fdfed9a805d69b37de997512cd0616b3ff8.
Added "export CCACHE_CPP2 := true" to work around ccache bug with clang.
See:
http://petereisentraut.blogspot.com/2011/09/ccache-and-clang-part-2.html
Change-Id: I2b1fa8fd59c3a113c4028a92a1d16018133c9792
Ying Wang [Tue, 29 Jul 2014 18:01:17 +0000 (18:01 +0000)]
am
ecc42675: Merge "Allow LOCAL_ASSET_DIR point to nonexistent dir"
* commit '
ecc4267564116197b719baf9ecc24a9f0652fbb5':
Allow LOCAL_ASSET_DIR point to nonexistent dir
Ying Wang [Thu, 31 Jul 2014 17:56:13 +0000 (17:56 +0000)]
Merge "Update host linux toolchain to gcc 4.8"
David 'Digit' Turner [Wed, 28 May 2014 11:27:08 +0000 (13:27 +0200)]
Update host linux toolchain to gcc 4.8
This patch ensures the build system uses the prebuilt gcc-4.8 toolchain
when building host Linux binaries, instead of the gcc-4.6 one.
Change-Id: I7b449650714ba4314a780827e0243f2af40ec82c
Ying Wang [Tue, 29 Jul 2014 17:55:19 +0000 (17:55 +0000)]
Merge "Allow LOCAL_ASSET_DIR point to nonexistent dir"
Ying Wang [Tue, 29 Jul 2014 17:34:30 +0000 (10:34 -0700)]
Allow LOCAL_ASSET_DIR point to nonexistent dir
LOCAL_ASSET_DIR may point to a dir generated during the build process.
We have done similiar things to LOCAL_RESOURCE_DIR.
Change-Id: Id53433c0d3a4c7af601283755199fde6a59cdfaf
Ying Wang [Mon, 28 Jul 2014 22:14:51 +0000 (15:14 -0700)]
Use hermetic host toolchains.
Change-Id: I6bb72b5728d1075be9645f8473dcf3db759fa66a
Marcin Kosiba [Mon, 28 Jul 2014 09:06:07 +0000 (09:06 +0000)]
am
6be7d2e5: Merge "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
* commit '
6be7d2e5bb9da9b1b5c06886466d089637529dcc':
Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."
Ying Wang [Sat, 26 Jul 2014 00:48:25 +0000 (00:48 +0000)]
am
45040bdb: Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."
* commit '
45040bdbb8c3a543746538b1e08b5ac53c427099':
Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.
Ying Wang [Wed, 30 Jul 2014 17:21:39 +0000 (17:21 +0000)]
Merge "Don't fail the build for dangling module names."
Ying Wang [Wed, 30 Jul 2014 17:20:56 +0000 (10:20 -0700)]
Don't fail the build for dangling module names.
Change-Id: I939253552e7ca6a672f662ae6be3eac41f5bab41
Ying Wang [Wed, 30 Jul 2014 16:38:23 +0000 (16:38 +0000)]
Merge "Fix 64 bit emulator booting (again)."
Narayan Kamath [Mon, 23 Jun 2014 16:52:53 +0000 (17:52 +0100)]
Fix 64 bit emulator booting (again).
Not only should they inherit from core_64_bit.mk, we should
inherit from that first to make sure sdk.mk doesn't override
those values with other cruft.
Change-Id: Ibcd3c47b5be92544c1e86b6e85608b875c468461
Ying Wang [Wed, 30 Jul 2014 16:37:21 +0000 (16:37 +0000)]
Merge "Remove the unused large_emu_hw.mk"
Yohann Roussel [Fri, 25 Jul 2014 12:53:32 +0000 (12:53 +0000)]
am
970d053c: Merge "Fix doc target for multidex support library."
* commit '
970d053c975e9ee38e61fc00506362a76fcc153d':
Fix doc target for multidex support library.
Tim Murray [Thu, 24 Jul 2014 22:25:59 +0000 (22:25 +0000)]
Tim Murray [Thu, 24 Jul 2014 22:12:14 +0000 (22:12 +0000)]
am
16d43086: Merge "Fix Windows SDK build to not use clang."
* commit '
16d43086e91b76876f195b6d7a7c2e9d021b8293':
Fix Windows SDK build to not use clang.
Tim Murray [Thu, 24 Jul 2014 22:20:58 +0000 (22:20 +0000)]
Merge "fix build"
Tim Murray [Thu, 24 Jul 2014 22:20:18 +0000 (15:20 -0700)]
fix build
Change-Id: I28799d5523e1d2d2500a82b3d323c58486aacdbc
Tim Murray [Thu, 24 Jul 2014 21:42:53 +0000 (14:42 -0700)]
Fix Windows SDK build to not use clang.
bug
16172793
Change-Id: I7bf76cae49ec17bf50eb657b0e38234b7cb55e85
Tim Murray [Thu, 24 Jul 2014 21:04:24 +0000 (21:04 +0000)]
am
f82de5b8: Merge "Switch host builds to use Clang by default."
* commit '
f82de5b89d70fb0e122f03a3956c5b01e66daca5':
Switch host builds to use Clang by default.
Duane Sand [Wed, 9 Jul 2014 20:30:52 +0000 (13:30 -0700)]
[MIPSR6] Add mips64r6 and mips32r6 targets
Add mips64r6 target and corresponding mips32r6 target.
Defaults remain as mips64r2 and mips32r2.
Apply -FP64A codegen subsetting to mips32r6 only.
Access FR=0 odd-numbered 32-bit float regs only via
double-prec even-numbered regs, not by single-prec ops.
Change-Id: I1740a6c658304b6c41242be58d68753e6f171658
Ying Wang [Thu, 24 Jul 2014 01:45:53 +0000 (01:45 +0000)]
am
1bb9adb8: Merge "[MIPS64] Enable mips64 clang"
* commit '
1bb9adb88004ebdbacf44a95bd4e08065960c5ab':
[MIPS64] Enable mips64 clang
Ying Wang [Wed, 23 Jul 2014 23:37:56 +0000 (23:37 +0000)]
am
6837ac67: Merge "Refactor FDO support code to ensure arm64 can also be built with FDO."
* commit '
6837ac67035518f5c36c91ae07ec95010c7071bd':
Refactor FDO support code to ensure arm64 can also be built with FDO.
Duane Sand [Tue, 22 Jul 2014 21:34:00 +0000 (14:34 -0700)]
[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains
Use 4.9 mips64el toolchain for both 64- and 32-bit builds.
Tell ld when 32-bit links are required.
Override 4.9's changed defaults for mips floating point
register use, to get same assembler rules as 4.8 and earlier.
Also: drop unused soft-fp build targets, cleanout redundant
compiler options, and remove extraneous Android.mk file.
Change-Id: I86f1075266349edb2b08a7709b9f5472d8cfda32
Duane Sand [Tue, 3 Jun 2014 23:05:59 +0000 (16:05 -0700)]
[MIPS64] Enable mips64 clang
Change-Id: I737f40ff1d4c71c21bea5159d1b0acee89fe32a2
Marcin Kosiba [Mon, 28 Jul 2014 09:02:13 +0000 (09:02 +0000)]
Merge "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
Dan Albert [Sat, 26 Jul 2014 20:35:06 +0000 (20:35 +0000)]
Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."
This broke the world.
This reverts commit
3b7a4d811df5b326e714984edd7dd3e2b11e16d5.
Change-Id: Iefb01b8642a92bcc718d2c745e8ce1346ba50143
Yohann Roussel [Fri, 25 Jul 2014 12:44:51 +0000 (12:44 +0000)]
Merge "Fix doc target for multidex support library."
Yohann Roussel [Thu, 24 Jul 2014 15:24:30 +0000 (17:24 +0200)]
Fix doc target for multidex support library.
Change-Id: I0136c6cd8a3af0dc9d12b9424f96e9527cde68e2
Tim Murray [Thu, 24 Jul 2014 22:08:41 +0000 (22:08 +0000)]
Merge "Fix Windows SDK build to not use clang."
Ying Wang [Thu, 24 Jul 2014 01:42:13 +0000 (01:42 +0000)]
Merge "[MIPS64] Enable mips64 clang"
Tim Murray [Thu, 24 Jul 2014 20:59:29 +0000 (20:59 +0000)]
Merge "Switch host builds to use Clang by default."
Tim Murray [Fri, 4 Apr 2014 21:38:29 +0000 (14:38 -0700)]
Switch host builds to use Clang by default.
If LOCAL_CLANG is not set to false for a host module, clang will be used instead of gcc.
This also enables the integrated assembler by default for Darwin host builds.
bug
16172793
Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434
Ying Wang [Wed, 23 Jul 2014 23:35:05 +0000 (23:35 +0000)]
Merge "Refactor FDO support code to ensure arm64 can also be built with FDO."
Dehao Chen [Wed, 23 Jul 2014 21:28:58 +0000 (14:28 -0700)]
Refactor FDO support code to ensure arm64 can also be built with FDO.
Change-Id: I752c9f411b0a046a15c72b4837efc1fb0503b470
Ying Wang [Sat, 26 Jul 2014 00:43:50 +0000 (00:43 +0000)]
Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."
Elliott Hughes [Wed, 30 Jul 2014 23:20:06 +0000 (23:20 +0000)]
Merge "[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains"
Stephen Hines [Tue, 22 Jul 2014 20:49:15 +0000 (20:49 +0000)]
am
38470c3f: Merge "Default to "prescott" as our baseline i686 host build architecture."
* commit '
38470c3fffd25a300045d62cccc8ab129cb71349':
Default to "prescott" as our baseline i686 host build architecture.
Stephen Hines [Tue, 22 Jul 2014 20:45:32 +0000 (20:45 +0000)]
Merge "Default to "prescott" as our baseline i686 host build architecture."
Stephen Hines [Sat, 19 Jul 2014 00:34:14 +0000 (17:34 -0700)]
Default to "prescott" as our baseline i686 host build architecture.
Bug:
16408818
Change-Id: I41760605bf9f4589859afd20cc96ccbedb6fe82c
Yohann Roussel [Fri, 18 Jul 2014 14:43:47 +0000 (14:43 +0000)]
am
1029013a: Merge "Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex"
* commit '
1029013a0db29b926da93d2400b181d1c3b495fe':
Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex
Yohann Roussel [Fri, 18 Jul 2014 10:55:07 +0000 (10:55 +0000)]
am
d5389ba4: Merge "Move multidex support library"
* commit '
d5389ba4163a1a8506ab91fb287c1167a3de521f':
Move multidex support library
Yohann Roussel [Fri, 18 Jul 2014 10:55:06 +0000 (10:55 +0000)]
am
182ac4e3: Merge "Stubs of android-support-multidex-instrumentation."
* commit '
182ac4e3fd5bf9397bf5f8397e2cc599e761e16b':
Stubs of android-support-multidex-instrumentation.
Yohann Roussel [Fri, 18 Jul 2014 10:55:05 +0000 (10:55 +0000)]
am
2d3e4d22: Merge "Generates SDK stubs of android-support-multidex"
* commit '
2d3e4d22d9a97837a1545a563c5d2e7e4b915040':
Generates SDK stubs of android-support-multidex
Yohann Roussel [Fri, 18 Jul 2014 10:55:05 +0000 (10:55 +0000)]
am
34ba2331: Merge "Support dx generating multiple dex files."
* commit '
34ba2331f7caec3dc5df97024fa8bf57c9e5d045':
Support dx generating multiple dex files.
Yohann Roussel [Fri, 18 Jul 2014 14:40:29 +0000 (14:40 +0000)]
Merge "Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex"
Yohann Roussel [Fri, 18 Jul 2014 10:51:19 +0000 (10:51 +0000)]
Merge "Stubs of android-support-multidex-instrumentation."
Yohann Roussel [Fri, 18 Jul 2014 10:51:33 +0000 (10:51 +0000)]
Merge "Move multidex support library"
Yohann Roussel [Fri, 18 Jul 2014 10:51:09 +0000 (10:51 +0000)]
Merge "Generates SDK stubs of android-support-multidex"
Yohann Roussel [Fri, 18 Jul 2014 10:50:56 +0000 (10:50 +0000)]
Merge "Support dx generating multiple dex files."
Ying Wang [Thu, 17 Jul 2014 21:13:55 +0000 (21:13 +0000)]
am
0b30c5f0: Merge "Remove linker64 and debuggerd64"
* commit '
0b30c5f0b5d70ecc7599f33ccd226f62e176872f':
Remove linker64 and debuggerd64
Ying Wang [Thu, 17 Jul 2014 21:07:59 +0000 (21:07 +0000)]
Merge "Remove linker64 and debuggerd64"
Ying Wang [Thu, 17 Jul 2014 20:59:59 +0000 (13:59 -0700)]
Remove linker64 and debuggerd64
We don't have separate *64 module names any more.
Now both 32-bit and 64-bit variants are built under the same module name.
Change-Id: I1956a6a88ec6fe280798be01928239d098dfe27a
Yohann Roussel [Thu, 17 Jul 2014 14:52:58 +0000 (16:52 +0200)]
Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex
This keeps only the real sources in doc target and fixes some error
messages caused by trying to generate docs of the tests.
Change-Id: Icd6903a43c90efc08eba92976dddb104c45a5e43
Ian Rogers [Thu, 17 Jul 2014 12:30:33 +0000 (12:30 +0000)]
am
bc30611f: Merge "Vary non-image Xmx for dex2oat on MIPS."
* commit '
bc30611f8e08361a41c7e78c799732a7f685e568':
Vary non-image Xmx for dex2oat on MIPS.
Ying Wang [Thu, 17 Jul 2014 12:30:31 +0000 (12:30 +0000)]
am
e1caecfa: Merge "Fix the MIPS build."
* commit '
e1caecfaa2c9b5165e5a0f31faac1b983b5d128a':
Fix the MIPS build.
Ian Rogers [Thu, 17 Jul 2014 06:14:28 +0000 (06:14 +0000)]
Merge "Vary non-image Xmx for dex2oat on MIPS."
Ian Rogers [Thu, 17 Jul 2014 05:25:35 +0000 (22:25 -0700)]
Vary non-image Xmx for dex2oat on MIPS.
The image Xmx is already fixed at 64m. The issue is in the non boot image case.
Change-Id: Idd508187ce8ac3d3c8dbe357c74bc33a5c8185dd
Ying Wang [Thu, 17 Jul 2014 01:12:36 +0000 (01:12 +0000)]
Merge "Fix the MIPS build."
Ian Rogers [Thu, 17 Jul 2014 01:06:02 +0000 (18:06 -0700)]
Fix the MIPS build.
Use an override for the dex2oat Xmx value when cross-compiling.
Bug:
16221224
Change-Id: Iaeac95cd50a0bae7817ee7da23b3cf25246f1d6d
Maurice Chu [Wed, 16 Oct 2013 21:30:42 +0000 (14:30 -0700)]
Move multidex support library
Multidex is being moved from frameworks/support/multidex to
frameworks/multidex.
GMS Core will be using the multidex library and has gotten special
approval to use the unreleased multidex library (i.e., guinea pig).
Bug:
10674263
Change-Id: I31f582dd7adf4db6eb19c52357875594fc9f7829
Yohann Roussel [Wed, 4 Sep 2013 10:19:46 +0000 (12:19 +0200)]
Stubs of android-support-multidex-instrumentation.
For the SDK.
(cherry picked from commit
584f6019106e5adc87f0f1a3bac75c31efe67f36)
Change-Id: I64b7d279a575c201c4df52a6bd3caa75baf58d11
Yohann Roussel [Wed, 21 Aug 2013 12:19:44 +0000 (14:19 +0200)]
Generates SDK stubs of android-support-multidex
(cherry picked from commit
c4441b8c3701147365213a1f789626a8d442db6e)
Conflicts:
core/pathmap.mk
Change-Id: I9283e793d8cdbd4003b86fd33ff62dd35c663f1f
Yohann Roussel [Tue, 20 Aug 2013 15:05:27 +0000 (17:05 +0200)]
Support dx generating multiple dex files.
Dx is now capable of generating multiple dex file in one run.
This capability is not compatible with --output=*.dex so this CL
changes the --output argument to be a directory. This CL also
includes the packaging of the multiple dex files when dx generates
more than one dex file.
(cherry picked from commit
8ffe9c3e7967ec9c6c6e9a03095454dc1b073c3b)
Conflicts:
core/java.mk
Change-Id: I1ddc91b416de5929d4d4b41824c6012b32f94deb
Ying Wang [Tue, 15 Jul 2014 01:27:42 +0000 (01:27 +0000)]
am
15d00664: Merge "Revert "Fix Java detection on some Linux distributions""
* commit '
15d00664884b9b8ce4766ab3a7fd15b83cbeaad9':
Revert "Fix Java detection on some Linux distributions"
Ying Wang [Tue, 15 Jul 2014 01:23:49 +0000 (01:23 +0000)]
Merge "Revert "Fix Java detection on some Linux distributions""
Ying Wang [Tue, 15 Jul 2014 01:22:50 +0000 (01:22 +0000)]
Revert "Fix Java detection on some Linux distributions"
This reverts commit
09040dd8232f8fe588d938e04581ba1648f452f4.
Change-Id: Iafb126a6200e259f4176d903bacf8d3de28c6d97
Ying Wang [Mon, 14 Jul 2014 21:40:49 +0000 (21:40 +0000)]
am
c7f1389d: Merge "Fix Java detection on some Linux distributions"
* commit '
c7f1389d2683be9068d22666b484e48abcff12f1':
Fix Java detection on some Linux distributions
Stephen Hines [Mon, 14 Jul 2014 20:29:47 +0000 (20:29 +0000)]
am
60a0ba2b: Merge "Remove bcc from generic_no_telephony.mk."
* commit '
60a0ba2b345720313d1beb0421db57ece75c063c':
Remove bcc from generic_no_telephony.mk.
Stephen Hines [Mon, 14 Jul 2014 20:29:46 +0000 (20:29 +0000)]
am
fd5e704c: Merge "Add bcc into /system/bin."
* commit '
fd5e704c5683077e4c689d4a27769c034b48be7f':
Add bcc into /system/bin.
Ying Wang [Mon, 14 Jul 2014 21:36:53 +0000 (21:36 +0000)]
Merge "Fix Java detection on some Linux distributions"
Stephen Hines [Mon, 14 Jul 2014 20:27:53 +0000 (20:27 +0000)]
Merge "Add bcc into /system/bin."
leozwang [Sun, 13 Jul 2014 05:03:52 +0000 (22:03 -0700)]
Add bcc into /system/bin.
Bug:
16161758
Change-Id: I492f6780ecf7d18f291532fc934a80ff7ac643cf
Stephen Hines [Mon, 14 Jul 2014 20:28:27 +0000 (20:28 +0000)]
Merge "Remove bcc from generic_no_telephony.mk."
leozwang [Mon, 14 Jul 2014 17:28:38 +0000 (10:28 -0700)]
Remove bcc from generic_no_telephony.mk.
bcc was added into core_minimal.mk.
Change-Id: I29fa6eb3df0dada609e2f6b3e28ffd08d13c6afc