OSDN Git Service
Dan Albert [Fri, 16 May 2014 22:02:57 +0000 (22:02 +0000)]
am
2f57c850: am
4dd8c970: am
a82b32a7: Merge "Use libc++ versions of gtest libs when needed"
* commit '
2f57c85095c6c2336b964a6965da4093a89e2db3':
Use libc++ versions of gtest libs when needed
Dan Albert [Fri, 16 May 2014 21:57:57 +0000 (21:57 +0000)]
am
4dd8c970: am
a82b32a7: Merge "Use libc++ versions of gtest libs when needed"
* commit '
4dd8c9705db909ba070a830930f1ba72a77192d4':
Use libc++ versions of gtest libs when needed
Dan Albert [Fri, 16 May 2014 21:54:04 +0000 (21:54 +0000)]
am
a82b32a7: Merge "Use libc++ versions of gtest libs when needed"
* commit '
a82b32a7a7855cb93e11e060120803e91cc81c2d':
Use libc++ versions of gtest libs when needed
Dan Albert [Fri, 16 May 2014 21:50:27 +0000 (21:50 +0000)]
Merge "Use libc++ versions of gtest libs when needed"
Justin Koh [Fri, 16 May 2014 21:10:39 +0000 (21:10 +0000)]
am
fa1a8333: am
3446af69: Add CalendarProvider to core_tiny
* commit '
fa1a8333afa51ebb00c5509defc480f61ba638cb':
Add CalendarProvider to core_tiny
Justin Koh [Fri, 16 May 2014 20:48:34 +0000 (20:48 +0000)]
am
3446af69: Add CalendarProvider to core_tiny
* commit '
3446af6977e43adde2cca643c2105a94c6fad275':
Add CalendarProvider to core_tiny
Ying Wang [Fri, 16 May 2014 19:05:40 +0000 (19:05 +0000)]
am
9e55ed53: am
47316a27: am
5137d458: Merge "Force to build llvm from source in 64-bit host build."
* commit '
9e55ed53ef7dfebc759a2494503b19e33b0c47d7':
Force to build llvm from source in 64-bit host build.
Ying Wang [Fri, 16 May 2014 19:02:52 +0000 (19:02 +0000)]
am
47316a27: am
5137d458: Merge "Force to build llvm from source in 64-bit host build."
* commit '
47316a27eac94c45e47a26cb52cc5b03753dd24e':
Force to build llvm from source in 64-bit host build.
Ying Wang [Fri, 16 May 2014 18:59:23 +0000 (18:59 +0000)]
am
5137d458: Merge "Force to build llvm from source in 64-bit host build."
* commit '
5137d4584e60dea68715dbcae5e276b3af965460':
Force to build llvm from source in 64-bit host build.
Ying Wang [Fri, 16 May 2014 18:55:48 +0000 (18:55 +0000)]
Merge "Force to build llvm from source in 64-bit host build."
Justin Koh [Fri, 16 May 2014 18:29:11 +0000 (11:29 -0700)]
Add CalendarProvider to core_tiny
This is required for CTS.
Bug:
15003038
Change-Id: I9ac43f4875e979b086c88859a09626254f3ad06a
Dan Albert [Wed, 14 May 2014 21:16:47 +0000 (14:16 -0700)]
Use libc++ versions of gtest libs when needed
Change-Id: I19aa58a83a9da680d441af5f3956a2fbdf18c4e4
Doug Zongker [Fri, 16 May 2014 17:40:54 +0000 (17:40 +0000)]
am
994a8db5: am
c7933482: am
c0f10644: Merge "make SignApk do zip alignment"
* commit '
994a8db5a990676f1b08dab2ee980a9fc8d63685':
make SignApk do zip alignment
Ying Wang [Fri, 16 May 2014 16:37:23 +0000 (09:37 -0700)]
Force to build llvm from source in 64-bit host build.
Bug:
13751317
Change-Id: I4a4150bfe21607eb7a2342bbd8120b431427eee5
Doug Zongker [Fri, 16 May 2014 16:03:59 +0000 (16:03 +0000)]
am
c7933482: am
c0f10644: Merge "make SignApk do zip alignment"
* commit '
c79334829885a82f600779d39b5577b921c64f67':
make SignApk do zip alignment
Doug Zongker [Fri, 16 May 2014 15:59:51 +0000 (15:59 +0000)]
am
c0f10644: Merge "make SignApk do zip alignment"
* commit '
c0f10644bf877fae44e8aa5ebfff41f0e27af197':
make SignApk do zip alignment
Doug Zongker [Fri, 16 May 2014 15:56:37 +0000 (15:56 +0000)]
Merge "make SignApk do zip alignment"
Ying Wang [Fri, 16 May 2014 04:49:29 +0000 (04:49 +0000)]
Merge "Put modules with install path to system/ to DATA/ in the zip file."
Ying Wang [Fri, 16 May 2014 03:45:39 +0000 (20:45 -0700)]
Put modules with install path to system/ to DATA/ in the zip file.
Change-Id: I3948c28bb3f988d57da41d6eb8f97da4e20b0e86
Ji-Hwan Lee [Fri, 16 May 2014 02:03:58 +0000 (02:03 +0000)]
am
0994317a: am
658d89e9: am
4ec7007f: Merge "Increase system image size to 650M for generic_x86"
* commit '
0994317a003a8e3e1891d4f3ae44fcfc3191b2bf':
Increase system image size to 650M for generic_x86
Ji-Hwan Lee [Fri, 16 May 2014 02:03:57 +0000 (02:03 +0000)]
am
cd18df97: am
eaf4c758: am
a7748859: Merge "Clear *.ini and skin directory on installclean"
* commit '
cd18df970ecad032ac33c9aea01b14734728f605':
Clear *.ini and skin directory on installclean
Ji-Hwan Lee [Fri, 16 May 2014 02:00:38 +0000 (02:00 +0000)]
am
658d89e9: am
4ec7007f: Merge "Increase system image size to 650M for generic_x86"
* commit '
658d89e9b5d7e98951986756f6957e7935477f5c':
Increase system image size to 650M for generic_x86
Ji-Hwan Lee [Fri, 16 May 2014 02:00:37 +0000 (02:00 +0000)]
am
eaf4c758: am
a7748859: Merge "Clear *.ini and skin directory on installclean"
* commit '
eaf4c7581f3c736ada725f75bb1b6218be26c361':
Clear *.ini and skin directory on installclean
Ying Wang [Fri, 16 May 2014 02:00:28 +0000 (02:00 +0000)]
am
0a2c133d: am
5b768a72: am
f14653ce: Merge "x86_common.mk has been replaced by HOST_x86_common.mk"
* commit '
0a2c133dc85e611b209244a6024a8390f338a63d':
x86_common.mk has been replaced by HOST_x86_common.mk
Ji-Hwan Lee [Fri, 16 May 2014 01:57:36 +0000 (01:57 +0000)]
am
4ec7007f: Merge "Increase system image size to 650M for generic_x86"
* commit '
4ec7007f4eac30703cf14b7beaff01a1a07f7eb1':
Increase system image size to 650M for generic_x86
Ji-Hwan Lee [Fri, 16 May 2014 01:57:35 +0000 (01:57 +0000)]
am
a7748859: Merge "Clear *.ini and skin directory on installclean"
* commit '
a7748859d741af2f7e22f3333030b937269d33c7':
Clear *.ini and skin directory on installclean
Ying Wang [Fri, 16 May 2014 01:57:11 +0000 (01:57 +0000)]
am
5b768a72: am
f14653ce: Merge "x86_common.mk has been replaced by HOST_x86_common.mk"
* commit '
5b768a7253f9d474c48c03321c2fdcbc2b8abc40':
x86_common.mk has been replaced by HOST_x86_common.mk
Ji-Hwan Lee [Fri, 16 May 2014 01:55:00 +0000 (01:55 +0000)]
Merge "Increase system image size to 650M for generic_x86"
Ji-Hwan Lee [Fri, 16 May 2014 01:54:49 +0000 (01:54 +0000)]
Merge "Clear *.ini and skin directory on installclean"
Ying Wang [Fri, 16 May 2014 01:54:12 +0000 (01:54 +0000)]
am
f14653ce: Merge "x86_common.mk has been replaced by HOST_x86_common.mk"
* commit '
f14653cee4c98094d171c194b1af3e14b087ab09':
x86_common.mk has been replaced by HOST_x86_common.mk
Ying Wang [Fri, 16 May 2014 01:51:34 +0000 (01:51 +0000)]
Merge "x86_common.mk has been replaced by HOST_x86_common.mk"
Ying Wang [Fri, 16 May 2014 01:50:06 +0000 (18:50 -0700)]
x86_common.mk has been replaced by HOST_x86_common.mk
Change-Id: I19eea82bb35d3f65a2d894c687131a1eafbe2cc9
Christopher Ferris [Fri, 16 May 2014 01:24:22 +0000 (01:24 +0000)]
am
cea8763c: am
7c67257b: am
f8cfbc0a: Merge "Print all 2ND variables."
* commit '
cea8763c2655b7617a7b4d11b7f23542929c7837':
Print all 2ND variables.
Christopher Ferris [Fri, 16 May 2014 01:19:29 +0000 (01:19 +0000)]
am
7c67257b: am
f8cfbc0a: Merge "Print all 2ND variables."
* commit '
7c67257b8ee9dbb41213d7f75b36cc89f8ffcef0':
Print all 2ND variables.
Christopher Ferris [Fri, 16 May 2014 01:17:13 +0000 (01:17 +0000)]
am
f8cfbc0a: Merge "Print all 2ND variables."
* commit '
f8cfbc0a10b75e6ec22b6e80b90df2a4386887b2':
Print all 2ND variables.
Christopher Ferris [Fri, 16 May 2014 01:14:42 +0000 (01:14 +0000)]
Merge "Print all 2ND variables."
Ying Wang [Thu, 15 May 2014 23:55:54 +0000 (23:55 +0000)]
Merge "Add both app_process[32|64] to PDK_SYMBOL_FILES_LIST"
Ying Wang [Thu, 15 May 2014 23:13:15 +0000 (16:13 -0700)]
Add both app_process[32|64] to PDK_SYMBOL_FILES_LIST
We may not be building all of them.
The platform.zip just silently ignores the nonexistent ones.
Also grep out the existing one when eastablishing the dependency in
fusion build.
Actually PDK_SYMBOL_FILES_LIST is used in 2 cases:
1) to build the symbol files into the platform.zip.
2) to establish the dependency on the symbol files
when doing fusion build.
The previous fix only considered case 2).
Bug:
14997273
Change-Id: I028a5b6c3a3b001efac33d3f56bd2a84f532e5b3
Ji-Hwan Lee [Wed, 16 Apr 2014 15:00:39 +0000 (00:00 +0900)]
Increase system image size to 650M for generic_x86
Change-Id: I4457796bdaff8c2626eb0788199be75f3ab4cd47
Svetoslav [Thu, 15 May 2014 20:14:51 +0000 (20:14 +0000)]
Merge "Adding the PDF rendering library to the build"
Ying Wang [Thu, 15 May 2014 18:02:34 +0000 (18:02 +0000)]
Merge "Fix the PDK fusion build error of missing symbol file for system/bin/app_process"
Ying Wang [Thu, 15 May 2014 17:54:32 +0000 (10:54 -0700)]
Fix the PDK fusion build error of missing symbol file for system/bin/app_process
system/bin/app_process may be a symlink to system/bin/app_process32 or
system/bin/app_process64.
Change-Id: I008bd0a5a801e79144fe2debe27a3a4b4deb1195
Doug Zongker [Thu, 15 May 2014 16:54:26 +0000 (09:54 -0700)]
make SignApk do zip alignment
When signing an APK, make the SignApk tool align the stored entries to
(by default) 4-byte boundaries. This obviates the need to run the
separate zipalign tool, which currently does this job.
The alignment byte count can be specified with the -a option. OTA
package signing (with -w) never does alignment.
The order of files in the output APK is changed so that all stored
files come first in the output, followed by all non-stored files.
This is not expected to have any impact in practice.
Change-Id: Iaeef89b2a7283e25fadb99c0a0f0641f682d76b8
Victoria Lease [Thu, 15 May 2014 14:47:49 +0000 (14:47 +0000)]
Merge "deprecate external/sil-fonts"
Ji-Hwan Lee [Thu, 15 May 2014 11:59:01 +0000 (20:59 +0900)]
Clear *.ini and skin directory on installclean
Currently, skin directory remains across different emulator targets, and
need manual removal. Also, clear hardware-qemu.ini and config.ini.
(See https://android-review.googlesource.com/94692 for config.ini)
Change-Id: Iaa5849ad043ed3f317325ba1d6df287953636f7a
Narayan Kamath [Thu, 15 May 2014 10:34:39 +0000 (10:34 +0000)]
am
1027ea9f: am
59f04e88: am
944a3810: Merge "Fix executable symlinks."
* commit '
1027ea9f6c32f1827ca9de1070bdc241e24d17c0':
Fix executable symlinks.
Narayan Kamath [Thu, 15 May 2014 09:45:30 +0000 (09:45 +0000)]
am
59f04e88: am
944a3810: Merge "Fix executable symlinks."
* commit '
59f04e889e30e274d7efd4224b60d521d7361d8b':
Fix executable symlinks.
Narayan Kamath [Thu, 15 May 2014 09:41:37 +0000 (09:41 +0000)]
am
944a3810: Merge "Fix executable symlinks."
* commit '
944a38104a553d84c44fa87b2378ebee66a12349':
Fix executable symlinks.
Narayan Kamath [Thu, 15 May 2014 09:36:25 +0000 (09:36 +0000)]
Merge "Fix executable symlinks."
Christopher Ferris [Thu, 15 May 2014 01:21:34 +0000 (18:21 -0700)]
Print all 2ND variables.
Change-Id: I11180a3ec3481d293100c59c331f05db9e6a689b
Ying Wang [Thu, 15 May 2014 01:09:49 +0000 (01:09 +0000)]
am
e50f2d9f: am
40b49d30: am
a74ade94: Merge "Support host multilib build"
* commit '
e50f2d9f32a27d8290692dbf99ab8b247ef9d553':
Support host multilib build
Ying Wang [Thu, 15 May 2014 00:44:53 +0000 (00:44 +0000)]
am
40b49d30: am
a74ade94: Merge "Support host multilib build"
* commit '
40b49d3043bd41ca5548b99b537038187fdca258':
Support host multilib build
Ying Wang [Thu, 15 May 2014 00:41:37 +0000 (00:41 +0000)]
am
a74ade94: Merge "Support host multilib build"
* commit '
a74ade945776e80f99f3b05d06a131cfd353c3f6':
Support host multilib build
Ying Wang [Thu, 15 May 2014 00:37:25 +0000 (00:37 +0000)]
Merge "Support host multilib build"
Ying Wang [Thu, 17 Apr 2014 17:03:35 +0000 (10:03 -0700)]
Support host multilib build
This change basically ported our target multilib to the host side.
It supports 2 host build modes: x86 and x86_64 multilib build.
For now you need to set "BUILD_HOST_64bit=true" to switch to x86_64
multilib build. Later we'll default to x86_64 build and have a flag
to force 32-bit only build, which may be needed by SDK build.
In host module definition, like in target ones, you can use the
following
LOCAL variables to set up multilib configuration:
LOCAL_MULTILIB: can be "both", "first", "32" or "64".
It also supports the same set of arch or 32-vs-64 specific LOCAL
variables.
By default, it builds only for the first arch.
To keep path compatibility, in x86_64 build files are still output to
out/host/linux-x86; Both 32-bit and 64-bit executables are in
out/host/linux-86/bin;
In x86_64 build 32-bit shared libraries are installed to
out/host/linux-x86/lib32
and 64-bit shared libraries are installed to out/host/linux-x86/lib;
32-bit object files are output to out/host/linux-x86/obj32 and 64-bit
object files
are output to out/host/linux-x86/obj.
Bug:
13751317
Change-Id: I6044f83b7db369a33e05209e8c588eb6dc83409f
Dirk Dougherty [Wed, 14 May 2014 22:04:40 +0000 (15:04 -0700)]
Sync master templates with upstream branch, retain annotation customization from
Change-Id: Ie1119bc1b18a017e1bef199949801fb045d8ff06
Dirk Dougherty [Wed, 14 May 2014 21:09:39 +0000 (21:09 +0000)]
am
8fdd4a0b: am
7db3e8a5: am
9890fe24: am
c3921656: Add templates support for dynamic content and sticky nav bar.
* commit '
8fdd4a0b567878c5cf0aaa9f24496f5888239fea':
Add templates support for dynamic content and sticky nav bar.
Sreeram Ramachandran [Wed, 14 May 2014 21:05:29 +0000 (21:05 +0000)]
am
d8615113: am
6af650d6: am
da492d7e: Merge "Introduce netd_client, a dynamic library that talks to netd."
* commit '
d86151135a83df029edbf53c88c2713eb35b9cf3':
Introduce netd_client, a dynamic library that talks to netd.
Dirk Dougherty [Wed, 14 May 2014 21:02:39 +0000 (21:02 +0000)]
am
7db3e8a5: am
9890fe24: am
c3921656: Add templates support for dynamic content and sticky nav bar.
* commit '
7db3e8a518ee51ba1a511948de71675e3457ff13':
Add templates support for dynamic content and sticky nav bar.
Dirk Dougherty [Wed, 14 May 2014 20:56:51 +0000 (20:56 +0000)]
am
9890fe24: am
c3921656: Add templates support for dynamic content and sticky nav bar.
* commit '
9890fe24f1451d0393337904852d0ca24808c2bc':
Add templates support for dynamic content and sticky nav bar.
Dirk Dougherty [Wed, 14 May 2014 20:53:13 +0000 (20:53 +0000)]
am
c3921656: Add templates support for dynamic content and sticky nav bar.
* commit '
c3921656f544af2fac99c3fab9ea5139150d45a2':
Add templates support for dynamic content and sticky nav bar.
Sreeram Ramachandran [Wed, 14 May 2014 19:51:41 +0000 (19:51 +0000)]
am
6af650d6: am
da492d7e: Merge "Introduce netd_client, a dynamic library that talks to netd."
* commit '
6af650d6e3d1a2d4e728151c7698c6d5ea906b59':
Introduce netd_client, a dynamic library that talks to netd.
Sreeram Ramachandran [Wed, 14 May 2014 19:48:13 +0000 (19:48 +0000)]
am
da492d7e: Merge "Introduce netd_client, a dynamic library that talks to netd."
* commit '
da492d7ed029b721bef02ca02d98148d5d9f4b3d':
Introduce netd_client, a dynamic library that talks to netd.
Kenny Root [Wed, 14 May 2014 19:46:07 +0000 (19:46 +0000)]
am
d36d61be: am
abe42666: Move libkeystore to minimal
* commit '
d36d61bec8d728088a300a392b9815555a0203d4':
Move libkeystore to minimal
Sreeram Ramachandran [Wed, 14 May 2014 19:42:41 +0000 (19:42 +0000)]
Merge "Introduce netd_client, a dynamic library that talks to netd."
Kenny Root [Wed, 14 May 2014 19:40:53 +0000 (19:40 +0000)]
am
abe42666: Move libkeystore to minimal
* commit '
abe426663a0534db685f2d44b8cd9a47480fb52f':
Move libkeystore to minimal
Dirk Dougherty [Tue, 13 May 2014 23:55:26 +0000 (16:55 -0700)]
Add templates support for dynamic content and sticky nav bar.
Change-Id: Icb4e492a991a19e3e1eac72eafc83623b00be5de
Kenny Root [Wed, 14 May 2014 18:48:08 +0000 (11:48 -0700)]
Move libkeystore to minimal
The ENGINE needs to be included to make the keystore useful, so if
keystore is included, also include libkeystore.
Change-Id: I042a4eb02450d090f10437deb736e1c4a4105df7
Sreeram Ramachandran [Mon, 12 May 2014 18:51:29 +0000 (11:51 -0700)]
Introduce netd_client, a dynamic library that talks to netd.
(cherry picked from commit
440de6b9f715cb18b8ee888c58d5c7a659ff5073)
Change-Id: Ib6198e19dbc306521a26fcecfdf6e8424d163fc9
Narayan Kamath [Wed, 14 May 2014 17:26:48 +0000 (18:26 +0100)]
Fix executable symlinks.
32 bit targets will leave TARGET_PREFER_{32,64}_BIT_APPS unset
so adjust accordingly. Also clean up an explanatory comment.
Change-Id: I1f6faa640e4e862631fff49f7c565766ef2c567f
Sreeram Ramachandran [Mon, 12 May 2014 18:51:29 +0000 (11:51 -0700)]
Introduce netd_client, a dynamic library that talks to netd.
(cherry picked from commit
440de6b9f715cb18b8ee888c58d5c7a659ff5073)
Change-Id: Ib6198e19dbc306521a26fcecfdf6e8424d163fc9
Geremy Condra [Wed, 14 May 2014 04:37:55 +0000 (04:37 +0000)]
Merge "Reopen temporary system image to avoid stale data."
Geremy Condra [Wed, 14 May 2014 03:23:54 +0000 (20:23 -0700)]
Reopen temporary system image to avoid stale data.
NamedTemporaryFile's aggressive caching behavior can cause an issue
where changes made by another process aren't visible even after the
fseek() below or a flush(). To avoid this, simply open the file
again and read from the fresh version.
This fixes an issue where verity metadata written by append2simg
doesn't become visible to img_from_target_files.
Change-Id: I291fb3a95d5b532218ac6205ecc9e9b4f3a36bd4
Svetoslav [Tue, 13 May 2014 22:47:36 +0000 (15:47 -0700)]
Adding the PDF rendering library to the build
Change-Id: I4e77d60154e8a6c9d1ceba0224d8710e36e56193
Doug Zongker [Tue, 13 May 2014 21:17:13 +0000 (14:17 -0700)]
add missing verity tools to otatools target
Change-Id: I856e43ac9757cf082548646e50db8bbc8da71d0a
Victoria Lease [Tue, 13 May 2014 17:44:49 +0000 (10:44 -0700)]
deprecate external/sil-fonts
Change-Id: Ic6113453acf94e1346dede99274cb4b20ad5a866
Ying Wang [Tue, 13 May 2014 17:06:01 +0000 (17:06 +0000)]
am
5c7c9887: am
03d02a26: am
b082b5f1: Merge "Disable DEXPREOPT until we have multilib support"
* commit '
5c7c9887f4216dbd94cc40451b3e4cc3dfd5a441':
Disable DEXPREOPT until we have multilib support
Ying Wang [Tue, 13 May 2014 16:58:47 +0000 (16:58 +0000)]
am
03d02a26: am
b082b5f1: Merge "Disable DEXPREOPT until we have multilib support"
* commit '
03d02a2687cbd59b8871ccbe0eeb3c2c51df063c':
Disable DEXPREOPT until we have multilib support
Ying Wang [Tue, 13 May 2014 16:54:29 +0000 (16:54 +0000)]
am
b082b5f1: Merge "Disable DEXPREOPT until we have multilib support"
* commit '
b082b5f1b2d1a45ee91de186428d5e341d02c08a':
Disable DEXPREOPT until we have multilib support
Ying Wang [Tue, 13 May 2014 16:49:32 +0000 (16:49 +0000)]
Merge "Disable DEXPREOPT until we have multilib support"
Ying Wang [Tue, 13 May 2014 16:46:23 +0000 (09:46 -0700)]
Disable DEXPREOPT until we have multilib support
Bug:
14694978
Change-Id: I31d0f1c78a668435646c99e659cec46cd2f3ddf7
Ying Wang [Tue, 13 May 2014 16:43:46 +0000 (16:43 +0000)]
am
37aacb8a: am
72344a73: am
8012d8f3: Merge "Treat denver like cortex-a15."
* commit '
37aacb8a31970197fb62aab3e5978e3bb4b0709b':
Treat denver like cortex-a15.
Ying Wang [Tue, 13 May 2014 16:38:47 +0000 (16:38 +0000)]
am
72344a73: am
8012d8f3: Merge "Treat denver like cortex-a15."
* commit '
72344a7329ab984de716b630cb88039d9ed820a0':
Treat denver like cortex-a15.
Ying Wang [Tue, 13 May 2014 16:34:00 +0000 (16:34 +0000)]
am
8012d8f3: Merge "Treat denver like cortex-a15."
* commit '
8012d8f353304ef4487545648455d34d6ffc2741':
Treat denver like cortex-a15.
Ying Wang [Tue, 13 May 2014 16:28:09 +0000 (16:28 +0000)]
Merge "Treat denver like cortex-a15."
Ying Wang [Tue, 13 May 2014 16:02:56 +0000 (09:02 -0700)]
Treat denver like cortex-a15.
See also build/core/combo/arch/arm/armv7-a-neon.mk.
Change-Id: Ie18e1f133f56a9f7da80e304052c92edad933a31
Andrew Hsieh [Tue, 13 May 2014 01:02:56 +0000 (01:02 +0000)]
am
f6566fd1: am
e7b99aec: am
fb1f38ec: Merge "Define __USE_MINGW_ANSI_STDIO for windows build"
* commit '
f6566fd1f96275f6daec46ced8ceba25c87aedaa':
Define __USE_MINGW_ANSI_STDIO for windows build
Andrew Hsieh [Tue, 13 May 2014 00:59:28 +0000 (00:59 +0000)]
am
e7b99aec: am
fb1f38ec: Merge "Define __USE_MINGW_ANSI_STDIO for windows build"
* commit '
e7b99aec678426bdd19548c9f62cd3694c51702c':
Define __USE_MINGW_ANSI_STDIO for windows build
Andrew Hsieh [Tue, 13 May 2014 00:57:08 +0000 (00:57 +0000)]
am
fb1f38ec: Merge "Define __USE_MINGW_ANSI_STDIO for windows build"
* commit '
fb1f38ecbacfb5dc2cc4f3f83eb814ac2aa090ca':
Define __USE_MINGW_ANSI_STDIO for windows build
Andrew Hsieh [Tue, 13 May 2014 00:53:45 +0000 (00:53 +0000)]
Merge "Define __USE_MINGW_ANSI_STDIO for windows build"
Adam Lesinski [Mon, 12 May 2014 23:31:29 +0000 (23:31 +0000)]
am
17a4a0bd: am
9bbbac75: Merge "Change aapt flag to use new name"
* commit '
17a4a0bd410f6133fd9088828f27e598ec9d268b':
Ying Wang [Mon, 12 May 2014 23:31:28 +0000 (23:31 +0000)]
am
b45c9108: am
b80e229d: am
66f2af4e: am
6c432940: am
dcdc985c: Merge "executable_prefer_symlink: add makefile for creating symlink to prefer version"
* commit '
b45c910850640ed7ffcd0f6744992ca7dc335c2c':
Geremy Condra [Mon, 12 May 2014 23:31:28 +0000 (23:31 +0000)]
am
27b95314: am
c10320ee: Merge "Add verity support to `make dist`."
* commit '
27b95314a0d9e49b02615a48f6805a0cb6a88af3':
David 'Digit' Turner [Mon, 12 May 2014 23:31:27 +0000 (23:31 +0000)]
Scott Main [Mon, 12 May 2014 23:31:26 +0000 (23:31 +0000)]
am
a4cb2d99: am
bd58064a: am
17b3567b: am
e4af3b35: am
18ba007b: am
7a6ab434: update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong t
* commit '
a4cb2d99a341af8027c8194aadcfd5c1dd7b0933':
Michael Runge [Mon, 12 May 2014 23:31:25 +0000 (23:31 +0000)]
am
48c49a58: am
4f12fcee: Add missing quotation mark in assertion
* commit '
48c49a5818feba22b531f88a102e629a4bd13d4c':
Doug Zongker [Mon, 12 May 2014 23:31:25 +0000 (23:31 +0000)]
am
93e656c7: am
91a99c28: fix ota script to generate non-block commands correctly
* commit '
93e656c754b29a8f1568000a6fb27187e880fb0f':
Doug Zongker [Mon, 12 May 2014 23:31:24 +0000 (23:31 +0000)]
am
633c7ee8: am
1aebed36: Merge "assert recovery finger/thumbprints, not system"
* commit '
633c7ee8804003c93f6caae38a526c98fc0f9094':
Andrew Hsieh [Mon, 12 May 2014 23:31:23 +0000 (23:31 +0000)]
am
4517d30c: am
9604c068: am
a01cb054: am
c581e10a: am
eca0043b: Merge "Disable canonical prefixes of system headers"
* commit '
4517d30cb46200334da5ade23a80a23b6d1793da':
Ying Wang [Mon, 12 May 2014 23:31:22 +0000 (23:31 +0000)]
am
4e642c1a: am
38e49504: am
96e487b2: am
98892291: am
3afc688a: Merge "javac: rename common_flags to avoid conflictions"
* commit '
4e642c1aca7a7162ac95475e3d348259128fc205':