Commit Graph

24613 Commits

Author SHA1 Message Date
Elliott Hughes b77a17110f am dc858cee: (-s ours) am 54307a26: am 1dbb4166: Merge "Remove OS_PATH_SEPARATOR from AndroidConfig.h."
* commit 'dc858cee0c9e00ddd634e0e138a22a2397abfeed':
2015-08-27 04:58:36 +00:00
Ying Wang a4e6a6a09b am 72a8e48b: (-s ours) am ac6e6b34: am 0c0b2e65: Merge "Use unmodified MAKECMDGOALS in ninja.mk."
* commit '72a8e48b56483c731950de1e29adf4a23b3d5f6a':
2015-08-27 04:58:28 +00:00
Simon Wilson 3c7e6c4413 am f9d45ed5: (-s ours) am 83da6007: am 37700c9a: Merge "Add compressor options for squashfs system images"
* commit 'f9d45ed57bf1082ffdd94a43af42f0237eed6f32':
2015-08-27 04:58:25 +00:00
Tao Bao d3acc8a35f am 72dc7d46: (-s ours) am 8eb7f45a: am 4ac8e059: Merge "Read fstab from the source build."
* commit '72dc7d465a07125e10a03e8a95652b4b3b574e8f':
2015-08-27 04:58:22 +00:00
Tao Bao 4231eae746 am 29d6fb24: (-s ours) am cce673b6: Read fstab from the source build.
* commit '29d6fb24d780c91697c9734dc98b5f6eb164d217':
2015-08-27 04:58:19 +00:00
Miao Wang 96bac66a06 am 13086cf6: (-s ours) am fbf80e9d: Merge "[RenderScript] Only upgrade RS target API for compat build." into mnc-dev
* commit '13086cf6cf89b3d274373883e870bc2e9a82460f':
2015-08-27 04:58:16 +00:00
Ian Pedowitz f99a6fc79e am 24e3e2fc: (-s ours) am 96585b06: Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 3" into mnc-dev
* commit '24e3e2fcb710d8397701bf141abd2aca26c67590':
2015-08-27 04:58:14 +00:00
Miao Wang a2148aeb02 am a0abfc61: (-s ours) am 302e944c: [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
* commit 'a0abfc61057743b99b3a64b66f3d7d80ed09ca21':
2015-08-27 04:58:11 +00:00
Ying Wang 41ba4bd4ac am 30e42db3: (-s ours) am 43275b9a: am d864f439: Merge "Remove from DEX2OAT_DEPENDENCY when USE_DEX2OAT_DEBUG is set."
* commit '30e42db3fec883df672a58245f6bb487e089b287':
2015-08-27 04:58:10 +00:00
Elliott Hughes 36f564bdcb am 7b5b86cf: (-s ours) am 8a5a0356: am d3fd73f1: Merge "Remove HAVE_WINDOWS_PATHS."
* commit '7b5b86cf7d09bfdb454acdb49d6a322bcb0cb05a':
2015-08-27 04:58:09 +00:00
Tao Bao 3744d95e5d am 0d511afc: (-s ours) resolved conflicts for merge of 910d3822 to mnc-dev-plus-aosp
* commit '0d511afcb8ad3d1e540476541cb696aa824b1cab':
2015-08-27 04:58:07 +00:00
Elliott Hughes c6719502d3 am ebbe8b54: (-s ours) am f79ba085: am 7ecb919d: Merge "Remove unused "host/Directories.h"."
* commit 'ebbe8b5414be0a18452a15a242de825949386a1d':
2015-08-27 04:58:05 +00:00
Dan Albert 73d20ce49d am b9d11606: (-s ours) am 29dc917b: am d4ff2283: Merge "Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION."
* commit 'b9d116067c15fd887d3bc1d85a592dd151661040':
2015-08-27 04:58:03 +00:00
Ying Wang d8618da8a6 am 9e7d6d15: (-s ours) am 86162e64: am b1c0a86f: Merge "Bump generic_arm64 system partition size to 1200 MB."
* commit '9e7d6d152bc35fec125e9ccbd58a0df39e9f3db6':
2015-08-27 04:58:01 +00:00
George Mount 3cfe7be9f3 am 7839420c: (-s ours) am 18cf7136: (-s ours) am 56f7b775: (-s ours) am a5841355: (-s ours) DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
* commit '7839420c442e1ea01df6f5a964861e8f814729b8':
2015-08-27 04:58:00 +00:00
Ying Wang ace9a932fe am c0debc42: (-s ours) am 3d2c90d1: am cb031414: Merge "Fix mmma uses like "mmma ./external/apache-harmony""
* commit 'c0debc427a85d4c78c1ffcb4dfacb0729f8f5690':
2015-08-27 04:57:58 +00:00
Colin Cross e0b98fd823 am c097d1f0: (-s ours) am 4f4c7c22: am f8f448b3: Merge "Build with kati+ninja when USE_NINJA=true"
* commit 'c097d1f06e9701d326d693cbfa32ee7f9435f1fb':
2015-08-27 04:57:57 +00:00
Brian Carlstrom 3c191a874a am 885f7a2b: (-s ours) am 517daeb6: am 73a2a902: Merge "Remove unneeded aapt dependency"
* commit '885f7a2bdbc829eae380a2b197ff58027f91ceeb':
2015-08-27 04:57:56 +00:00
Colin Cross 366a9ec8ce am 650fc5b3: (-s ours) am d2efaea1: am 8291ad58: Merge "Add build subprojects to .gitignore"
* commit '650fc5b3433d425f1b39ea611f70ec1aac8d87db':
2015-08-27 04:57:54 +00:00
Ying Wang fed02e43c8 am 6c4176e2: (-s ours) am 8b4d1432: am cd7dfdb4: Merge "Cleanups."
* commit '6c4176e2d04113f2bfbc2c677e7f37ab799718d9':
2015-08-27 04:57:53 +00:00
Ying Wang c7bde6a481 am f5e94cc1: (-s ours) am c677675c: am 83568a6d: Merge "Create OUT_DIR before writing build_number.txt."
* commit 'f5e94cc17f6607419a94263873fd395a881af01a':
2015-08-27 04:57:52 +00:00
Ying Wang c69e7698f9 am 66be41da: (-s ours) am b22469a8: am 65259743: Merge "Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]"
* commit '66be41da74bd4543f27d66240f490f8201c9d41c':
2015-08-27 04:57:50 +00:00
Colin Cross 39178440c8 am 8d9dfa3d: (-s ours) resolved conflicts for merge of 8c25fd56 to mnc-dev-plus-aosp
* commit '8d9dfa3d9b3874ef03df93e3bac9620a7ccb0d43':
2015-08-27 04:57:49 +00:00
Dan Albert e41e6fd196 am 9bcedd64: (-s ours) am 215959e7: Revert "Revert "Hide unwinder symbols in each binary.""
* commit '9bcedd646e169e85dc7de01aa9a855309c2b63b8':
2015-08-27 04:57:48 +00:00
Ying Wang b27d28b0a8 am c7a57e07: (-s ours) am c671a7cf: Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
* commit 'c7a57e0756c8337e61db170aa30c9bf2e9856a26':
2015-08-27 04:57:47 +00:00
Evgenii Stepanov 399e527fe1 am c83e26bd: (-s ours) am b8376873: am db38e7b5: Merge "Disable relocation packer in SANITIZE_TARGET mode."
* commit 'c83e26bd3ab7b574c6287cb61afbea12333678d2':
2015-08-27 04:57:46 +00:00
Tao Bao ae29680b9c am 13581236: (-s ours) am a04e6b89: am dd68e68f: Merge "Override properties that point to out/ directory."
* commit '1358123688e455f397d35e15d90650398d34b10e':
2015-08-27 04:57:44 +00:00
Colin Cross 964ba01773 am e8d465f3: (-s ours) resolve conflicts for merge of 89675456 to mnc-dev-plus-aosp
* commit 'e8d465f36bed66649b16aad0199b568a61a622f9':
2015-08-27 04:57:43 +00:00
Ying Wang 0b9767dab2 am 590ec842: (-s ours) am 55fc58cb: am b74823e2: (-s ours) Merge "Auto-clean host tools when switching between apps_only and platform build."
* commit '590ec8420061a9240d98f95168748add763e0dc6':
2015-08-27 04:57:42 +00:00
Dan Albert 17c530245c am 198ffa23: (-s ours) am 68b828e2: am f4ffafb1: Merge "Revert "Revert "Hide unwinder symbols in each binary."""
* commit '198ffa2305bd9a02d1dbfc7412809a5b0ff7afd3':
2015-08-27 04:57:41 +00:00
Colin Cross 2c151de813 am af7abc38: (-s ours) am 0f0a6b62: am 03e74d66: Merge "Move @echo to first command in rules"
* commit 'af7abc38fc240ea5c697b9e63a4d552f0912b773':
2015-08-27 04:57:40 +00:00
Ying Wang 12f01fe9f0 am 9d749e1d: (-s ours) am 7ac6cb80: Add LOCAL_NO_LIBGCC.
* commit '9d749e1df29b0a7ec72a5a10d0d3eac9951dafa1':
2015-08-27 04:57:39 +00:00
Nick Kralevich 5aee5c4c4b am 385457dc: (-s ours) am 4a5f5a7b: am a972891f: Merge "file_contexts: Label /dev/ttyS2 as console_device"
* commit '385457dc31a1e182b75218cb1ad4f82b866efafd':
2015-08-27 04:57:38 +00:00
Ying Wang 9631f84e25 am c2231e70: (-s ours) am e8ecab8d: Merge "Don\'t uncompress/page-align the jni libraries in apps_only build." into mnc-dev
* commit 'c2231e70e38af3c85daafbcb24d7954bd3cbef78':
2015-08-27 04:57:37 +00:00
George Mount 3474555d4b am 9510ba65: (-s ours) am 087243dd: Merge "Add data binding to built javadoc." into mnc-dev
* commit '9510ba65eadc64e0c707711c3acc1aaf42e4a603':
2015-08-27 04:57:36 +00:00
Tao Bao db2a3051e0 am 95154ca1: (-s ours) am 5a2ed731: am f737a120: Merge "Enable verbose output for add_img_to_target_files."
* commit '95154ca1fe166f92728e3ee93f76dba9d01ef237':
2015-08-27 04:57:34 +00:00
Nick Kralevich f0c2919e81 am 41da3d12: (-s ours) am abbf8eeb: am a521a37d: Merge "mgrep: add output to environment commands"
* commit '41da3d1209d542735bcd7075b87746bbfc94b293':
2015-08-27 04:57:33 +00:00
Evgenii Stepanov 527342ccf2 am 436a2fb9: (-s ours) am 275e3c8c: am 2d0ec893: Merge "Use a different linker for ASan binaries."
* commit '436a2fb9e3613bacbac16c1cafb1de713ba92bda':
2015-08-27 04:57:32 +00:00
Tao Bao 22a5302fd6 am 2ad55edf: (-s ours) am 0d4a9405: am ecb7b37b: Merge "Assert the stash size when generating OTAs."
* commit '2ad55edfd637d3765090b5f0dea9f094f790ae67':
2015-08-27 04:57:30 +00:00
Evgenii Stepanov 332f84e91f am 8412763b: (-s ours) am e7171190: am 832fa5d7: Merge "Disable detection of bugs on global variables."
* commit '8412763bc6684e02b01c2c9df43a402c481c8fe0':
2015-08-27 04:57:29 +00:00
Thierry Strudel 06be502773 am 533829a5: (-s ours) am 6b74f21a: oem_image/custom_image: fix missing new parameter to build_image.py
* commit '533829a5dd32b15223b86282f87cbee6be3cb5ea':
2015-08-27 04:57:28 +00:00
Tao Bao 9a50512827 am 71404b81: (-s ours) am bf8e85ab: am 2e4dd9ab: Merge "Fix the permission in common.ZipWriteStr()."
* commit '71404b81020c886a6b897ed9cd403b33dadfa3fb':
2015-08-27 04:57:26 +00:00
Tao Bao e4a2a3579f am e7a4b429: (-s ours) am 03125de6: am c8812493: Merge "Pack file_contexts into target_files zip."
* commit 'e7a4b429d2391ee92f4ed3ea3882ad5b7b80355a':
2015-08-27 04:57:25 +00:00
Tao Bao 1f5dbb056c am 0d14a397: (-s ours) am 46b1b205: am da724f7a: Merge "Zero out blocks that may be touched by dm-verity."
* commit '0d14a397db2aa40492fa205b473964261bd998d9':
2015-08-27 04:57:23 +00:00
Tao Bao bc073743af am 89832b36: (-s ours) am 7f8ecb7f: Merge "Zero out blocks that may be touched by dm-verity." into mnc-dev
* commit '89832b36af22cf4f04ef9dc64b6a80871e9d3e84':
2015-08-27 04:57:22 +00:00
Thierry Strudel 5ed061b17a am f4e50377: (-s ours) am 74a81e66: fix device specific fs_config on build server
* commit 'f4e503774ef2dfaf8be464be6d913dc8f72ca69a':
2015-08-27 04:57:21 +00:00
Elliott Hughes cf71fb5155 am 32fd6c9a: (-s ours) am b211c8cf: am 76eaa968: Merge "Remove HAVE_WIN32_IPC."
* commit '32fd6c9a03106e7029cf8ddccd4251f2d77ef1b2':
2015-08-27 04:57:20 +00:00
Elliott Hughes 2c6a13cb03 am ab944482: (-s ours) am 9ba0796e: am 60dda9c4: Merge "Remove mkbootimg from the pathmap."
* commit 'ab944482b864ed759e6b962f7e9657bdb93bfb1f':
2015-08-27 04:57:19 +00:00
Elliott Hughes a021bf1b34 am b9bdda3a: (-s ours) am 7a4a9296: am fd5692b3: Merge "Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h."
* commit 'b9bdda3afffa4135fbc72c0b7a7d43e9f8c6ee85':
2015-08-27 04:57:17 +00:00
Elliott Hughes 4cbac0e4e1 am b6e9ed6f: (-s ours) am a78f5557: am 8f548f35: Merge "Remove pathmap.mk entries for libc."
* commit 'b6e9ed6f2bc5f5c9aa84cffe382076ac3e90921b':
2015-08-27 04:57:16 +00:00