OSDN Git Service
Colin Cross [Fri, 21 Feb 2014 18:35:38 +0000 (10:35 -0800)]
am
9d82efbc: am
6da37a0f: am
b3bc6136: Merge "arm64: don\'t build emulator"
* commit '
9d82efbce7dc45ad4201f043f9777b3a43cdc3a2':
arm64: don't build emulator
Ying Wang [Fri, 21 Feb 2014 18:35:37 +0000 (10:35 -0800)]
am
28edfe16: am
0c9c0bfc: am
9aadde67: Merge "Include in upper-level makefiles"
* commit '
28edfe16f7902dc4bb7b6406f8373b4890de317e':
Include $(BUILD_COPY_HEADERS) in upper-level makefiles
Ying Wang [Fri, 21 Feb 2014 18:35:37 +0000 (10:35 -0800)]
am
039107aa: am
e9bb9870: am
9335001d: Merge "Strip all symbols on x86"
* commit '
039107aa8d19e52f3e2ff51d6d346b8ae5860ab0':
Strip all symbols on x86
Ying Wang [Fri, 21 Feb 2014 18:35:36 +0000 (10:35 -0800)]
am
0e53834b: am
fab0fe3b: am
e72beb53: Merge "Remove dead code."
* commit '
0e53834b6e8b7993f8d8813370bf2d517cc2cc9d':
Remove dead code.
Mark Salyzyn [Fri, 21 Feb 2014 18:35:35 +0000 (10:35 -0800)]
am
5bcb2c86: Merge "build: add logd"
* commit '
5bcb2c86d75abacca9d3730d7e3f2628c6cf57e2':
build: add logd
Doug Zongker [Fri, 21 Feb 2014 18:35:34 +0000 (10:35 -0800)]
am
ae91ab79: Merge "add --block flag to ota_from_target_files"
* commit '
ae91ab79515cb0e2ee7b7d8584b26bcbef159841':
add --block flag to ota_from_target_files
Ying Wang [Fri, 21 Feb 2014 18:35:33 +0000 (10:35 -0800)]
am
21bcdbc8: am
a5e79db0: am
f9538ea6: Merge "Add missing s to mips."
* commit '
21bcdbc8ba864dcda110451b957ea4db0c469d48':
Add missing $(combo_2nd_arch_prefix)s to mips.
Geremy Condra [Fri, 21 Feb 2014 18:35:32 +0000 (10:35 -0800)]
am
d75d7128: Merge "Add support for block incremental OTAs"
* commit '
d75d7128cec052beb13376c711082ee68bb45b0a':
Add support for block incremental OTAs
Steve Moyer [Fri, 21 Feb 2014 18:35:32 +0000 (10:35 -0800)]
am
ffe0beeb: Merge "Combine emulator test projects into a single apk"
* commit '
ffe0beeb1b1f78e7f34ca43ec67f543c810ad4e2':
Combine emulator test projects into a single apk
Doug Zongker [Fri, 21 Feb 2014 18:35:31 +0000 (10:35 -0800)]
am
e3220585: img_from_target_files doesn\'t need releasetools extensions
* commit '
e3220585421bf5af99e1e3f8cf3bf567ef2a5dd9':
img_from_target_files doesn't need releasetools extensions
Doug Zongker [Fri, 21 Feb 2014 18:35:30 +0000 (10:35 -0800)]
am
4abfeaa3: Merge "rebuild recovery patch in sign_target_files_apks"
* commit '
4abfeaa3584bdf54249fdd14fd6f4c24effa9ec9':
rebuild recovery patch in sign_target_files_apks
Ying Wang [Fri, 21 Feb 2014 18:35:29 +0000 (10:35 -0800)]
am
3c5f698c: am
21ec64b1: am
5aa50c66: Merge "Fix x86 config file to support 2nd ARCH build"
* commit '
3c5f698cea2fd8ff7b96dfe64c250c4e5c96fc98':
Fix x86 config file to support 2nd ARCH build
Ying Wang [Fri, 21 Feb 2014 18:35:28 +0000 (10:35 -0800)]
am
315522ec: am
32e93384: am
3d9c1c1a: Merge "Switch x86_64 to gcc-4.8"
* commit '
315522ec29b778e37e8d090200bd9611085f9573':
Switch x86_64 to gcc-4.8
Colin Cross [Fri, 21 Feb 2014 18:35:28 +0000 (10:35 -0800)]
am
eb6a4365: am
c798836a: am
4febec12: Merge "x86: set -msse2 for all builds"
* commit '
eb6a43654edcb9acbf0480406590ed86a6b0f8c6':
x86: set -msse2 for all builds
Stephen Hines [Fri, 21 Feb 2014 18:35:27 +0000 (10:35 -0800)]
am
a0d13d81: am
515f379f: am
f1ad4d2d: Merge "Add bcc to the list of PRODUCT_PACKAGES to install."
* commit '
a0d13d81d6f16f950930a3b584fc82134366d682':
Add bcc to the list of PRODUCT_PACKAGES to install.
Ying Wang [Fri, 21 Feb 2014 18:35:26 +0000 (10:35 -0800)]
am
8918bf6f: am
f1339406: am
0c0a4ce8: Remove the default sdk.atree if custom one is set.
* commit '
8918bf6f2f84c2f8be4e686eb39580c8cd35287e':
Remove the default sdk.atree if custom one is set.
Doug Zongker [Fri, 21 Feb 2014 18:35:25 +0000 (10:35 -0800)]
am
211213f5: Merge "bump releasetools python requirement to 2.7"
* commit '
211213f561def31a1016a637b90c388fcd80eba2':
bump releasetools python requirement to 2.7
Ying Wang [Fri, 21 Feb 2014 18:35:24 +0000 (10:35 -0800)]
am
6d5ca9f4: am
52cefc36: resolved conflicts for merge of
6ca56b6a to klp-modular-dev-plus-aosp
* commit '
6d5ca9f46bbb3e06a69e1b6465d4fa969fb2ed77':
Make the module existence check nonfatal
Narayan Kamath [Fri, 21 Feb 2014 18:35:24 +0000 (10:35 -0800)]
am
0158f8f7: am
0003192c: am
2bea94ba: Merge "Fix up android.core CTS tests."
* commit '
0158f8f71c78caa0ff8c02ddc2d6698cc90214dd':
Fix up android.core CTS tests.
Narayan Kamath [Fri, 21 Feb 2014 18:35:23 +0000 (10:35 -0800)]
am
21f1d958: am
2a1a308f: (-s ours) am
70a4a6a3: Merge "changing the rules following java package renaming for external/apache-harmony."
* commit '
21f1d95870467a8ec2fc2be274f16eba6daa82df':
changing the rules following java package renaming for external/apache-harmony.
Narayan Kamath [Fri, 21 Feb 2014 18:35:22 +0000 (10:35 -0800)]
am
7ad6f5f7: am
35513f4c: (-s ours) am
d4dc88b0: Merge "Adding apache-harmony to cts."
* commit '
7ad6f5f76bf1dc61145bc67e7c62046b96e59280':
Adding apache-harmony to cts.
Narayan Kamath [Fri, 21 Feb 2014 18:35:21 +0000 (10:35 -0800)]
am
129be820: am
6b835426: (-s ours) am
92e99b12: Merge "add jsr166 tests to cts. Bug:
10390711"
* commit '
129be8209111834f8ab1a49b1c0e78c25031ecc9':
add jsr166 tests to cts. Bug:
10390711
Dirk Dougherty [Fri, 21 Feb 2014 18:35:20 +0000 (10:35 -0800)]
am
5f977bb9: am
bdaf9012: am
98756f3b: am
8a56079c: am
5c92d966: am
541b4941: New temporary templates set for dynamic content support.
* commit '
5f977bb9e122e0ca884a7c14377af449a064cc18':
New temporary templates set for dynamic content support.
Stephen Hines [Fri, 21 Feb 2014 18:35:20 +0000 (10:35 -0800)]
am
4dcf3dbf: Merge "Switch to Clang 3.4 prebuilts."
* commit '
4dcf3dbf08c2c1de4d8bc030c3a8af81406e5934':
Switch to Clang 3.4 prebuilts.
Ying Wang [Fri, 21 Feb 2014 18:35:18 +0000 (10:35 -0800)]
am
c86ea72c: am
595e1f46: am
872d3c2c: Merge "gettop: fix symlink detection"
* commit '
c86ea72cbf25d7d7b058c074d025ce8ce8f63177':
gettop: fix symlink detection
Stephen Hines [Fri, 21 Feb 2014 18:35:18 +0000 (10:35 -0800)]
am
34c6ac77: am
c4206df9: am
051e28fe: Merge "Fix incorrect x86 build rules."
* commit '
34c6ac77c2a5cdca707ba44587c7e90eac257992':
Fix incorrect x86 build rules.
Torne (Richard Coles) [Fri, 21 Feb 2014 18:35:17 +0000 (10:35 -0800)]
am
f93beb21: Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."
* commit '
f93beb2167728c8a3ce549074db01d37e9786458':
Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS.
Ying Wang [Fri, 21 Feb 2014 18:35:15 +0000 (10:35 -0800)]
am
d3579f4e: Merge "Add a dummy build recipe for the proto generated header files"
* commit '
d3579f4ee0135f0a9636adb963704cc8d5c041e1':
Add a dummy build recipe for the proto generated header files
Colin Cross [Fri, 21 Feb 2014 18:35:13 +0000 (10:35 -0800)]
Colin Cross [Fri, 21 Feb 2014 18:35:12 +0000 (10:35 -0800)]
am
b01233f2: am
a0eb50ac: resolved conflicts for merge of
2fbe5018 to klp-modular-dev-plus-aosp
* commit '
b01233f26f8d4a028ac1def2330005c3dade070a':
add linker64 and debuggerd64 to all products
Colin Cross [Fri, 21 Feb 2014 18:35:12 +0000 (10:35 -0800)]
am
59320c13: am
9b2077d4: am
3bbaab31: Merge changes I2514f66f,I71fed98d
* commit '
59320c13748be94db4267a26f43fe26dcf6938a2':
support LOCAL_MODULE_TARGET_ARCH for prebuilts
Add generated sources dir to the default include path
Ying Wang [Fri, 21 Feb 2014 18:35:11 +0000 (10:35 -0800)]
am
1fd8265d: am
1e8fec5b: am
e2f06adb: Merge "Don\'t check the existence for the 64-bit modules for 32-bit SDK build."
* commit '
1fd8265d1a1a48d8c1805553669bbefb32956deb':
Don't check the existence for the 64-bit modules for 32-bit SDK build.
Colin Cross [Fri, 21 Feb 2014 18:35:10 +0000 (10:35 -0800)]
am
25d84aa3: am
4048cf3a: am
7ea5cd95: Merge "don\'t use LOCAL_*_arch for host builds"
* commit '
25d84aa38f79f40df54a0a4e75b3e89253a4b332':
don't use LOCAL_*_arch for host builds
Colin Cross [Fri, 21 Feb 2014 18:35:10 +0000 (10:35 -0800)]
am
59dc65a2: am
481fed17: am
f10efbc1: Merge "make 64-bit builds into multiarch builds"
* commit '
59dc65a28a6e33e518006ec6c7edaa1971a1c2a7':
make 64-bit builds into multiarch builds
Ying Wang [Fri, 21 Feb 2014 18:35:09 +0000 (10:35 -0800)]
am
ca389b90: am
5768ac91: am
5c7039fb: Merge "Remove dead code."
* commit '
ca389b9048c0273d34e495809986441803f35d28':
Remove dead code.
Colin Cross [Fri, 21 Feb 2014 18:35:04 +0000 (10:35 -0800)]
am
84a20ac1: am
2c32144b: resolved conflicts for merge of
7cd7bd65 to klp-modular-dev-plus-aosp
* commit '
84a20ac12e07109f5682d77a131f25995f7c2d0e':
HACK: add 64-bit directory blacklist
add support for module supported or unsupported target architectures
Ying Wang [Fri, 21 Feb 2014 18:35:04 +0000 (10:35 -0800)]
am
0a60bdf5: am
0b7197a6: am
cd958154: Merge "Refactor a little bit and do the validation on also default.prop."
* commit '
0a60bdf59a5c4eb3a07bee913855c85f8cde8731':
Refactor a little bit and do the validation on also default.prop.
Ying Wang [Fri, 21 Feb 2014 18:35:03 +0000 (10:35 -0800)]
am
53d2ca07: am
4170e2be: am
fd841351: Merge "Support custom sdk.atree files." into klp-modular-dev
* commit '
53d2ca071334ed327ab084c28321a96cde0dad33':
Support custom sdk.atree files.
Ying Wang [Fri, 21 Feb 2014 18:35:02 +0000 (10:35 -0800)]
am
3afdef2e: 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 '
3afdef2ef04bcef5a7af679e554b7f5988f44a61':
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 [Fri, 21 Feb 2014 18:35:01 +0000 (10:35 -0800)]
am
e6a65a5f: resolved conflicts for merge of
b6d53f0b to master
* commit '
e6a65a5f15695f4e601110979dc6861773c3444d':
Clean up dangling module names
Ying Wang [Fri, 21 Feb 2014 18:35:00 +0000 (10:35 -0800)]
am
6336d6bf: am
1968f286: am
b12cce10: Merge "Refine module name resolving in multilib build"
* commit '
6336d6bf07f0c43f1675cbd99a887e572b4625e8':
Refine module name resolving in multilib build
Elliott Hughes [Fri, 21 Feb 2014 18:34:59 +0000 (10:34 -0800)]
am
a0945a24: am
1e317e77: am
993ffb80: Merge "Add all-S-files-under."
* commit '
a0945a24f9234cd3929d89e0f02a1e8d066d4124':
Add all-S-files-under.
Scott Main [Fri, 21 Feb 2014 18:34:58 +0000 (10:34 -0800)]
am
3634c0df: am
0ed897d0: am
83aeb2f9: am
e2652df8: am
22866695: am
2c2c0534: set a smaller line height for sidebox headers to avoid whitespace at the top
* commit '
3634c0dfc150ce8270bf9e733f579548734e6be8':
set a smaller line height for sidebox headers to avoid whitespace at the top
Colin Cross [Fri, 21 Feb 2014 18:34:58 +0000 (10:34 -0800)]
am
ce04c505: am
d121d417: am
90ed06ef: Merge "fix 2nd target clang prebuilt paths"
* commit '
ce04c505a0aafc0d430efb9e119526c9ac35630d':
fix 2nd target clang prebuilt paths
Ying Wang [Fri, 21 Feb 2014 18:34:57 +0000 (10:34 -0800)]
am
1eba3c14: am
484c7dec: am
ba46260f: Merge "Runtime resource overlay, iteration 2"
* commit '
1eba3c14c760d89150f68141f708621dd46d69bd':
Runtime resource overlay, iteration 2
Justin Koh [Fri, 21 Feb 2014 18:34:56 +0000 (10:34 -0800)]
am
f26c96ed: resolved conflicts for merge of
34cb6460 to master
* commit '
f26c96edc5ce0d67f9dc35c95eea91ab92ea9c64':
Change core_tiny to not be minimal font footprint.
Steve Moyer [Fri, 21 Feb 2014 18:34:55 +0000 (10:34 -0800)]
am
60250d42: Merge "Adding SmsTest to sdk build"
* commit '
60250d42a11a6e97366843d4940cde2c010027fa':
Adding SmsTest to sdk build
Dianne Hackborn [Fri, 21 Feb 2014 18:34:55 +0000 (10:34 -0800)]
am
fc021daa: Fix issue #
12939338: Android version showing as \'KKWT\'
* commit '
fc021daaca11917888ed941ee0ea1877965d437b':
Fix issue #
12939338: Android version showing as 'KKWT'
David 'Digit' Turner [Fri, 21 Feb 2014 18:34:54 +0000 (10:34 -0800)]
am
35cfe9e8: am
cc57457c: am
145562fc: Merge "Add missing font files to SDK system images."
* commit '
35cfe9e8af0699236a422f3139860c53d97f65b7':
Add missing font files to SDK system images.
Ying Wang [Fri, 21 Feb 2014 18:34:53 +0000 (10:34 -0800)]
am
a87489b5: am
74b71317: am
2d72094f: am
960d919e: resolved conflicts for merge of
4df82b3e to klp-dev-plus-aosp
* commit '
a87489b5c2a8fe32aaf3c7b86e4dd8a2945085a0':
Allow proguarding the main app and the test app in a single run.
Ben Cheng [Fri, 21 Feb 2014 18:34:52 +0000 (10:34 -0800)]
am
2ad7d4df: am
7495e68a: am
6c5d8976: Merge "Refreshed gcc predefines __ANDROID__"
* commit '
2ad7d4df0746e7e16fd3cc39d14fa352801abcae':
Refreshed gcc predefines __ANDROID__
Ying Wang [Fri, 21 Feb 2014 18:34:51 +0000 (10:34 -0800)]
am
956cd054: am
34afc565: am
5cc7f8a7: Merge "Select the arch_variant_cflags for the 2nd arch."
* commit '
956cd054683308b3de25401e64dfc8abda795de9':
Select the arch_variant_cflags for the 2nd arch.
Ying Wang [Fri, 21 Feb 2014 18:34:50 +0000 (10:34 -0800)]
am
30d8e12c: resolved conflicts for merge of
d616a73d to master
* commit '
30d8e12c87bc6232a786a6f66d2e2aee2e95fa1a':
Refactor llvm_config.mk and support the 2nd arch
Colin Cross [Fri, 21 Feb 2014 18:34:50 +0000 (10:34 -0800)]
am
e3ae5a46: am
ddd7c919: am
5e9a2033: Merge "don\'t rename 32-bit packages to *_32"
* commit '
e3ae5a467799f063ebdcfe85786b0f625a30d4ad':
don't rename 32-bit packages to *_32
Elliott Hughes [Fri, 21 Feb 2014 18:34:49 +0000 (10:34 -0800)]
am
3e3cde55: am
4d5fa510: am
8b20d5b9: Merge "Turn 64-bit-related warnings into errors on 64-bit builds."
* commit '
3e3cde556f30547e66638f89a4c3ce04b60b73cc':
Turn 64-bit-related warnings into errors on 64-bit builds.
Elliott Hughes [Fri, 21 Feb 2014 18:34:48 +0000 (10:34 -0800)]
am
77f88ce0: am
3f040869: am
efb9603a: Merge "[MIPS64] Add mips64 target"
* commit '
77f88ce0da4aedad4b095852432ae60fa8160eda':
[MIPS64] Add mips64 target
Ying Wang [Fri, 21 Feb 2014 18:34:44 +0000 (10:34 -0800)]
am
dd22aee1: am
69c3f457: am
dc7fee9f: Set up rules to merge AndroidManifest.xmls
* commit '
dd22aee1f4e7acf935cc640fb5ec4fca8db721c1':
Set up rules to merge AndroidManifest.xmls
Andreas Huber [Fri, 21 Feb 2014 18:34:43 +0000 (10:34 -0800)]
am
a42d3a48: fix the build, libstagefright_chromium_http is no longer needed.
* commit '
a42d3a4865785f75da449f6dc28f7d9054ea2418':
fix the build, libstagefright_chromium_http is no longer needed.
Christopher Ferris [Fri, 21 Feb 2014 18:34:42 +0000 (10:34 -0800)]
am
5d8ee715: am
6d0899ea: am
afbbce3f: Merge "Add library test makefile solutions."
* commit '
5d8ee7150668cf3c0c034ff42d1a8f43cca7aa8b':
Add library test makefile solutions.
Colin Cross [Fri, 21 Feb 2014 18:34:41 +0000 (10:34 -0800)]
am
98255dc9: am
d69ed2e2: am
054b0274: Merge topic \'arm64\'
* commit '
98255dc988ad51bb900ff5cd2571071e120d0080':
add support for more LOCAL_*_arch variables
don't rename 32-bit executables to *_32
remove 2nd arch from ARCH_ARM_* defines
Colin Cross [Fri, 21 Feb 2014 18:34:41 +0000 (10:34 -0800)]
am
96870b3e: am
dc5249ab: am
717de0f5: Merge "Fix installing 2nd arch shared libraries"
* commit '
96870b3eb448fe4817b6ad9a12b409b318d58d2e':
Fix installing 2nd arch shared libraries
Ying Wang [Fri, 21 Feb 2014 18:34:40 +0000 (10:34 -0800)]
Ying Wang [Fri, 21 Feb 2014 18:34:39 +0000 (10:34 -0800)]
am
d89ffa86: Fix emulator builds
* commit '
d89ffa8623b750f85cbb8be01aba9fa4a9448180':
Fix emulator builds
Adam Lesinski [Fri, 21 Feb 2014 18:34:38 +0000 (10:34 -0800)]
am
9cee77b3: am
bebb2b54: am
7b734fd8: Merge "Allow multiple asset directories in aapt" into klp-modular-dev
* commit '
9cee77b3704eaeee30b724590fe62ad5a8305339':
Allow multiple asset directories in aapt
Justin Koh [Fri, 21 Feb 2014 18:34:38 +0000 (10:34 -0800)]
am
19753f45: am
bbfebfad: resolved conflicts for merge of
303d2755 to klp-modular-dev-plus-aosp
* commit '
19753f458bc5ec546f4c5bb304072a53b4f9357f':
Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT.
Doug Zongker [Fri, 21 Feb 2014 18:34:37 +0000 (10:34 -0800)]
am
01ce19c9: make full OTAs block based
* commit '
01ce19c95f358ac8ef9bb939d2637ac976320401':
make full OTAs block based
Doug Zongker [Fri, 21 Feb 2014 18:34:36 +0000 (10:34 -0800)]
am
c9253822: add recovery update code to system images
* commit '
c9253822ea31c1d35d3fc2b495b45b476c240a1d':
add recovery update code to system images
Tim Murray [Fri, 21 Feb 2014 18:34:36 +0000 (10:34 -0800)]
am
e858190f: am
47f9b9bc: am
5352018b: Merge "Add new rs directory to list of Java subdirs of fw/base."
* commit '
e858190fc4bb0f7390efa232c963e8669adac4c8':
Add new rs directory to list of Java subdirs of fw/base.
Ying Wang [Fri, 21 Feb 2014 18:34:35 +0000 (10:34 -0800)]
am
8647c336: am
1446cf93: am
a77456b8: Merge "Dedup the targets and dependencies of required modules."
* commit '
8647c3366f6c6679aab1a3a1073392a9f6794335':
Dedup the targets and dependencies of required modules.
Ying Wang [Fri, 21 Feb 2014 18:34:34 +0000 (10:34 -0800)]
am
fc330375: Dedup the targets and dependencies of required modules.
* commit '
fc33037547495aa21b25216d360b27a7100e2a42':
Dedup the targets and dependencies of required modules.
Noreen Tolland [Fri, 21 Feb 2014 18:34:33 +0000 (10:34 -0800)]
am
d76bb175: am
4b69be27: (-s ours) am
c816e061: Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev
* commit '
d76bb1755d843f90525a22c191938037cf87a7a1':
(DO NOT MERGE) Revert "Make libart the default runtime"
Ben Cheng [Fri, 21 Feb 2014 18:34:33 +0000 (10:34 -0800)]
am
bc80daff: am
09c9881f: am
5608a8c6: Merge "Add 64-bit gdbclients."
* commit '
bc80daffee89269c491680ceb0ba29f84dd0fab0':
Add 64-bit gdbclients.
Brian Carlstrom [Fri, 21 Feb 2014 18:34:32 +0000 (10:34 -0800)]
am
7468e276: am
03c16a30: am
aae47044: Merge "CleanSpec for
49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
7468e2767695c2736f4e1095e1f3579651ba4974':
CleanSpec for
49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default
Brian Carlstrom [Fri, 21 Feb 2014 18:34:31 +0000 (10:34 -0800)]
am
5b40a0bd: am
a15fc8fd: am
601d39b6: Merge "build: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
5b40a0bd02d270b03fd8ac6d76ad8e2d53db84ea':
Brian Carlstrom [Fri, 21 Feb 2014 18:29:55 +0000 (10:29 -0800)]
resolved conflicts for merge of
966611a9 to master-nova
Change-Id: Iefe66d7b0bc604460ab18228233ec61c98490b8a
Ian Rogers [Fri, 21 Feb 2014 18:08:29 +0000 (10:08 -0800)]
am
69968b8c: am
1fee45f1: am
e854276d: Merge "Disable WITH_HOST_DALVIK on 64bit host builds."
* commit '
69968b8c5762a8c7f6127f4aa667b8e8498c5102':
Narayan Kamath [Fri, 21 Feb 2014 18:08:28 +0000 (10:08 -0800)]
am
7201cdef: am
b1aec05a: am
ad9209ad: Merge "Define __STDC_FORMAT_MACROS on Windows host builds."
* commit '
7201cdef712a8ff12313de746eb8b0dd4fd8ff51':
Colin Cross [Fri, 21 Feb 2014 18:08:27 +0000 (10:08 -0800)]
am
8c28b594: am
6a7699d5: am
a8e6166f: Merge "build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY"
* commit '
8c28b594d9367e43243cd1d014d57204d934539d':
Colin Cross [Fri, 21 Feb 2014 18:08:26 +0000 (10:08 -0800)]
am
92ef2b3d: am
df313a04: am
2dcaf9f4: Merge "build: support LOCAL_*_32 and LOCAL_*_64"
* commit '
92ef2b3d5b59e7db46bef3ce48b37fa7afafab2b':
Ian Rogers [Fri, 21 Feb 2014 18:08:25 +0000 (10:08 -0800)]
am
0e0b880c: am
eb02fa0a: am
805cb8fa: Merge "Fix the host inttypes.h problem globally."
* commit '
0e0b880c4bf89ff45143e549227e701b6b39958d':
Brian Carlstrom [Fri, 21 Feb 2014 18:08:24 +0000 (10:08 -0800)]
am
8bc31b6d: am
d4e29f52: am
cece05e2: Merge "Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default"
* commit '
8bc31b6d1479b75ecd1b9fc6080529397e067158':
Nick Vaccaro [Fri, 21 Feb 2014 18:08:23 +0000 (10:08 -0800)]
am
2422e761: am
ec0c99a6: Add atrace for supporting systrace tool
* commit '
2422e76192821fb1f14d079de612ea2c5fe9aeae':
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"
Baligh Uddin [Thu, 12 Dec 2013 21:50:41 +0000 (13:50 -0800)]
Add the Telecomm entry in core.mk
Santos Cordon [Wed, 18 Dec 2013 04:26:30 +0000 (20:26 -0800)]
Adding telecomm to build src path for framework.
Change-Id: I36a7df9ed30c949241cc19dd67994883db68394f
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