build.git - build

	Commit message (Collapse)	Author	Age	Files	Lines
*	am e921da9d: am bddce34c: am 065c4180: Merge "Revert "Use ↵	Ben Cheng	2014-04-11	1	-5/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	aarch64-linux-android-4.9 for arm64 build (attempt #2)"" * commit 'e921da9def56e6f70de3df18f0582a69826d9787': Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"
\| *	am bddce34c: am 065c4180: Merge "Revert "Use aarch64-linux-android-4.9 for ↵	Ben Cheng	2014-04-11	1	-5/+6
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	arm64 build (attempt #2)"" * commit 'bddce34c160846ab67907fcbec0f6a6f838c20d4': Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"
\| \| *	am 065c4180: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build ↵	Ben Cheng	2014-04-11	1	-5/+6
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(attempt #2)"" * commit '065c41809f8db0151a1f5c2751f1f58846d58988': Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"
\| \| \| *	Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)""	Ben Cheng	2014-04-11	1	-5/+6
\| \| \| \|\
\| \| \| \| *	Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"	Ben Cheng	2014-04-11	1	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 1ae9b213eb5648205223e4b825f4c808a5d2ace8. Sigh... new warnings found by 4.9 break checkbuild. Change-Id: I46ad622fa9c8ac4fb1e15e29bb400634abc5914c
* \| \| \| \|	am c9f9decd: am 4eea070c: am f702d6d1: Merge "Use aarch64-linux-android-4.9 ↵	Ben Cheng	2014-04-11	1	-6/+5
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for arm64 build (attempt #2)" * commit 'c9f9decdcaa6c3314c11edba0bf9703edf09615e': Use aarch64-linux-android-4.9 for arm64 build (attempt #2)
\| * \| \| \|	am 4eea070c: am f702d6d1: Merge "Use aarch64-linux-android-4.9 for arm64 ↵	Ben Cheng	2014-04-11	1	-6/+5
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	build (attempt #2)" * commit '4eea070ca2cf44adbb39e6d1108a2cc547ff6efa': Use aarch64-linux-android-4.9 for arm64 build (attempt #2)
\| \| * \| \|	am f702d6d1: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"	Ben Cheng	2014-04-11	1	-6/+5
\| \| \|\ \ \ \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'f702d6d1d534c914bc0127937eb1a1df61c60762': Use aarch64-linux-android-4.9 for arm64 build (attempt #2)
\| \| \| * \|	Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"	Ben Cheng	2014-04-11	1	-6/+5
\| \| \| \|\ \ \| \| \| \| \|/
\| \| \| \| *	Use aarch64-linux-android-4.9 for arm64 build (attempt #2)	Ben Cheng	2014-04-11	1	-6/+5
\| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GCC: 4.9 (which supports -fstack-protector) Binutils: 2.24 (which supports gc-sections) GDB: 7.7 NDK libraries are still picked up from prebuilts/ndk//4.8/ GCC has been patched to disable codegen for calling __cxa_throw_bad_array_new_length. Change-Id: Ie647fc4c6b227d6bee792f04d5c2f02eb0099559
* \| \| \|	am e4d787bf: am 7e793040: am eec11d97: Merge "Decouple platform compiler and ↵	Ben Cheng	2014-04-11	7	-3/+21
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	NDK library versioning." * commit 'e4d787bfbbde83bc4b868ed804c94118c2ea0080': Decouple platform compiler and NDK library versioning.
\| * \| \|	am 7e793040: am eec11d97: Merge "Decouple platform compiler and NDK library ↵	Ben Cheng	2014-04-11	7	-3/+21
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	versioning." * commit '7e793040be265c2d221cd83e34a53bc7d011206f': Decouple platform compiler and NDK library versioning.
\| \| * \|	am eec11d97: Merge "Decouple platform compiler and NDK library versioning."	Ben Cheng	2014-04-11	7	-3/+21
\| \| \|\ \ \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'eec11d9727ab0e6bc843f059d5f2921ada2e8e9a': Decouple platform compiler and NDK library versioning.
\| \| \| *	Merge "Decouple platform compiler and NDK library versioning."	Ben Cheng	2014-04-11	7	-3/+21
\| \| \| \|\
\| \| \| \| *	Decouple platform compiler and NDK library versioning.	Ben Cheng	2014-04-10	7	-3/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	TARGET_GCC_VERSION: select compiler from prebuilts/gcc/... TARGET_NDK_GCC_VERSION: select libraries from prebuilts/ndk/... Change-Id: I4422a42cdc97aa92b40798014cba82c3c123bbd2
* \| \| \| \|	am 14203772: am 3221717f: am a355ae12: Merge changes ↵	Colin Cross	2014-04-11	5	-32/+76
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I2c10e41f,I5b5e23f1,If3f5a81c,I07520b75 * commit '14203772619f4b4740941de634f90b7a02231aa5': build: remove packages/ from 64-bit blacklist build: use TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS build: add support for LOCAL_MULTILIB := 64 build: fix TARGET_PREFER_32_BIT
\| * \| \| \|	am 3221717f: am a355ae12: Merge changes I2c10e41f,I5b5e23f1,If3f5a81c,I07520b75	Colin Cross	2014-04-11	5	-32/+76
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '3221717fec6c150a24505ed392279a73da5c4e26': build: remove packages/ from 64-bit blacklist build: use TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS build: add support for LOCAL_MULTILIB := 64 build: fix TARGET_PREFER_32_BIT
\| \| * \| \|	am a355ae12: Merge changes I2c10e41f,I5b5e23f1,If3f5a81c,I07520b75	Colin Cross	2014-04-11	5	-32/+76
\| \| \|\ \ \ \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'a355ae12506150a7a676956f3c5083f852ba5722': build: remove packages/ from 64-bit blacklist build: use TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS build: add support for LOCAL_MULTILIB := 64 build: fix TARGET_PREFER_32_BIT
\| \| \| * \|	Merge changes I2c10e41f,I5b5e23f1,If3f5a81c,I07520b75	Colin Cross	2014-04-11	5	-32/+76
\| \| \| \|\ \ \| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* changes: build: remove packages/ from 64-bit blacklist build: use TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS build: add support for LOCAL_MULTILIB := 64 build: fix TARGET_PREFER_32_BIT
\| \| \| \| *	build: remove packages/ from 64-bit blacklist	Colin Cross	2014-04-10	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Everything under packages/ will build for 64-bit now, and package.mk has been updated to not produce 64-bit libraries on devices that don't support them (all of them right now). Change-Id: I2c10e41f727cfc8fe237819308a6dfa34c4fff3f
\| \| \| \| *	build: use TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS	Colin Cross	2014-04-10	1	-0/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS to determine which native libraries to build for an app. If both are set, it will use 64-bit unless TARGET_PREFER_32_BIT is set. If only one is set, it will only build apps that work on that architecture. If neither is set it will fall back to only building 32-bit apps. On existing 32-bit devices neither variable will be set, and the build system will continue to build 32-bit apps. Once a device has support for a 64-bit runtime, the same logic that selects the dual runtimes should set TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS, and packages will be built for the preferred arch, or fall back to the non-preferrred arch if necessary. For testing, a device may set TARGET_SUPPORTS_64_BIT_APPS without TARGET_SUPPORTS_32_BIT_APPS to produce only 64-bit apps. Change-Id: I5b5e23f15602c3cf9bd96791971208a85492c7a3
\| \| \| \| *	build: add support for LOCAL_MULTILIB := 64	Colin Cross	2014-04-10	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I don't expect it to be useful for modules, but package.mk will use it to only install 64-bit native apps on devices that only have a 64-bit zygote. Change-Id: If3f5a81c3a60bd13fa6ded08e2a7579a29877324
\| \| \| \| *	build: fix TARGET_PREFER_32_BIT	Colin Cross	2014-04-10	2	-29/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	TARGET_PREFER_32_BIT can't assume that the 32-bit rule is allowed, it needs to try the 32-bit rule first, then fall back to the 64-bit rule in case the module specifies LOCAL_MODULE_TARGET_ARCH or LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH to disallow the 32-bit build. Also port TARGET_PREFER_32_BIT to package.mk. Change-Id: I07520b75c4ee11a1e95a82b3afa2a33d4907eb04
* \| \| \| \|	am 7bb8315c: am 4786cc3b: am de22e6fb: am 20cf2a91: update sticky nav to ↵	Scott Main	2014-04-11	5	-338/+274
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sync with sidenav and build the breadcrumbs dynamically * commit '7bb8315cf6d0576f8663ced6d102e60112bec27c': update sticky nav to sync with sidenav and build the breadcrumbs dynamically
\| * \| \| \|	am 4786cc3b: am de22e6fb: am 20cf2a91: update sticky nav to sync with ↵	Scott Main	2014-04-11	5	-338/+274
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sidenav and build the breadcrumbs dynamically * commit '4786cc3b132037f187c798593575e0053074b653': update sticky nav to sync with sidenav and build the breadcrumbs dynamically
\| \| * \ \ \	am de22e6fb: am 20cf2a91: update sticky nav to sync with sidenav and build ↵	Scott Main	2014-04-11	5	-338/+274
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the breadcrumbs dynamically * commit 'de22e6fb9bd31e6c41ebdb43b28d0b8fd719a80f': update sticky nav to sync with sidenav and build the breadcrumbs dynamically
\| \| \| * \ \ \	am 20cf2a91: update sticky nav to sync with sidenav and build the ↵	Scott Main	2014-04-11	5	-338/+274
\| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	breadcrumbs dynamically * commit '20cf2a91f0c157875574dd0b0d9b4e040f94e656': update sticky nav to sync with sidenav and build the breadcrumbs dynamically
\| \| \| \| * \| \| \|	update sticky nav to sync with sidenav	Scott Main	2014-04-10	5	-338/+274
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and build the breadcrumbs dynamically Change-Id: Ib008d4606a8e82c468be75c051a8a9e623dc7c22
* \| \| \| \| \| \| \|	am fa75d63c: am dbf1f804: am 80f7dbd4: Merge "gdbclient: use 64-bit suffix ↵	Colin Cross	2014-04-10	1	-1/+3
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for all library symbols" * commit 'fa75d63cd7d512871e7f6038bfc75b19560dae2a': gdbclient: use 64-bit suffix for all library symbols
\| * \| \| \| \| \| \|	am dbf1f804: am 80f7dbd4: Merge "gdbclient: use 64-bit suffix for all ↵	Colin Cross	2014-04-10	1	-1/+3
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	library symbols" * commit 'dbf1f8047be813537ddaebd777adc242a34f8204': gdbclient: use 64-bit suffix for all library symbols
\| \| * \| \| \| \| \|	am 80f7dbd4: Merge "gdbclient: use 64-bit suffix for all library symbols"	Colin Cross	2014-04-10	1	-1/+3
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|_\|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '80f7dbd4deb0a765eaf4a697ea3bcc2e5f2c5b3b': gdbclient: use 64-bit suffix for all library symbols
\| \| \| * \| \| \| \|	Merge "gdbclient: use 64-bit suffix for all library symbols"	Colin Cross	2014-04-10	1	-1/+3
\| \| \| \|\ \ \ \ \ \| \| \| \| \|_\|_\|_\|/ \| \| \| \|/\| \| \| \|
\| \| \| \| * \| \| \|	gdbclient: use 64-bit suffix for all library symbols	Colin Cross	2014-04-10	1	-1/+3
\| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct the solib-search-path for 64-bit to look in /system/lib64 for all libraries including those in subdirectories. Change-Id: I606a0eae1137a857564facc79306ad83097d9659
* \| \| \| \| \| \|	am c77ffa89: am add6c037: am 13eaf184: Merge "Revert "Use ↵	Ben Cheng	2014-04-10	1	-5/+6
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	aarch64-linux-android-4.9 for arm64 build."" * commit 'c77ffa8923d95f8bd4639bf9e810b0c981481e54': Revert "Use aarch64-linux-android-4.9 for arm64 build."
\| * \| \| \| \| \|	am add6c037: am 13eaf184: Merge "Revert "Use aarch64-linux-android-4.9 for ↵	Ben Cheng	2014-04-10	1	-5/+6
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	arm64 build."" * commit 'add6c03742a61209030491f4afb1b7a37b9ddb7d': Revert "Use aarch64-linux-android-4.9 for arm64 build."
\| \| * \| \| \| \|	am 13eaf184: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build.""	Ben Cheng	2014-04-10	1	-5/+6
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '13eaf184f6e5c803f52f5003ace36bafe64671c9': Revert "Use aarch64-linux-android-4.9 for arm64 build."
\| \| \| * \| \| \|	Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build.""	Ben Cheng	2014-04-10	1	-5/+6
\| \| \| \|\ \ \ \
\| \| \| \| * \| \| \|	Revert "Use aarch64-linux-android-4.9 for arm64 build."	Ben Cheng	2014-04-10	1	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 6154690d8615995b961530479ddc1a34946efe49. Change-Id: I7427ad6ca1f74ad632229348bac31ebdbc0590ad
* \| \| \| \| \| \| \|	am 9cbf732f: am 98bb9d6c: am d957d6bb: Merge "Use aarch64-linux-android-4.9 ↵	Ben Cheng	2014-04-10	1	-6/+5
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for arm64 build." * commit '9cbf732fa345a1ef8d540b8934a59502d7fdd627': Use aarch64-linux-android-4.9 for arm64 build.
\| * \| \| \| \| \| \|	am 98bb9d6c: am d957d6bb: Merge "Use aarch64-linux-android-4.9 for arm64 build."	Ben Cheng	2014-04-10	1	-6/+5
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '98bb9d6cbe081ecf1ddbfad8d00f498a506e1bf2': Use aarch64-linux-android-4.9 for arm64 build.
\| \| * \| \| \| \| \|	am d957d6bb: Merge "Use aarch64-linux-android-4.9 for arm64 build."	Ben Cheng	2014-04-10	1	-6/+5
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'd957d6bbdb29fccae74f3511251cae22376550af': Use aarch64-linux-android-4.9 for arm64 build.
\| \| \| * \| \| \| \|	Merge "Use aarch64-linux-android-4.9 for arm64 build."	Ben Cheng	2014-04-10	1	-6/+5
\| \| \| \|\ \ \ \ \ \| \| \| \| \|/ / / /
\| \| \| \| * \| \| \|	Use aarch64-linux-android-4.9 for arm64 build.	Ben Cheng	2014-04-09	1	-6/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I63e1b54947326fb5da07af7691d4729bcbf99ac1 GCC: 4.9 (which supports -fstack-protector) Binutils: 2.24 (which supports gc-sections) GDB: 7.7
* \| \| \| \| \| \| \|	Pass OEM property list to OTA tools, thumbprint.	Jeff Sharkey	2014-04-09	2	-3/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The OTA generation scripts need to know what system properties to read from the OEM partition, so pass along from product definition. Also define "thumbprint" which is only the build-specific parts of the fingerprint. (Thumbs are smaller than fingers.) Bug: 13367676 Change-Id: Iae051dcd2b1c67a7c8554d8ae318a4c54a86d614
* \| \| \| \| \| \| \|	am 09ba20ce: am fd251b33: am 1a4676a1: Merge "Increase the maximum javac ↵	Ying Wang	2014-04-09	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	heap size again." * commit '09ba20ce647472ca6f5692bcf6eb5477fc3a818d': Increase the maximum javac heap size again.
\| * \| \| \| \| \| \|	am fd251b33: am 1a4676a1: Merge "Increase the maximum javac heap size again."	Ying Wang	2014-04-09	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'fd251b33abd2de9c288d56993978dc36976198a7': Increase the maximum javac heap size again.
\| \| * \| \| \| \| \|	am 1a4676a1: Merge "Increase the maximum javac heap size again."	Ying Wang	2014-04-09	1	-1/+1
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '1a4676a17c5483c04f347a4e58890640a71c8368': Increase the maximum javac heap size again.
\| \| \| * \| \| \| \|	Merge "Increase the maximum javac heap size again."	Ying Wang	2014-04-09	1	-1/+1
\| \| \| \|\ \ \ \ \ \| \| \| \| \|/ / / / \| \| \| \|/\| \| \| \|
\| \| \| \| * \| \| \|	Increase the maximum javac heap size again.	Ying Wang	2014-04-09	1	-1/+1
\| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ic3422650ea22977f3dcfd74505cb287ff6543c2d
* \| \| \| \| \| \|	am 6c0fba0f: am ae44bb55: am 94147a91: Merge "Stop defining ↵	Narayan Kamath	2014-04-09	9	-54/+0
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	HAVE_TIMEDWAIT_MONOTONIC." * commit '6c0fba0f989ce9755a4f4303149355dd0d4ea60d': Stop defining HAVE_TIMEDWAIT_MONOTONIC.