OSDN Git Service
Brian Carlstrom [Tue, 5 Aug 2014 21:43:06 +0000 (21:43 +0000)]
am
557e7e54: am
ce06199a: Merge "Make system use patchoat to relocate during runtime."
* commit '
557e7e54131999d25fc75c71ad2c15d931033312':
Make system use patchoat to relocate during runtime.
Ying Wang [Tue, 5 Aug 2014 21:30:57 +0000 (21:30 +0000)]
am
6922cdf4: Merge "[MIPSR6] Add mips64r6 and mips32r6 targets" into lmp-dev
* commit '
6922cdf42586db4fcc84e2c3f6cbda7d3c553a36':
[MIPSR6] Add mips64r6 and mips32r6 targets
Ying Wang [Tue, 5 Aug 2014 21:29:12 +0000 (14:29 -0700)]
resolved conflicts for merge of
7d595d15 to lmp-dev-plus-aosp
Change-Id: I16e5d927ec4e944bee8fa4f87f0d0a83a8b194ba
Ying Wang [Tue, 5 Aug 2014 21:23:10 +0000 (14:23 -0700)]
resolved conflicts for merge of
ef4516ef to lmp-dev-plus-aosp
Change-Id: I991e53af64149ee949a39892108712a2122c0b1b
Doug Zongker [Tue, 5 Aug 2014 17:55:48 +0000 (17:55 +0000)]
am
f8340089: add 5 minute timeout on binary patch construction
* commit '
f83400896de5e8bc2b21a0dce98382d9ed0ab537':
add 5 minute timeout on binary patch construction
Brian Carlstrom [Tue, 5 Aug 2014 17:51:10 +0000 (17:51 +0000)]
am
ce06199a: Merge "Make system use patchoat to relocate during runtime."
* commit '
ce06199a047f81d6afe522ab4e6f489deecb46f3':
Make system use patchoat to relocate during runtime.
Ying Wang [Tue, 5 Aug 2014 21:04:48 +0000 (21:04 +0000)]
Merge "[MIPS64] Enable mips64 clang" into lmp-dev
Duane Sand [Tue, 3 Jun 2014 23:05:59 +0000 (16:05 -0700)]
[MIPS64] Enable mips64 clang
(cherry picked from commit
41ca4446370ba90e472e45a8897868855185a6c7)
Change-Id: I0b141c58c88fe86e3a59844f53acc9a0e0a5271c
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.
(cherry picked from commit
6670e24aed1ca66f21a6af759a0d156bb3df1739)
Change-Id: I34d2f8fc6113c9d1670e3acff1aff48634b9fe1b
Brian Carlstrom [Tue, 5 Aug 2014 17:47:26 +0000 (17:47 +0000)]
Merge "Make system use patchoat to relocate during runtime."
Doug Zongker [Tue, 5 Aug 2014 17:39:37 +0000 (10:39 -0700)]
add 5 minute timeout on binary patch construction
When making bsdiff/imgdiff patches, give up after 5 minutes. (On
certain large files it can take hours to build a patch, if it ever
even completes.)
Change-Id: I123c06f8194f85f6f4e640f7eb31c7746f76ba4d
Alex Light [Thu, 24 Jul 2014 23:26:13 +0000 (16:26 -0700)]
Make system use patchoat to relocate during runtime.
Change DexPreOpt to include patch information of all compiled files so
we can relocate at runtime.
Bug:
15358152
Change-Id: Ibe92d8b55a24bbf718b0416a21b76e5df7a2de26
Ying Wang [Tue, 5 Aug 2014 21:05:01 +0000 (21:05 +0000)]
Merge "[MIPSR6] Add mips64r6 and mips32r6 targets" into lmp-dev
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.
(cherry picked from commit
6bab974cdc90cb3a7514c7255b6e6adfb9c98e2b)
Change-Id: I447337ce56c15e86cec505d68a6b45294fc3ba77
Ying Wang [Tue, 5 Aug 2014 21:04:37 +0000 (21:04 +0000)]
Merge "[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains" into lmp-dev
Doug Zongker [Mon, 4 Aug 2014 23:17:43 +0000 (23:17 +0000)]
am
56d91dd0: Merge "fall back to generating full OTA if incremental fails" into lmp-dev
* commit '
56d91dd07f96039344d6976da5d985d2508c9365':
fall back to generating full OTA if incremental fails
Brian Carlstrom [Mon, 4 Aug 2014 19:21:46 +0000 (12:21 -0700)]
resolved conflicts for merge of
9b80095e to lmp-dev-plus-aosp
Change-Id: Id37b96441818c5542b8c340f968183162a47191a
Brian Carlstrom [Mon, 4 Aug 2014 18:33:00 +0000 (18:33 +0000)]
am
430ec575: Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]"
* commit '
430ec575cd40672aab8394c31c7e45294ee302e5':
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]
Doug Zongker [Mon, 4 Aug 2014 23:08:54 +0000 (23:08 +0000)]
Merge "fall back to generating full OTA if incremental fails" into lmp-dev
Doug Zongker [Mon, 4 Aug 2014 23:06:43 +0000 (16:06 -0700)]
fall back to generating full OTA if incremental fails
Block incremental OTA generation can currently fail on some
target-files pairs. Fall back to generating a full OTA so that the
script succeeds rather than failing.
Change-Id: Ide70395d1f3759aa2076bd173836f6a5e5b397c0
Ben Murdoch [Fri, 1 Aug 2014 16:58:27 +0000 (16:58 +0000)]
am
9e6ba597: Merge "Remove webviewchromium from PRODUCT_BOOT_JARS." into lmp-dev
* commit '
9e6ba597ba438fd4ad314f27bb532f36a9ec5aa9':
Remove webviewchromium from PRODUCT_BOOT_JARS.
Doug Zongker [Fri, 1 Aug 2014 13:50:32 +0000 (13:50 +0000)]
am
285dd138: Merge "store images in target-files" into lmp-dev
* commit '
285dd13885f3960a8b6d0225dcd72edef2d1a5ab':
store images in target-files
Brian Carlstrom [Mon, 4 Aug 2014 18:27:33 +0000 (18:27 +0000)]
Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]"
Doug Zongker [Thu, 31 Jul 2014 22:33:19 +0000 (22:33 +0000)]
Merge "store images in target-files" into lmp-dev
Doug Zongker [Thu, 31 Jul 2014 18:06:30 +0000 (11:06 -0700)]
store images in target-files
Store sparse images in the target-files, and use those (when they're
available) for building block OTAs.
- New script add_img_to_target_files is added to make the images and
add them to the IMAGES/ subdir in the target-files. It gets run
from the Makefile when building a target-files.
- img_from_target_files becomes mostly vestigial: it creates the
img.zip by just copying the images out of the target-files. (It
still knows how to build images for use on older target-files.)
- ota_from_target_files uses images from the target-files in
preference to rebuilding images from the source files.
- sign_apk_target_files builds images and includes them in its output
target files (even if the input target-files didn't have them).
Bug:
16488065
Change-Id: I444e0d722d636978209467ffc01750a585c6db75
Ying Wang [Thu, 31 Jul 2014 18:04:20 +0000 (18:04 +0000)]
am
e0383397: am
e1a77930: Merge "Update host linux toolchain to gcc 4.8"
* commit '
e0383397a2be0be120da20cebd77e3f1f811a6b0':
Update host linux toolchain to gcc 4.8
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:31:08 +0000 (17:31 +0000)]
am
4365dcec: am
38868b9b: Merge "BuildBootImage: Add secondstage image support"
* commit '
4365dcece2ee9a4e91c3556d4f9a88c1cbe98dbd':
BuildBootImage: Add secondstage image support
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
Dehao Chen [Thu, 31 Jul 2014 16:56:10 +0000 (16:56 +0000)]
am
e43c96c3: Merge "Update the FDO support:" into lmp-dev
* commit '
e43c96c332890a4641b9310aad9b4dddd80fabc0':
Update the FDO support:
Elliott Hughes [Wed, 30 Jul 2014 23:30:07 +0000 (23:30 +0000)]
am
c378352d: am
d23798bf: Merge "[MIPSR6] Add mips64r6 and mips32r6 targets"
* commit '
c378352de8a07a7b8dabd444d130710ce1cb3eed':
[MIPSR6] Add mips64r6 and mips32r6 targets
Elliott Hughes [Wed, 30 Jul 2014 23:30:05 +0000 (23:30 +0000)]
am
e4d54f31: am
0b3c42cb: Merge "[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains"
* commit '
e4d54f317df641faf216e4000fbc3d091d3c1abc':
[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains
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
Brian Carlstrom [Tue, 29 Jul 2014 02:13:27 +0000 (19:13 -0700)]
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]
This will allow us to conditionally change the compiler-filter based on other properties.
Bug:
15165413
Change-Id: Ie3f9292d35e9d4abf93271b7d22b72d185ee5ce2
Ying Wang [Wed, 30 Jul 2014 20:50:52 +0000 (20:50 +0000)]
am
4dfb5580: Merge "Don\'t apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set" into lmp-dev
* commit '
4dfb5580c2e33eebda24e377c5ce2a73a93d4258':
Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set
Ying Wang [Wed, 30 Jul 2014 20:44:35 +0000 (20:44 +0000)]
Merge "Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set" into lmp-dev
Ying Wang [Wed, 30 Jul 2014 20:40:14 +0000 (13:40 -0700)]
Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set
Bug:
16319961
Change-Id: I8ea308c94ff58eaccd8854ab98e11238b993f867
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:32:41 +0000 (17:32 +0000)]
am
eac74b24: (-s ours) am
717bc3a3: Merge "Don\'t fail the build for dangling module names."
* commit '
eac74b24574478309e0bef0b2f337ff31587ac57':
Don't fail the build for dangling module names.
Ying Wang [Wed, 30 Jul 2014 17:26:05 +0000 (17:26 +0000)]
am
b169fb78: Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
* commit '
b169fb78227f4a42ac239c134e547e2fd12991ca':
Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
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 17:21:49 +0000 (17:21 +0000)]
am
9bee9d7d: (-s ours) am
bb164eb6: Merge "Fix 64 bit emulator booting (again)."
* commit '
9bee9d7d1137090dfd015d3b894bf5593a057991':
Fix 64 bit emulator booting (again).
Ying Wang [Wed, 30 Jul 2014 17:16:04 +0000 (17:16 +0000)]
am
3b548515: (-s ours) am
4b323c62: Merge "SDK targets should inherit from core_64_bit.mk"
* commit '
3b548515fbcc6a9d7baa56252038bdff6a8b608d':
SDK targets should inherit from core_64_bit.mk
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 [Wed, 30 Jul 2014 17:10:27 +0000 (17:10 +0000)]
am
7dcd694a: (-s ours) am
b0da8265: Merge "Add SDK product for arm64, x86_64 and mips64."
* commit '
7dcd694ae07668a734676b7e9b4529fb75d4d918':
Add SDK product for arm64, x86_64 and mips64.
Ying Wang [Wed, 30 Jul 2014 17:05:16 +0000 (10:05 -0700)]
resolved conflicts for merge of
fe07e791 to lmp-dev-plus-aosp
Change-Id: I9215d5a4ffacb295addc4349dd028ccbfba71730
Brian Carlstrom [Wed, 30 Jul 2014 16:53:12 +0000 (09:53 -0700)]
resolved conflicts for merge of
a8138028 to lmp-dev-plus-aosp
Change-Id: I5573d097d741f4922b791b33de5c941af08127c6
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:22:08 +0000 (16:22 +0000)]
am
3f191617: am
7a739f35: Merge "Use hermetic host toolchains."
* commit '
3f1916174823fe6fd034ba07c762fae9a0143e44':
Use hermetic host toolchains.
Ying Wang [Wed, 30 Jul 2014 16:22:00 +0000 (16:22 +0000)]
am
18c20aae: am
aea1cae4: Merge "Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."""
* commit '
18c20aae44b5736b673c8776202e1e76b6bd81cd':
Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
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
Dehao Chen [Thu, 31 Jul 2014 16:43:17 +0000 (16:43 +0000)]
Merge "Update the FDO support:" into lmp-dev
Dehao Chen [Wed, 30 Jul 2014 23:22:53 +0000 (16:22 -0700)]
Update the FDO support:
* Explicitly check BUILD_FDO_INSTRUMENT and BUILD_FDO_OPTIMIZE with true
* Remove unnecessary target_libgcov
* Update the profile collection path on device so that most app can have write access
Change-Id: I5c1915a12ea37b2cb3c76a27e7104e47ad636928
Ying Wang [Tue, 29 Jul 2014 19:09:13 +0000 (19:09 +0000)]
am
a961a09e: Fix error: \'NoneType\' object is not iterable
* commit '
a961a09e59dcf130435cf5ff052c4f2d7e3986ea':
Fix error: 'NoneType' object is not iterable
Ying Wang [Tue, 29 Jul 2014 18:42:37 +0000 (11:42 -0700)]
Fix error: 'NoneType' object is not iterable
Change-Id: I5a54edbed0e5e5481a570b93c07d50f6ca3e18e0
Ying Wang [Tue, 29 Jul 2014 18:08:05 +0000 (11:08 -0700)]
resolved conflicts for merge of
9929fd66 to lmp-dev-plus-aosp
Change-Id: I7f3b4111bb508e61d279fc4a78b2a2ebe8cfd6d9
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
Yohann Roussel [Tue, 29 Jul 2014 13:14:59 +0000 (13:14 +0000)]
am
355520e3: Merge "Fix doc target for multidex support library." into lmp-dev
* commit '
355520e35ed69c60b755fbca630b9939f35b6eb2':
Fix doc target for multidex support library.
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 11:57:17 +0000 (11:57 +0000)]
am
bf4ac764: am
6be7d2e5: Merge "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
* commit '
bf4ac764cdc7bf6b09e30b79ca6088ef17de9e07':
Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."
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."
Vignesh Venkatasubramanian [Sat, 26 Jul 2014 02:40:35 +0000 (02:40 +0000)]
am
82af97fc: Add opus entries in generic makefiles.
* commit '
82af97fc274c27da7099c46f84ad48f6f9624537':
Add opus entries in generic makefiles.
Vignesh Venkatasubramanian [Wed, 28 May 2014 15:06:11 +0000 (08:06 -0700)]
Add opus entries in generic makefiles.
libopus is necessary for opus software decoding support. add that to
base.mk and add an entry for libstagefright_soft_opusdec to
core_base.mk.
Change-Id: Iddd6ab2b2a84bb966b7e635a6aa73efb6a803e98
Ying Wang [Sat, 26 Jul 2014 00:52:21 +0000 (00:52 +0000)]
am
53e19fd4: am
45040bdb: Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."
* commit '
53e19fd4e259ea47e6b81b8472fbdc6041ca7044':
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.
Edwin Wong [Fri, 25 Jul 2014 23:42:09 +0000 (23:42 +0000)]
am
dbb3d2e7: Add libdrmclearkeyplugin.so to image.
* commit '
dbb3d2e732b5b66bade851bb1791c2040f233ef2':
Add libdrmclearkeyplugin.so to image.
Edwin Wong [Thu, 24 Jul 2014 01:46:57 +0000 (18:46 -0700)]
Add libdrmclearkeyplugin.so to image.
The library will be added to /system/vendor/lib/mediadrm.
Change-Id: Iebfd00077c2a13e4ad4296aedba21230a7e4f37f
Ben Murdoch [Fri, 1 Aug 2014 16:47:47 +0000 (16:47 +0000)]
Merge "Remove webviewchromium from PRODUCT_BOOT_JARS." into lmp-dev
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"
Stephen Hines [Fri, 25 Jul 2014 20:00:00 +0000 (20:00 +0000)]
am
e9bf1bda: Merge "Default to "prescott" as our baseline i686 host build architecture." into lmp-dev
* commit '
e9bf1bdac6cdcde840f19d6b40dbd9bdcb5ab9b2':
Default to "prescott" as our baseline i686 host build architecture.
Yohann Roussel [Fri, 25 Jul 2014 18:45:02 +0000 (18:45 +0000)]
am
4e0693cf: am
970d053c: Merge "Fix doc target for multidex support library."
* commit '
4e0693cf6c3420d1cc8fcd7768a339458612b28d':
Fix doc target for multidex support library.
Przemyslaw Szczepaniak [Fri, 25 Jul 2014 17:27:29 +0000 (17:27 +0000)]
am
ac6a9195: Switch NDK arm64 libraries to 4.9.
* commit '
ac6a9195cadc83a50cea376fc61268db6fc2f129':
Switch NDK arm64 libraries to 4.9.
Przemyslaw Szczepaniak [Thu, 17 Jul 2014 16:54:41 +0000 (17:54 +0100)]
Switch NDK arm64 libraries to 4.9.
Change-Id: Iffc30e34b798896d9259ca1dfc3ff2d21683d6a4
(cherry picked from commit
5895dd13a7c96a3100048dae8fc1195abc8c9beb)
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.