OSDN Git Service
Scott Main [Thu, 22 May 2014 15:01:51 +0000 (15:01 +0000)]
am
0250f80e: am
e8a3139e: am
b16376f2: Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug:
15129373
* commit '
0250f80ef0708e9ba71a77cffb29afb2356a5d25':
Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug:
15129373
Scott Main [Thu, 22 May 2014 14:58:15 +0000 (14:58 +0000)]
am
e8a3139e: am
b16376f2: Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug:
15129373
* commit '
e8a3139ebfa103ff2b0ae1dd98abe37186ecbaad':
Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug:
15129373
Scott Main [Thu, 22 May 2014 14:51:08 +0000 (14:51 +0000)]
am
b16376f2: Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug:
15129373
* commit '
b16376f2e600008c0d7233a919edf02a30237a9a':
Change scroll position with javascript instead of CSS. Makes scroll adjustment work for all types of anchors. bug:
15129373
Scott Main [Thu, 22 May 2014 03:35:47 +0000 (20:35 -0700)]
Change scroll position with javascript instead of CSS.
Makes scroll adjustment work for all types of anchors.
bug:
15129373
Change-Id: I0f934170613e8a60d94f09192e03117b8e9d4852
Ying Wang [Thu, 22 May 2014 02:34:02 +0000 (02:34 +0000)]
am
a72e6f80: am
8a3f514d: Merge "Split the rules to build the odex file"
* commit '
a72e6f80e447acf225822eebdf752c0d8aa2590c':
Split the rules to build the odex file
Ying Wang [Thu, 22 May 2014 02:29:52 +0000 (02:29 +0000)]
am
8a3f514d: Merge "Split the rules to build the odex file"
* commit '
8a3f514d44e2c1d4920126b3edd47f7a7616b732':
Split the rules to build the odex file
Ying Wang [Thu, 22 May 2014 02:24:59 +0000 (02:24 +0000)]
Merge "Split the rules to build the odex file"
Dmitriy Ivanov [Thu, 22 May 2014 01:28:53 +0000 (01:28 +0000)]
am
caabca37: am
5caca89c: Merge "Clarify multiarch warnings"
* commit '
caabca3786e105abb88728b4d5c4c1436be66ba3':
Clarify multiarch warnings
Dmitriy Ivanov [Thu, 22 May 2014 01:24:48 +0000 (01:24 +0000)]
am
5caca89c: Merge "Clarify multiarch warnings"
* commit '
5caca89c5d66e9999e26905522bf2eed958d0961':
Clarify multiarch warnings
Dmitriy Ivanov [Thu, 22 May 2014 01:22:00 +0000 (01:22 +0000)]
Merge "Clarify multiarch warnings"
Dmitriy Ivanov [Wed, 21 May 2014 23:38:03 +0000 (16:38 -0700)]
Clarify multiarch warnings
* Show multiarch related warnings only if my_module_multilib is both
Change-Id: If0c467c1d9b953bd3f40949ab4b97d9329ec021f
Ying Wang [Wed, 21 May 2014 23:13:33 +0000 (16:13 -0700)]
Split the rules to build the odex file
Previously the odex file is byproduct generated by the package.apk rule.
Though we have the odex file depend on the package.apk it doesn't have
its own build recipe. In case package.apk isn't updated but we still
need to update the odex file (such as changed LOCAL_MULTILIB), the odex
file will never be rebuilt.
This change split out the rules to build the odex file and make sure the
build recipe get executed if the odex file needs rebuild.
Change-Id: I60c2f32b536b3d59045301ee863aae1451734aad
Mark Salyzyn [Wed, 21 May 2014 21:16:28 +0000 (21:16 +0000)]
am
1fe58202: am
ea65c191: Merge "libctest: zap"
* commit '
1fe582026940c70f4a7ff8f130372234d07d3611':
libctest: zap
Mark Salyzyn [Wed, 21 May 2014 21:08:24 +0000 (21:08 +0000)]
am
ea65c191: Merge "libctest: zap"
* commit '
ea65c191e7c08233c97c5b854537d2a0d2127733':
libctest: zap
Mark Salyzyn [Wed, 21 May 2014 21:02:10 +0000 (21:02 +0000)]
Merge "libctest: zap"
Mark Salyzyn [Wed, 21 May 2014 20:27:58 +0000 (13:27 -0700)]
libctest: zap
Change-Id: Ia3ff0cad0995af428adf2dbdf10587dae904ec7d
Sreeram Ramachandran [Wed, 21 May 2014 17:04:16 +0000 (17:04 +0000)]
am
feb371ad: am
90a0edbc: Merge "Remove netd_client. It has moved to the internal tree."
* commit '
feb371ad6b437aac82b46c74956bff1f83df3744':
Remove netd_client. It has moved to the internal tree.
Sreeram Ramachandran [Wed, 21 May 2014 17:01:40 +0000 (17:01 +0000)]
am
90a0edbc: Merge "Remove netd_client. It has moved to the internal tree."
* commit '
90a0edbc0b6dfee222ff630973308c737202a6b7':
Remove netd_client. It has moved to the internal tree.
Sreeram Ramachandran [Wed, 21 May 2014 16:59:25 +0000 (16:59 +0000)]
Merge "Remove netd_client. It has moved to the internal tree."
Sreeram Ramachandran [Wed, 21 May 2014 16:55:44 +0000 (09:55 -0700)]
Remove netd_client. It has moved to the internal tree.
Change-Id: Iffcdb4900373c05086fd1085b861b6520065b7a3
Griff Hazen [Wed, 21 May 2014 03:05:08 +0000 (20:05 -0700)]
resolved conflicts for merge of
3bb81eb0 to klp-modular-dev-plus-aosp
Justin Koh [Wed, 21 May 2014 02:42:32 +0000 (02:42 +0000)]
Merge "Set API version for KKWT. DO NOT MERGE" into klp-modular-dev
Ying Wang [Wed, 21 May 2014 01:10:15 +0000 (01:10 +0000)]
am
8a724260: am
4e151105: Merge "Support to extract JNI libs from prebuilt APK"
* commit '
8a724260f2a3900808e0e733b893a37c119fe3f1':
Support to extract JNI libs from prebuilt APK
Ying Wang [Wed, 21 May 2014 01:06:03 +0000 (01:06 +0000)]
am
4e151105: Merge "Support to extract JNI libs from prebuilt APK"
* commit '
4e151105a02ba09acb277c6a084252d01c561a5f':
Support to extract JNI libs from prebuilt APK
Ying Wang [Wed, 21 May 2014 01:02:57 +0000 (01:02 +0000)]
Merge "Support to extract JNI libs from prebuilt APK"
Ying Wang [Sat, 19 Apr 2014 03:13:41 +0000 (20:13 -0700)]
Support to extract JNI libs from prebuilt APK
Use LOCAL_PREBUILT_JNI_LIBS to install prebuilt JNI libraries extracted
from the prebuilt apk, or prebuilts as source, to the app specific lib path.
LOCAL_PREBUILT_JNI_LIBS accepts 2 kinds of files:
- Files like @path/to/libfoo.so (path inside the apk) are JNI libs
extracted from the prebuilt apk. In this case, all embedded JNI libs
inside the prebuilt apk are stripped.
- Files like path/to/libfoo.so (path relative to LOCAL_PATH) are
prebuilts in the source tree.
Those prebuilt JNI libs are not defined as modules in the build system,
so this works around possible module name conflict.
Bug:
13170859
Change-Id: I91bb844cc11b3621a85733bc7e8910f168957ef0
Elliott Hughes [Tue, 20 May 2014 23:40:01 +0000 (23:40 +0000)]
am
e972f9ff: am
0dbcff95: Merge "The generic_arm64 system image is full."
* commit '
e972f9ffc00c09d3071c899c68c5de31dd4d122a':
The generic_arm64 system image is full.
Christopher Ferris [Tue, 20 May 2014 23:40:00 +0000 (23:40 +0000)]
am
965f3919: am
a2cd924b: Merge "Fix extra/missing : in path setup."
* commit '
965f39190cb50d97b98d47ba8ca205661cfa2c3d':
Fix extra/missing : in path setup.
Elliott Hughes [Tue, 20 May 2014 23:36:30 +0000 (23:36 +0000)]
am
0dbcff95: Merge "The generic_arm64 system image is full."
* commit '
0dbcff9599be1f999df467b7d17b4f2785a8452a':
The generic_arm64 system image is full.
Christopher Ferris [Tue, 20 May 2014 23:36:28 +0000 (23:36 +0000)]
am
a2cd924b: Merge "Fix extra/missing : in path setup."
* commit '
a2cd924bef556cb6ceccca1098cae338d37200a6':
Fix extra/missing : in path setup.
Elliott Hughes [Tue, 20 May 2014 21:48:10 +0000 (21:48 +0000)]
Merge "The generic_arm64 system image is full."
Elliott Hughes [Tue, 20 May 2014 21:37:51 +0000 (14:37 -0700)]
The generic_arm64 system image is full.
Change-Id: I454c674033525f2f7847d2c91979dff8093c335b
Christopher Ferris [Tue, 20 May 2014 21:18:50 +0000 (21:18 +0000)]
Merge "Fix extra/missing : in path setup."
Christopher Ferris [Tue, 20 May 2014 20:56:00 +0000 (13:56 -0700)]
Fix extra/missing : in path setup.
Change-Id: I4d95efc781c58af704012922d95841e009bf6286
Scott Main [Tue, 20 May 2014 17:21:55 +0000 (17:21 +0000)]
am
a8fcb35e: am
e0968f0e: am
c426499e: add 2x version of logo for sticky bar
* commit '
a8fcb35ec1901194fe82ba3d1054c1a919e2c1d2':
add 2x version of logo for sticky bar
Scott Main [Tue, 20 May 2014 17:19:22 +0000 (17:19 +0000)]
am
e0968f0e: am
c426499e: add 2x version of logo for sticky bar
* commit '
e0968f0e7027f894f3ff5a630720f12016d7202b':
add 2x version of logo for sticky bar
Scott Main [Tue, 20 May 2014 17:16:03 +0000 (17:16 +0000)]
am
c426499e: add 2x version of logo for sticky bar
* commit '
c426499ee8e8a3f6df85e46930a6c5aec9cf3d25':
add 2x version of logo for sticky bar
Scott Main [Tue, 20 May 2014 17:11:17 +0000 (10:11 -0700)]
add 2x version of logo for sticky bar
Change-Id: I5127d308ee820d4e77798ebe4aaa0f385b797383
Ben Cheng [Tue, 20 May 2014 16:08:07 +0000 (16:08 +0000)]
am
50e99111: am
54bea362: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)"
* commit '
50e99111795af08c7a9c687da6680554c2b54f80':
Use aarch64-linux-android-4.9 for arm64 build (attempt #4)
Ben Cheng [Tue, 20 May 2014 16:04:17 +0000 (16:04 +0000)]
am
54bea362: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)"
* commit '
54bea362ab7f33791bd6ea54d77a76dc8d9e005d':
Use aarch64-linux-android-4.9 for arm64 build (attempt #4)
Ben Cheng [Tue, 20 May 2014 16:00:07 +0000 (16:00 +0000)]
Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)"
Ben Murdoch [Tue, 20 May 2014 11:10:16 +0000 (11:10 +0000)]
am
0861ed07: Merge "Have core_tiny depend on the NullWebView." into klp-modular-dev
* commit '
0861ed07f0ef1583ed17dfbfba3ad31c8e50121e':
Have core_tiny depend on the NullWebView.
Ben Murdoch [Tue, 20 May 2014 11:10:15 +0000 (11:10 +0000)]
am
cf8cd38f: Merge "All devices that depend on WebView must have the system feature." into klp-modular-dev
* commit '
cf8cd38fac91d4d04d12ba0e7494809577fe0ceb':
All devices that depend on WebView must have the system feature.
Ben Murdoch [Tue, 20 May 2014 11:06:35 +0000 (11:06 +0000)]
Merge "Have core_tiny depend on the NullWebView." into klp-modular-dev
Ben Murdoch [Tue, 20 May 2014 11:06:07 +0000 (11:06 +0000)]
Merge "All devices that depend on WebView must have the system feature." into klp-modular-dev
Ben Cheng [Mon, 19 May 2014 23:22:21 +0000 (16:22 -0700)]
Use aarch64-linux-android-4.9 for arm64 build (attempt #4)
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.
Source code has been sync'ed against the 2014-05-14 snapshot which
contains many important fixes (devirtualization, codegen, ...).
Change-Id: I43229360ad0132193d5208cb0d1acba55084853c
Dirk Dougherty [Mon, 19 May 2014 18:12:52 +0000 (18:12 +0000)]
am
63168fff: am
b4cb3ebc: am
ca1230c9: Minor fixes for handling cross-browser load issues and positioning of #headings.
* commit '
63168ffff85e8888c003588b4beeab6769d578ed':
Minor fixes for handling cross-browser load issues and positioning of #headings.
Dirk Dougherty [Mon, 19 May 2014 18:08:50 +0000 (18:08 +0000)]
am
b4cb3ebc: am
ca1230c9: Minor fixes for handling cross-browser load issues and positioning of #headings.
* commit '
b4cb3ebc37423db5dc5b5327999d7efe874d7148':
Minor fixes for handling cross-browser load issues and positioning of #headings.
Dirk Dougherty [Mon, 19 May 2014 17:24:15 +0000 (17:24 +0000)]
am
ca1230c9: Minor fixes for handling cross-browser load issues and positioning of #headings.
* commit '
ca1230c9a251fd0eaf68665c424a69442f717df1':
Minor fixes for handling cross-browser load issues and positioning of #headings.
Brian Carlstrom [Mon, 19 May 2014 16:59:16 +0000 (16:59 +0000)]
am
a8355eca: am
64f3a191: Merge "Multilib support for odex"
* commit '
a8355ecaadf9a0d052165d0cc14564927eb9a202':
Multilib support for odex
Brian Carlstrom [Mon, 19 May 2014 16:53:35 +0000 (16:53 +0000)]
am
64f3a191: Merge "Multilib support for odex"
* commit '
64f3a191f92a6ab84a8175ad480633b8c58ac900':
Multilib support for odex
Ji-Hwan Lee [Mon, 19 May 2014 16:52:15 +0000 (16:52 +0000)]
am
c0f0e8ca: am
13b48588: Merge "Allow qemu_device read-write access to various processes"
* commit '
c0f0e8cab7268d372b5bded8b141133c2257f964':
Allow qemu_device read-write access to various processes
Brian Carlstrom [Mon, 19 May 2014 16:50:16 +0000 (16:50 +0000)]
Merge "Multilib support for odex"
Ji-Hwan Lee [Mon, 19 May 2014 16:48:51 +0000 (16:48 +0000)]
am
13b48588: Merge "Allow qemu_device read-write access to various processes"
* commit '
13b485889d95597a839f27f7774d55142bb8b5a7':
Allow qemu_device read-write access to various processes
Ji-Hwan Lee [Mon, 19 May 2014 16:46:30 +0000 (16:46 +0000)]
Merge "Allow qemu_device read-write access to various processes"
Ji-Hwan Lee [Mon, 19 May 2014 11:43:23 +0000 (20:43 +0900)]
Allow qemu_device read-write access to various processes
Basically, allow access of qemu_device where gpu_device is allowed, for the
case when the emulator runs with OpenGL/ES emulation. Most noticably,
surfaceflinger crashes without qemu_device access.
Bug:
15052949
Change-Id: Ib891365a6d503309bced64e2512c4d8f29d9a07e
Ben Murdoch [Fri, 4 Apr 2014 20:22:25 +0000 (21:22 +0100)]
Have core_tiny depend on the NullWebView.
Tiny devices do not support a functioning WebView.
Depends on I6afa169fa31db82c45c0a507e265301e48ac79dc
Bug:
13438487
Change-Id: I5f6e115ee569848d0494e0dd52ef037e3a0ee84e
Dirk Dougherty [Thu, 15 May 2014 03:00:03 +0000 (20:00 -0700)]
Minor fixes for handling cross-browser load issues and positioning of #headings.
Change-Id: I276b07cd85cc0e1edaede027b3dc3e4b1d24dcd7
Ying Wang [Tue, 13 May 2014 20:57:28 +0000 (13:57 -0700)]
Multilib support for odex
If the VM is libart and DEXPREOPT is enabled,
- For a Java library and the boot image, we build for both 1st arch and
2nd arch.
- For an app, we build for the multilib arch the module is targeted for.
The odex file will be in <arch_name>/<module_name>.odex inside the same
dir where the jar/apk file gets installed.
Nothing changed if it's built for libdvm.
Bug:
14694978
Change-Id: I45118a83758b41d52d6c9e38f93f0ba2775a6c74
Ji-Hwan Lee [Sun, 18 May 2014 07:18:27 +0000 (07:18 +0000)]
am
744e4aa2: am
e624fd28: Merge "Put prebuilt emulator path after host output"
* commit '
744e4aa228b4ad25d444acb020ee3816fd2c2eb1':
Put prebuilt emulator path after host output
Ji-Hwan Lee [Sun, 18 May 2014 07:18:26 +0000 (07:18 +0000)]
am
acfb2723: am
c60783c9: Merge "Increase system image size to 650M for generic_arm64"
* commit '
acfb27236cb02102d74fd52316c5b72d6ed79591':
Increase system image size to 650M for generic_arm64
Ji-Hwan Lee [Sun, 18 May 2014 06:50:32 +0000 (06:50 +0000)]
am
e624fd28: Merge "Put prebuilt emulator path after host output"
* commit '
e624fd281a74b42828a1902dfff11503f95fe28d':
Put prebuilt emulator path after host output
Ji-Hwan Lee [Sun, 18 May 2014 06:50:32 +0000 (06:50 +0000)]
am
c60783c9: Merge "Increase system image size to 650M for generic_arm64"
* commit '
c60783c9a291dc03a11326caac920c295ed999dc':
Increase system image size to 650M for generic_arm64
Ji-Hwan Lee [Sun, 18 May 2014 06:39:50 +0000 (06:39 +0000)]
Merge "Put prebuilt emulator path after host output"
Ji-Hwan Lee [Sun, 18 May 2014 06:38:16 +0000 (06:38 +0000)]
Merge "Increase system image size to 650M for generic_arm64"
Ji-Hwan Lee [Sat, 17 May 2014 17:41:41 +0000 (02:41 +0900)]
Increase system image size to 650M for generic_arm64
Change-Id: I7969ec54dc4225bbe36651c4d9c6a09de1eb89f4
Ying Wang [Sat, 17 May 2014 03:08:26 +0000 (03:08 +0000)]
am
002f3c28: am
4636abe5: Merge "Real "LOCAL_MULTILIB := both" for prebuilts"
* commit '
002f3c28629b8ee84d0a54fe9f2de745e965b9dc':
Real "LOCAL_MULTILIB := both" for prebuilts
Ying Wang [Sat, 17 May 2014 03:06:42 +0000 (03:06 +0000)]
am
4636abe5: Merge "Real "LOCAL_MULTILIB := both" for prebuilts"
* commit '
4636abe5899272e1e9051e2c98516409107c4e8c':
Real "LOCAL_MULTILIB := both" for prebuilts
Ying Wang [Sat, 17 May 2014 03:03:43 +0000 (03:03 +0000)]
Merge "Real "LOCAL_MULTILIB := both" for prebuilts"
Ying Wang [Sat, 17 May 2014 00:12:50 +0000 (00:12 +0000)]
am
023209b6: am
5ee3f096: Merge "Default TARGET_CPU_SMP to true."
* commit '
023209b63ee4be4289b3e07b3c3dc54773523094':
Default TARGET_CPU_SMP to true.
Ying Wang [Sat, 17 May 2014 00:09:03 +0000 (00:09 +0000)]
am
5ee3f096: Merge "Default TARGET_CPU_SMP to true."
* commit '
5ee3f0960dbc6a14333e3b98252d59f5d8d18a7d':
Default TARGET_CPU_SMP to true.
Ying Wang [Sat, 17 May 2014 00:07:15 +0000 (00:07 +0000)]
Merge "Default TARGET_CPU_SMP to true."
Ying Wang [Fri, 16 May 2014 23:30:15 +0000 (23:30 +0000)]
am
11278626: am
3c8089ce: Merge "Fix the missing 2nd arch prefix."
* commit '
112786266ab4737d7e586b2a14084d3d2e3974e3':
Fix the missing 2nd arch prefix.
Ying Wang [Fri, 16 May 2014 23:27:11 +0000 (16:27 -0700)]
Default TARGET_CPU_SMP to true.
Change-Id: If8c52c8ed66d52452967d09885dfe1ca9da13688
Ying Wang [Fri, 16 May 2014 23:26:31 +0000 (23:26 +0000)]
am
3c8089ce: Merge "Fix the missing 2nd arch prefix."
* commit '
3c8089cef8eaf90b11852a5c258eba0ff5e3287e':
Fix the missing 2nd arch prefix.
Ying Wang [Fri, 16 May 2014 23:23:16 +0000 (23:23 +0000)]
Merge "Fix the missing 2nd arch prefix."
Ying Wang [Fri, 16 May 2014 23:22:32 +0000 (16:22 -0700)]
Fix the missing 2nd arch prefix.
Bug:
13751317
Change-Id: Ie5a323a0a89245576dbc91271d3178574942627d
Dan Albert [Fri, 16 May 2014 22:06:03 +0000 (22:06 +0000)]
am
304a7a9f: am
b589679b: Merge "Use libc++ versions of gtest libs when needed"
* commit '
304a7a9fab6b907801b911ee77542296884c9d91':
Use libc++ versions of gtest libs when needed
Dan Albert [Fri, 16 May 2014 22:03:56 +0000 (22:03 +0000)]
am
b589679b: Merge "Use libc++ versions of gtest libs when needed"
* commit '
b589679b101e0863a1fd1d7f4fc6ee3370c8a60a':
Use libc++ versions of gtest libs when needed
Dan Albert [Fri, 16 May 2014 22:02:11 +0000 (22:02 +0000)]
Merge "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 [Wed, 14 May 2014 21:16:47 +0000 (14:16 -0700)]
Use libc++ versions of gtest libs when needed
Change-Id: Id8752ea946cbaa747dfa4fccf38d680dfeee5b45
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 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: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
Ying Wang [Fri, 16 May 2014 17:38:43 +0000 (10:38 -0700)]
Real "LOCAL_MULTILIB := both" for prebuilts
This uses the fact that unsetting LOCAL_MULTILIB equals "either".
It's useful to build for both 32-bit and 64-bit in the same prebuilt
module definition.
Bug:
13751317
Change-Id: I4f1625a83e13f22f807039afebae73f69ed35918
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"
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
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