git.osdn.net Git - android-x86/build.git/log

Ying Wang [Mon, 12 May 2014 23:27:46 +0000 (23:27 +0000)]

am 6a37681b: am 557282db: am 332bbced: am a8d273d3: am bbe5f88e: Merge "Conditionally include the \'samplecode\' rules."

* commit '6a37681b7bb4ef2eb85ca11b6d98b5936c259da3':

commit | commitdiff | tree

Torne (Richard Coles) [Mon, 12 May 2014 23:27:45 +0000 (23:27 +0000)]

am 0d9bb26c: am 62e30dcf: am 64cd1218: am e665992c: am 63002088: Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."

* commit '0d9bb26c88e56057979da07a4ffb55eb6f8cafb6':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:27:44 +0000 (23:27 +0000)]

am cf037970: am 33fb2093: am 948c22b4: am 2aeff455: am 66331624: Merge "Fix prebuilt library dependency for multilib build"

* commit 'cf0379704483c80584c2687fbf55fd1a05924143':

commit | commitdiff | tree

Elliott Hughes [Mon, 12 May 2014 23:27:43 +0000 (23:27 +0000)]

am 2241d156: am eab6de4e: am 1615a101: am 4a122c96: am 9dba192b: Merge "oprofile/daemon doesn\'t build for x86_64."

* commit '2241d1564f408594f9162744138114d40a5edc42':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:27:42 +0000 (23:27 +0000)]

am af93f558: am a914a0d7: am 08842ae7: am 12c909b2: resolved conflicts for merge of 9057f619 to klp-modular-dev-plus-aosp

* commit 'af93f5585e2301b1828874d1abef94e521119379':

commit | commitdiff | tree

Elliott Hughes [Mon, 12 May 2014 23:27:30 +0000 (23:27 +0000)]

am 2f59df65: am 9a1a9331: am 9f3e1d78: am 331272f9: am 25b55485: Merge "Take libcore off the LP64 blacklist."

* commit '2f59df656662c86e380b19fab32e5bb5f04a7347':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:27:29 +0000 (23:27 +0000)]

am 859e37ef: am aeab26e9: am 31dab4c4: am 4a0b06e8: am f1ff3abd: Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir"

* commit '859e37ef957f8c97cb23bdec75213945033d80fe':

commit | commitdiff | tree

Nick Kralevich [Mon, 12 May 2014 23:27:28 +0000 (23:27 +0000)]

am 91a8c1cc: am b4f4dc96: am 61b71bb2: am b8d792d7: am e7154870: Merge "Move qemud and /dev/qemu policy bits to emulator-specific sepolicy."

* commit '91a8c1cc7ff23040d784dfd2f5054e86ee2c2bd5':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:27:27 +0000 (23:27 +0000)]

am 2c7e8ce5: am 2bc6328f: am ead8944e: Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir

* commit '2c7e8ce5aecf72d5971e8eb1dc649ad4ebc2fd02':

commit | commitdiff | tree

Tsu Chiang Chuang [Mon, 12 May 2014 23:27:21 +0000 (23:27 +0000)]

am 603fc3af: am 43d52485: add exception to be able to build emulator_tests in conjunction with the sdk.

* commit '603fc3af00cb68b439df01db89a92298ab9aa967':

commit | commitdiff | tree

Nicolas Prevot [Mon, 12 May 2014 23:27:19 +0000 (23:27 +0000)]

am b4b81dc6: am c1b2536f: Making ManagedProvisioning present in all phones/tablets.

* commit 'b4b81dc631a658616e04e58755c7039858a858ec':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:27:18 +0000 (23:27 +0000)]

am 77eb2e9e: am 0fad5669: am 4a2e083f: am 0e0c4879: Merge "generic_x86: toggle 64bit binder ABI"

* commit '77eb2e9e87c78ebe794b01e6a9c4df3b1e58eb8a':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:27:17 +0000 (23:27 +0000)]

am 2f19f1a3: am d4fe0bdf: am 9b996f80: am eb9b62e0: Merge "Make -rpath-link work with multilib."

* commit '2f19f1a30710c7ab02f80be2c5e41c45f6c87700':

commit | commitdiff | tree

Tim Murray [Mon, 12 May 2014 23:27:17 +0000 (23:27 +0000)]

am 02546dcf: am 25c67db7: am 64fa69d1: am 254a88b9: Merge "Switch to LLVM 3.4 prebuilts in AOSP."

* commit '02546dcf157474d5598db1754acc66f8d23da983':

commit | commitdiff | tree

Colin Cross [Mon, 12 May 2014 23:27:16 +0000 (23:27 +0000)]

am 9b49247e: am 9d82efbc: am 6da37a0f: am b3bc6136: Merge "arm64: don\'t build emulator"

* commit '9b49247ed73b7dbc2408a10f81e889570eafd0c2':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:27:15 +0000 (23:27 +0000)]

am 506526f6: am 28edfe16: am 0c9c0bfc: am 9aadde67: Merge "Include in upper-level makefiles"

* commit '506526f6fa0380b99d1f2bf9aa003a5c05cdc975':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:27:13 +0000 (23:27 +0000)]

am 893de932: am 039107aa: am e9bb9870: am 9335001d: Merge "Strip all symbols on x86"

* commit '893de9323e4cf0fab30754ac0d87e46f51bc31f6':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:27:12 +0000 (23:27 +0000)]

am eb63b94d: am 0e53834b: am fab0fe3b: am e72beb53: Merge "Remove dead code."

* commit 'eb63b94d67ccef862d161686042d3c01fb53373d':

commit | commitdiff | tree

Mark Salyzyn [Mon, 12 May 2014 23:27:09 +0000 (23:27 +0000)]

am c4aefc57: am 5bcb2c86: Merge "build: add logd"

* commit 'c4aefc576b17fcb85dc3acb3173908262f6db00d':

commit | commitdiff | tree

Doug Zongker [Mon, 12 May 2014 23:27:07 +0000 (23:27 +0000)]

am c63ebd49: am ae91ab79: Merge "add --block flag to ota_from_target_files"

* commit 'c63ebd49e1311f364c4eacc631f412153b555bf2':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:27:04 +0000 (23:27 +0000)]

am f92567d5: am 21bcdbc8: am a5e79db0: am f9538ea6: Merge "Add missing s to mips."

* commit 'f92567d5490e4e031faa27bbb6c5d79a4ff3ac6d':

commit | commitdiff | tree

Geremy Condra [Mon, 12 May 2014 23:27:02 +0000 (23:27 +0000)]

am c92c8384: am d75d7128: Merge "Add support for block incremental OTAs"

* commit 'c92c8384065bfadc6523f7acf910fea6a0b444d9':

commit | commitdiff | tree

Steve Moyer [Mon, 12 May 2014 23:27:00 +0000 (23:27 +0000)]

am 3026a603: am ffe0beeb: Merge "Combine emulator test projects into a single apk"

* commit '3026a6038b525a687a7a428f94c72a189235eb5e':

commit | commitdiff | tree

Doug Zongker [Mon, 12 May 2014 23:26:59 +0000 (23:26 +0000)]

am 4b95abc9: am e3220585: img_from_target_files doesn\'t need releasetools extensions

* commit '4b95abc964dc112b743367781117e9669af2c115':

commit | commitdiff | tree

Doug Zongker [Mon, 12 May 2014 23:26:58 +0000 (23:26 +0000)]

am 79bef9c5: am 4abfeaa3: Merge "rebuild recovery patch in sign_target_files_apks"

* commit '79bef9c5ac0d045b0674e4daf0d9e8adf96a9ff4':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:26:57 +0000 (23:26 +0000)]

am 5e7cc1e7: am 3c5f698c: am 21ec64b1: am 5aa50c66: Merge "Fix x86 config file to support 2nd ARCH build"

* commit '5e7cc1e7cf8f3db11da785bc99de3b3a16e52e72':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:26:56 +0000 (23:26 +0000)]

am 4bbb6e07: am 315522ec: am 32e93384: am 3d9c1c1a: Merge "Switch x86_64 to gcc-4.8"

* commit '4bbb6e07b8766d2f460c36d7da6b4806a8b25b26':

commit | commitdiff | tree

Colin Cross [Mon, 12 May 2014 23:26:55 +0000 (23:26 +0000)]

am 4726f7f2: am eb6a4365: am c798836a: am 4febec12: Merge "x86: set -msse2 for all builds"

* commit '4726f7f296856cb0e6906f97e538bd342d41c58c':

commit | commitdiff | tree

Stephen Hines [Mon, 12 May 2014 23:26:54 +0000 (23:26 +0000)]

am f5ebc164: am a0d13d81: am 515f379f: am f1ad4d2d: Merge "Add bcc to the list of PRODUCT_PACKAGES to install."

* commit 'f5ebc164edf64e5b48caed61ac2effdf9ebf30a4':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:26:53 +0000 (23:26 +0000)]

am b8c3f9a6: am 8918bf6f: am f1339406: am 0c0a4ce8: Remove the default sdk.atree if custom one is set.

* commit 'b8c3f9a667724135dc7d9caefc321bf06a286505':

commit | commitdiff | tree

Doug Zongker [Mon, 12 May 2014 23:26:52 +0000 (23:26 +0000)]

am 6fe36d91: am 211213f5: Merge "bump releasetools python requirement to 2.7"

* commit '6fe36d91c82a7a3a94a3597b479e7023ebed4412':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:26:45 +0000 (23:26 +0000)]

am f987dd22: am 6d5ca9f4: am 52cefc36: resolved conflicts for merge of 6ca56b6a to klp-modular-dev-plus-aosp

* commit 'f987dd22ead5bc4400fa3cb552b0034e0696605f':

commit | commitdiff | tree

Narayan Kamath [Mon, 12 May 2014 23:26:44 +0000 (23:26 +0000)]

am d809e1d4: am 0158f8f7: am 0003192c: am 2bea94ba: Merge "Fix up android.core CTS tests."

* commit 'd809e1d48a00352ccc2227843c57673d013996cb':

commit | commitdiff | tree

Narayan Kamath [Mon, 12 May 2014 23:26:43 +0000 (23:26 +0000)]

am 1886cb5c: am 21f1d958: am 2a1a308f: (-s ours) am 70a4a6a3: Merge "changing the rules following java package renaming for external/apache-harmony."

* commit '1886cb5cb0c0d6ad3467fc769d302fadc902d82f':

commit | commitdiff | tree

Narayan Kamath [Mon, 12 May 2014 23:26:42 +0000 (23:26 +0000)]

am 6f980d49: am 7ad6f5f7: am 35513f4c: (-s ours) am d4dc88b0: Merge "Adding apache-harmony to cts."

* commit '6f980d4960009f0bd4002abe1b84e9e7efeddab1':

commit | commitdiff | tree

Narayan Kamath [Mon, 12 May 2014 23:26:41 +0000 (23:26 +0000)]

am b016794c: am 129be820: am 6b835426: (-s ours) am 92e99b12: Merge "add jsr166 tests to cts. Bug: 10390711"

* commit 'b016794c22b4eff712ddd531a3d9149f9a695a9f':

commit | commitdiff | tree

Dirk Dougherty [Mon, 12 May 2014 23:26:40 +0000 (23:26 +0000)]

am a5fd8060: am 5f977bb9: am bdaf9012: am 98756f3b: am 8a56079c: am 5c92d966: am 541b4941: New temporary templates set for dynamic content support.

* commit 'a5fd806093b4aad2abad6827b2ec16f13bd3b135':

commit | commitdiff | tree

Stephen Hines [Mon, 12 May 2014 23:26:39 +0000 (23:26 +0000)]

am 42b916f4: am 4dcf3dbf: Merge "Switch to Clang 3.4 prebuilts."

* commit '42b916f43585f399fc8aa4a02e56ea2461645d19':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:26:38 +0000 (23:26 +0000)]

am c2c25c14: am c86ea72c: am 595e1f46: am 872d3c2c: Merge "gettop: fix symlink detection"

* commit 'c2c25c14b80013ed89b5566c4e2578ed6c94d9c2':

commit | commitdiff | tree

Stephen Hines [Mon, 12 May 2014 23:26:37 +0000 (23:26 +0000)]

am 0aab0002: am 34c6ac77: am c4206df9: am 051e28fe: Merge "Fix incorrect x86 build rules."

* commit '0aab000240fbf8ad09a77495787cd0380e9f5d8a':

commit | commitdiff | tree

Torne (Richard Coles) [Mon, 12 May 2014 23:26:36 +0000 (23:26 +0000)]

am 998880e6: am f93beb21: Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."

* commit '998880e6d84cc8275bf4150dbcbda90881f2adc6':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:26:35 +0000 (23:26 +0000)]

am bc791901: am d3579f4e: Merge "Add a dummy build recipe for the proto generated header files"

* commit 'bc7919015316616f3b63b3a1d8bcf494c8a13235':

commit | commitdiff | tree

Colin Cross [Mon, 12 May 2014 23:26:34 +0000 (23:26 +0000)]

am 51c86ef6: am 349e915d: am cb241895: am a9baf879: Merge "fix build"

* commit '51c86ef672707d65a76189401c7a320609aabe10':

commit | commitdiff | tree

Colin Cross [Mon, 12 May 2014 23:26:33 +0000 (23:26 +0000)]

am 208c465f: am b01233f2: am a0eb50ac: resolved conflicts for merge of 2fbe5018 to klp-modular-dev-plus-aosp

* commit '208c465f056b71784a090a0485bbd235cad81224':

commit | commitdiff | tree

Colin Cross [Mon, 12 May 2014 23:26:32 +0000 (23:26 +0000)]

am a2b8199b: am 59320c13: am 9b2077d4: am 3bbaab31: Merge changes I2514f66f,I71fed98d

* commit 'a2b8199b64b2eef8027e9d61749f44a89195badd':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:26:31 +0000 (23:26 +0000)]

am 01d8b2aa: am 1fd8265d: am 1e8fec5b: am e2f06adb: Merge "Don\'t check the existence for the 64-bit modules for 32-bit SDK build."

* commit '01d8b2aa978ea99e568b4869da389f9a01a76c2a':

commit | commitdiff | tree

Colin Cross [Mon, 12 May 2014 23:26:30 +0000 (23:26 +0000)]

am 581f49a4: am 25d84aa3: am 4048cf3a: am 7ea5cd95: Merge "don\'t use LOCAL_*_arch for host builds"

* commit '581f49a48cceb0a9c70b664d20d7ad2cd9d6eae5':

commit | commitdiff | tree

Colin Cross [Mon, 12 May 2014 23:26:29 +0000 (23:26 +0000)]

am e6e26a21: am 59dc65a2: am 481fed17: am f10efbc1: Merge "make 64-bit builds into multiarch builds"

* commit 'e6e26a216cd69118e968d90f95d9d77ca9cd16aa':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:26:28 +0000 (23:26 +0000)]

am 0eade90a: am ca389b90: am 5768ac91: am 5c7039fb: Merge "Remove dead code."

* commit '0eade90a26dd9b50465843d36b574a4fc9c0e6bf':

commit | commitdiff | tree

Colin Cross [Mon, 12 May 2014 23:26:27 +0000 (23:26 +0000)]

am d1b45a73: am 84a20ac1: am 2c32144b: resolved conflicts for merge of 7cd7bd65 to klp-modular-dev-plus-aosp

* commit 'd1b45a736c7843e355261ef5bfb8c75b87a77f31':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:26:26 +0000 (23:26 +0000)]

am 63924664: am 0a60bdf5: am 0b7197a6: am cd958154: Merge "Refactor a little bit and do the validation on also default.prop."

* commit '63924664ad70a38e0c79081fd17a1ab328f577ef':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:26:25 +0000 (23:26 +0000)]

am 696e0c25: am 53d2ca07: am 4170e2be: am fd841351: Merge "Support custom sdk.atree files." into klp-modular-dev

* commit '696e0c2559b84d8b9b7ff1b46c239deac757d0da':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:26:24 +0000 (23:26 +0000)]

am 0fcd51cf: 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 mes

* commit '0fcd51cfcc65c67708247785f0694e1085c5ac0b':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:26:22 +0000 (23:26 +0000)]

am 2c20a0cb: am e6a65a5f: resolved conflicts for merge of b6d53f0b to master

* commit '2c20a0cb3b4cc8c4e8eeb4c6843a0ba5905a08eb':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:26:21 +0000 (23:26 +0000)]

am b75228fd: am 6336d6bf: am 1968f286: am b12cce10: Merge "Refine module name resolving in multilib build"

* commit 'b75228fdeac92eaaf4ebaf4a9ef48b8af4224c6d':

commit | commitdiff | tree

Elliott Hughes [Mon, 12 May 2014 23:26:20 +0000 (23:26 +0000)]

am a797f389: am a0945a24: am 1e317e77: am 993ffb80: Merge "Add all-S-files-under."

* commit 'a797f389e75367fa552feb382c5266ddb73f75da':

commit | commitdiff | tree

Scott Main [Mon, 12 May 2014 23:26:19 +0000 (23:26 +0000)]

am 927ae12c: 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 '927ae12cc82903b31509026f9f469719c5aee947':

commit | commitdiff | tree

Colin Cross [Mon, 12 May 2014 23:26:18 +0000 (23:26 +0000)]

am 1d94fe58: am ce04c505: am d121d417: am 90ed06ef: Merge "fix 2nd target clang prebuilt paths"

* commit '1d94fe58165492fe1e496f12f27b66b1d75bd77f':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:26:17 +0000 (23:26 +0000)]

am 801fdba5: am 1eba3c14: am 484c7dec: am ba46260f: Merge "Runtime resource overlay, iteration 2"

* commit '801fdba53c6099762ac29c50e33aa9c4fb6fd87b':

commit | commitdiff | tree

Justin Koh [Mon, 12 May 2014 23:26:16 +0000 (23:26 +0000)]

am b8ea99c3: am f26c96ed: resolved conflicts for merge of 34cb6460 to master

* commit 'b8ea99c378270c8384b6be2d5732828981aaf671':

commit | commitdiff | tree

Steve Moyer [Mon, 12 May 2014 23:26:11 +0000 (23:26 +0000)]

am 9e3586dc: am 60250d42: Merge "Adding SmsTest to sdk build"

* commit '9e3586dce6f02f21435390eb98e68126f7c81e3f':

commit | commitdiff | tree

Dianne Hackborn [Mon, 12 May 2014 23:26:08 +0000 (23:26 +0000)]

am 6a03bf2e: am fc021daa: Fix issue #12939338: Android version showing as \'KKWT\'

* commit '6a03bf2e7ef8b4e6e3ae35bf8cfa85ea25e56226':

commit | commitdiff | tree

David 'Digit' Turner [Mon, 12 May 2014 23:26:07 +0000 (23:26 +0000)]

am 4fa29bd5: am 35cfe9e8: am cc57457c: am 145562fc: Merge "Add missing font files to SDK system images."

* commit '4fa29bd504e39936a0ba5e746e24b7111058ec9a':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:26:06 +0000 (23:26 +0000)]

am 93f59716: am a87489b5: am 74b71317: am 2d72094f: am 960d919e: resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp

* commit '93f5971663ad9d17994605a1851355fa6005dd29':

commit | commitdiff | tree

Ben Cheng [Mon, 12 May 2014 23:26:05 +0000 (23:26 +0000)]

am 1c9537e1: am 2ad7d4df: am 7495e68a: am 6c5d8976: Merge "Refreshed gcc predefines __ANDROID__"

* commit '1c9537e16de86a6509c1fee812da9400a146dd14':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:26:04 +0000 (23:26 +0000)]

am faf41d0b: am 956cd054: am 34afc565: am 5cc7f8a7: Merge "Select the arch_variant_cflags for the 2nd arch."

* commit 'faf41d0bbbd02703579fa66150246bb8d40d92f2':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:26:02 +0000 (23:26 +0000)]

am b5c7be29: am 30d8e12c: resolved conflicts for merge of d616a73d to master

* commit 'b5c7be29701649567a61a7cf0569eeea904b9d8e':

commit | commitdiff | tree

Colin Cross [Mon, 12 May 2014 23:26:01 +0000 (23:26 +0000)]

am ec462dbf: am e3ae5a46: am ddd7c919: am 5e9a2033: Merge "don\'t rename 32-bit packages to *_32"

* commit 'ec462dbfa9d3aeeadbbe1fbf209e4ef32133baa1':

commit | commitdiff | tree

Elliott Hughes [Mon, 12 May 2014 23:26:00 +0000 (23:26 +0000)]

am b8995098: am 3e3cde55: am 4d5fa510: am 8b20d5b9: Merge "Turn 64-bit-related warnings into errors on 64-bit builds."

* commit 'b899509840ab17dafa0070c3e81b6ca6f5d41dc6':

commit | commitdiff | tree

Elliott Hughes [Mon, 12 May 2014 23:25:59 +0000 (23:25 +0000)]

am 720a7599: am 77f88ce0: am 3f040869: am efb9603a: Merge "[MIPS64] Add mips64 target"

* commit '720a75992bab6c58430003e3176f545ea7a1efe9':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:25:58 +0000 (23:25 +0000)]

am 387a095f: am dd22aee1: am 69c3f457: am dc7fee9f: Set up rules to merge AndroidManifest.xmls

* commit '387a095fbd3c375e93c1c77c974f7bbe462933a6':

commit | commitdiff | tree

Andreas Huber [Mon, 12 May 2014 23:25:56 +0000 (23:25 +0000)]

am 5f4eb0c2: am a42d3a48: fix the build, libstagefright_chromium_http is no longer needed.

* commit '5f4eb0c2eb7ccd2fae4679b1129204129343afb9':

commit | commitdiff | tree

Christopher Ferris [Mon, 12 May 2014 23:25:55 +0000 (23:25 +0000)]

am cebcb8b0: am 5d8ee715: am 6d0899ea: am afbbce3f: Merge "Add library test makefile solutions."

* commit 'cebcb8b0473596515d53ec0ce39b390a61c10c1e':

commit | commitdiff | tree

Colin Cross [Mon, 12 May 2014 23:25:54 +0000 (23:25 +0000)]

am 95b6b92d: am 98255dc9: am d69ed2e2: am 054b0274: Merge topic \'arm64\'

* commit '95b6b92d84a597b01f009c9d032025d9e00d3d2e':

commit | commitdiff | tree

Colin Cross [Mon, 12 May 2014 23:25:53 +0000 (23:25 +0000)]

am f92f0c32: am 96870b3e: am dc5249ab: am 717de0f5: Merge "Fix installing 2nd arch shared libraries"

* commit 'f92f0c3295677494e2f1fae2c345c1a9c5e022db':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:25:52 +0000 (23:25 +0000)]

am 4cf8602b: am 64a55bab: Fix typo.

* commit '4cf8602ba9903a6d1df967abfe8c6a427acd7b28':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:25:51 +0000 (23:25 +0000)]

am ec5e45b6: am d89ffa86: Fix emulator builds

* commit 'ec5e45b6ff50421af4127803860bd69f37f10ba5':

commit | commitdiff | tree

Adam Lesinski [Mon, 12 May 2014 23:25:50 +0000 (23:25 +0000)]

am 3b253928: am 9cee77b3: am bebb2b54: am 7b734fd8: Merge "Allow multiple asset directories in aapt" into klp-modular-dev

* commit '3b2539286fbad59d999c8d2bd3ba65142bc01bac':

commit | commitdiff | tree

Justin Koh [Mon, 12 May 2014 23:25:49 +0000 (23:25 +0000)]

am c94a531b: am 19753f45: am bbfebfad: resolved conflicts for merge of 303d2755 to klp-modular-dev-plus-aosp

* commit 'c94a531b086aed89fd90c12d9ec8a722c156b4e3':

commit | commitdiff | tree

Doug Zongker [Mon, 12 May 2014 23:25:48 +0000 (23:25 +0000)]

am 1478915c: am 01ce19c9: make full OTAs block based

* commit '1478915ca65f84995beb5b20e9565c83f77f005a':

commit | commitdiff | tree

Doug Zongker [Mon, 12 May 2014 23:25:47 +0000 (23:25 +0000)]

am 315af55b: am c9253822: add recovery update code to system images

* commit '315af55b4a08bc8b17897ef230cd631d083aafb6':

commit | commitdiff | tree

Tim Murray [Mon, 12 May 2014 23:25:46 +0000 (23:25 +0000)]

am 17385d47: am e858190f: am 47f9b9bc: am 5352018b: Merge "Add new rs directory to list of Java subdirs of fw/base."

* commit '17385d47c7538e13c08da6e50512f83be562f02a':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:25:45 +0000 (23:25 +0000)]

am fd0519b9: am 8647c336: am 1446cf93: am a77456b8: Merge "Dedup the targets and dependencies of required modules."

* commit 'fd0519b95982c7fbfdc73432aeb6ab0505d53184':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:25:44 +0000 (23:25 +0000)]

am fc830182: am fc330375: Dedup the targets and dependencies of required modules.

* commit 'fc83018213ce28d5deebb5f7da7e5a2256f6b840':

commit | commitdiff | tree

Noreen Tolland [Mon, 12 May 2014 23:25:43 +0000 (23:25 +0000)]

am b164425a: (-s ours) am d76bb175: am 4b69be27: (-s ours) am c816e061: Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev

* commit 'b164425a49dcd5adda308ce5c7212f0ee83f9e7c':

commit | commitdiff | tree

Ben Cheng [Mon, 12 May 2014 23:25:42 +0000 (23:25 +0000)]

am d1b14acc: am bc80daff: am 09c9881f: am 5608a8c6: Merge "Add 64-bit gdbclients."

* commit 'd1b14accde6ecfa3b29467b86f46e2edfdfec382':

commit | commitdiff | tree

Brian Carlstrom [Mon, 12 May 2014 23:25:40 +0000 (23:25 +0000)]

am 456e2ec3: am 7468e276: am 03c16a30: am aae47044: Merge "CleanSpec for 49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default"

* commit '456e2ec3de895512687f278071bd1cf378dc2f99':

commit | commitdiff | tree

Brian Carlstrom [Mon, 12 May 2014 23:25:39 +0000 (23:25 +0000)]

am 966e0fff: am 5b40a0bd: am a15fc8fd: am 601d39b6: Merge "build: Rename persist.sys.dalvik.vm.lib to allow new default"

* commit '966e0fff74dbb311a913b4ce41a79685b26c1783':

commit | commitdiff | tree

Brian Carlstrom [Mon, 12 May 2014 23:25:37 +0000 (23:25 +0000)]

am 902e09d4: resolved conflicts for merge of 966611a9 to master-nova

* commit '902e09d43a6c6f9db6b4db4145fdea8b757be05f':

commit | commitdiff | tree

Ian Rogers [Mon, 12 May 2014 23:25:36 +0000 (23:25 +0000)]

am ff8048bc: am 69968b8c: am 1fee45f1: am e854276d: Merge "Disable WITH_HOST_DALVIK on 64bit host builds."

* commit 'ff8048bc48a8d7987a7bc1e37f49089fa9104b60':

commit | commitdiff | tree

Narayan Kamath [Mon, 12 May 2014 23:25:35 +0000 (23:25 +0000)]

am 5694cf61: am 7201cdef: am b1aec05a: am ad9209ad: Merge "Define __STDC_FORMAT_MACROS on Windows host builds."

* commit '5694cf6125fab10189595849b163048014970dc0':

commit | commitdiff | tree

Colin Cross [Mon, 12 May 2014 23:25:34 +0000 (23:25 +0000)]

am 1576913e: am 8c28b594: am 6a7699d5: am a8e6166f: Merge "build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY"

* commit '1576913e4ba45c896ee77c18dbd9717c357e0e7e':

commit | commitdiff | tree

Colin Cross [Mon, 12 May 2014 23:25:33 +0000 (23:25 +0000)]

am f8dab51e: am 92ef2b3d: am df313a04: am 2dcaf9f4: Merge "build: support LOCAL_*_32 and LOCAL_*_64"

* commit 'f8dab51e2e2afcb869226f8d903ee36dfc4a3a81':

commit | commitdiff | tree

Ian Rogers [Mon, 12 May 2014 23:25:32 +0000 (23:25 +0000)]

am 1c56e680: am 0e0b880c: am eb02fa0a: am 805cb8fa: Merge "Fix the host inttypes.h problem globally."

* commit '1c56e68023f67af685c8c781dece48a1dd061aab':

commit | commitdiff | tree

Brian Carlstrom [Mon, 12 May 2014 23:25:30 +0000 (23:25 +0000)]

am deae4658: am 8bc31b6d: am d4e29f52: am cece05e2: Merge "Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default"

* commit 'deae46587ab041f413ae41ff3138b836decbd4c4':

commit | commitdiff | tree

Nick Vaccaro [Mon, 12 May 2014 23:25:29 +0000 (23:25 +0000)]

am 6a53c91a: am 2422e761: am ec0c99a6: Add atrace for supporting systrace tool

* commit '6a53c91a01186ac3a5b0dc980c36a29bd0917b45':

commit | commitdiff | tree

Baligh Uddin [Mon, 12 May 2014 23:25:28 +0000 (23:25 +0000)]

am efa671d2: Add the Telecomm entry in core.mk

* commit 'efa671d2fd17280d096d914e492dd25db114c787':
Add the Telecomm entry in core.mk

commit | commitdiff | tree

Santos Cordon [Mon, 12 May 2014 23:25:27 +0000 (23:25 +0000)]

am 6440470b: Adding telecomm to build src path for framework.

* commit '6440470b5ed748cf1c30ecbda7877d08b7a778f4':
Adding telecomm to build src path for framework.

commit | commitdiff | tree

Ed Heyl [Mon, 12 May 2014 23:25:26 +0000 (23:25 +0000)]

am 813b4f27: (-s ours) merge 601d39b688bcbb1789e145d1b72753206c24d374

* commit '813b4f27b7d414d110d0ab6f81839204c2b7d124':

commit | commitdiff | tree

Ian Rogers [Mon, 12 May 2014 23:18:13 +0000 (23:18 +0000)]

am d671e2ac: am e854276d: Merge "Disable WITH_HOST_DALVIK on 64bit host builds."

* commit 'd671e2ac95b74d3d43aadec2aa7315f88a0cfe14':