OSDN Git Service
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.
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
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
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: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 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"
Ian Rogers [Mon, 12 May 2014 23:04:31 +0000 (23:04 +0000)]
am
50912342: am
f544a5f4: Merge "Place ISA in ART boot image name."
* commit '
50912342f10e769f17b9ea0e2174633af6f95cd3':
Place ISA in ART boot image name.
Ian Rogers [Mon, 12 May 2014 23:00:45 +0000 (23:00 +0000)]
am
f544a5f4: Merge "Place ISA in ART boot image name."
* commit '
f544a5f4d57750b569333a59d57f568121f6f4a3':
Place ISA in ART boot image name.
Ian Rogers [Mon, 12 May 2014 22:45:54 +0000 (22:45 +0000)]
Merge "Place ISA in ART boot image name."
Ian Rogers [Sat, 10 May 2014 00:11:49 +0000 (17:11 -0700)]
Place ISA in ART boot image name.
Depends upon:
https://android-review.googlesource.com/#/c/94096/2
Change-Id: I79bec60a17ea7cf9214e56f8035d4a1b80b0eeb6
Ying Wang [Mon, 12 May 2014 16:57:42 +0000 (16:57 +0000)]
am
6c432940: am
dcdc985c: Merge "executable_prefer_symlink: add makefile for creating symlink to prefer version"
* commit '
6c432940599d5f5d3d11a26f12342845433f0a98':
executable_prefer_symlink: add makefile for creating symlink to prefer version
Ying Wang [Mon, 12 May 2014 16:53:01 +0000 (16:53 +0000)]
am
dcdc985c: Merge "executable_prefer_symlink: add makefile for creating symlink to prefer version"
* commit '
dcdc985c47338c29e66a22941904abd4171607c9':
executable_prefer_symlink: add makefile for creating symlink to prefer version
Ying Wang [Mon, 12 May 2014 16:49:15 +0000 (16:49 +0000)]
Merge "executable_prefer_symlink: add makefile for creating symlink to prefer version"
David 'Digit' Turner [Sun, 11 May 2014 09:23:35 +0000 (09:23 +0000)]
am
9e3259f5: am
fb67f05d: Merge changes I53b2ada9,I30794ea5
* commit '
9e3259f50d6aa2ca4430430d71d2fffd58662650':
Disable emulator from platform builds.
envsetup.sh: Use prebuilt emulator binaries if available.
David 'Digit' Turner [Sun, 11 May 2014 09:19:43 +0000 (09:19 +0000)]
am
fb67f05d: Merge changes I53b2ada9,I30794ea5
* commit '
fb67f05d3d6deb2400fd09390550a7858a3c3158':
Disable emulator from platform builds.
envsetup.sh: Use prebuilt emulator binaries if available.
David 'Digit' Turner [Sun, 11 May 2014 09:16:15 +0000 (09:16 +0000)]
Merge changes I53b2ada9,I30794ea5
* changes:
Disable emulator from platform builds.
envsetup.sh: Use prebuilt emulator binaries if available.
Scott Main [Sat, 10 May 2014 00:18:17 +0000 (00:18 +0000)]
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 to a primary horizontal-nav link, the he
* commit '
e4af3b35588932d9f14eacaee783bb6fcff0d72b':
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 to a primary horizontal-nav link, the header logo is used for the breadcrumb's first link and text.
Scott Main [Sat, 10 May 2014 00:13:27 +0000 (00:13 +0000)]
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 to a primary horizontal-nav link, the header logo is
* commit '
18ba007b371478254faa43f563ee28295e7d742d':
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 to a primary horizontal-nav link, the header logo is used for the breadcrumb's first link and text.
Scott Main [Sat, 10 May 2014 00:09:02 +0000 (00:09 +0000)]
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 to a primary horizontal-nav link, the header logo is used for the
* commit '
7a6ab434bc34319f06818d12d3abaf9070630684':
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 to a primary horizontal-nav link, the header logo is used for the breadcrumb's first link and text.
Scott Main [Fri, 9 May 2014 17:00:14 +0000 (10:00 -0700)]
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
to a primary horizontal-nav link, the header logo is used for the breadcrumb's
first link and text.
Change-Id: I14129fe7657924e2037c103674e09322c4c31db8
Andrew Hsieh [Fri, 9 May 2014 17:02:10 +0000 (17:02 +0000)]
am
c581e10a: am
eca0043b: Merge "Disable canonical prefixes of system headers"
* commit '
c581e10a2b6f54e6f6b24dbd3e5fb10cdf3c77eb':
Disable canonical prefixes of system headers
Andrew Hsieh [Fri, 9 May 2014 16:59:04 +0000 (16:59 +0000)]
am
eca0043b: Merge "Disable canonical prefixes of system headers"
* commit '
eca0043b869cb10792e2f3e79d4714bde2945bac':
Disable canonical prefixes of system headers
Andrew Hsieh [Fri, 9 May 2014 16:55:00 +0000 (16:55 +0000)]
Merge "Disable canonical prefixes of system headers"
Ying Wang [Fri, 9 May 2014 16:50:05 +0000 (16:50 +0000)]
am
98892291: am
3afc688a: Merge "javac: rename common_flags to avoid conflictions"
* commit '
9889229133470c89acfb0083f8d5c62c29ea1d4e':
javac: rename common_flags to avoid conflictions
Ying Wang [Fri, 9 May 2014 16:45:44 +0000 (16:45 +0000)]
am
3afc688a: Merge "javac: rename common_flags to avoid conflictions"
* commit '
3afc688a6acc1753a2b104719a7a27f223f50750':
javac: rename common_flags to avoid conflictions
Ying Wang [Fri, 9 May 2014 16:40:33 +0000 (16:40 +0000)]
Merge "javac: rename common_flags to avoid conflictions"
Andrew Hsieh [Fri, 9 May 2014 06:13:13 +0000 (14:13 +0800)]
Disable canonical prefixes of system headers
GCC know a few pre-defined paths (relative to its location) to
search for headers, libraries, program, etc. By default GCC prefixes
its own path(argv[0]) and calls realpath() which result in absolute
path with all symlink, . and .. removed.
It's usually good to have canonicalised paths, but absolute paths
in *.d file can cause unnecessary relinking when stale entries
in ccache cache hit
Add -no-canonical-prefixes (gcc>=4.6) and
-fno-canonical-system-headers (gcc>4.6) to disable realpath() on
prefixed paths
Change-Id: I58d739e61fb013015fb05a9c98b2132b307f915a
David 'Digit' Turner [Fri, 9 May 2014 13:19:45 +0000 (15:19 +0200)]
Disable emulator from platform builds.
Now that emulator prebuilts are available under prebuilts/android-emulator/,
disable building the emulator from source in all platform builds, except
if one defines BUILD_EMULATOR to 'true' in its environment.
NOTE: This patch should be applied after this one to avoid issues
with the GPU emulation libraries:
https://android-review.googlesource.com/93980
Change-Id: I53b2ada9ca0c2e159dccee7cdca7f55f6b0d1d42
David 'Digit' Turner [Mon, 5 May 2014 14:13:50 +0000 (16:13 +0200)]
envsetup.sh: Use prebuilt emulator binaries if available.
This patch changes the setpaths() function in envsetup.sh to probe
for prebuilts/android-emulator/<host>/, and prepend it to PATH if
it exists.
See https://android-review.googlesource.com/#/c/93399/
for a related patch that adds the binaries.
BUG=
13747402
Change-Id: I30794ea52f6dfc58908e6271f2c0da8e2f0b68e8
Yongqin Liu [Wed, 7 May 2014 04:41:24 +0000 (12:41 +0800)]
executable_prefer_symlink: add makefile for creating symlink to prefer version
For a 64bit target, we can have support for both 32bit and 64bit version
binary(like app_process, dalvikvm), and there are some commands like am/pm
will call these commands to implement it's function.
In some targets it will prefer to use the 32bit version, and in other targets
it will prefer to use the 64bit version. So this change is to add the common
work for creating the symlink to the prefer version binary,and avoid the
change on the caller commands side like am/pm.
In this change, it uses TARGET_PREFER_32_BIT_APPS to decide linking to
32bit version or 64bit version.
Change-Id: I96f041c0e0ededd953feead30ec63ad63e945a6f
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Andrew Hsieh [Fri, 9 May 2014 03:40:50 +0000 (11:40 +0800)]
Define __USE_MINGW_ANSI_STDIO for windows build
Some printf/scanf functions in Windows aren't C99 compatible.
Define __USE_MINGW_ANSI_STDIO for mingw compiler to use it's own set of
replacement libraries which are more C99-like.
Change-Id: I51dfa582971ec0487409067e8bb7fe3a44577b93
Nick Reuter [Fri, 9 May 2014 02:36:05 +0000 (21:36 -0500)]
javac: rename common_flags to avoid conflictions
* Currently the flag conflicts with one seen in hardware/qcom
rename to avoid issues.
Change-Id: I876fcd6a254f349dc5260509bcddb0367a7d49d8
Signed-off-by: Nick Reuter <nreuter85@gmail.com>
Xavier Ducrohet [Fri, 9 May 2014 01:41:34 +0000 (18:41 -0700)]
Resolved conflicts for merge of
05a7a955 to klp-modular-dev-plus-aosp
Change-Id: Ife0d1ef3d5a0cb4b91c8b813d259c947c85018f8
Xavier Ducrohet [Fri, 9 May 2014 00:52:34 +0000 (00:52 +0000)]
am
afe444a5: Merge "Remove SDK Tools from platform builds."
* commit '
afe444a564ed72cdda792822a0c9dab57a8c9172':
Remove SDK Tools from platform builds.
Xavier Ducrohet [Fri, 9 May 2014 00:46:44 +0000 (00:46 +0000)]
Merge "Remove SDK Tools from platform builds."
Ying Wang [Fri, 9 May 2014 00:10:43 +0000 (00:10 +0000)]
am
d6214b31: am
0d4b3df6: Merge "Target "tests" now only builds the modules tagged as "tests""
* commit '
d6214b3161161faf63a60b3ad3f595569a481192':
Target "tests" now only builds the modules tagged as "tests"
Ying Wang [Fri, 9 May 2014 00:10:43 +0000 (00:10 +0000)]
am
2d41656c: am
f6603f75: Merge "Add tool to package up built modules."
* commit '
2d41656cdb41853e42a7ea2c0597ce505ef51750':
Add tool to package up built modules.
Ying Wang [Fri, 9 May 2014 00:06:36 +0000 (00:06 +0000)]
am
0d4b3df6: Merge "Target "tests" now only builds the modules tagged as "tests""
* commit '
0d4b3df6aa495ab2aaabe3a8d5c9c6ad69ab5667':
Target "tests" now only builds the modules tagged as "tests"
Ying Wang [Fri, 9 May 2014 00:06:35 +0000 (00:06 +0000)]
am
f6603f75: Merge "Add tool to package up built modules."
* commit '
f6603f753d492823e19d0677d5a9ccfc16f51805':
Add tool to package up built modules.
Ying Wang [Fri, 9 May 2014 00:03:03 +0000 (00:03 +0000)]
Merge "Target "tests" now only builds the modules tagged as "tests""
Ying Wang [Fri, 9 May 2014 00:02:50 +0000 (00:02 +0000)]
Merge "Add tool to package up built modules."
Ying Wang [Wed, 7 May 2014 23:39:21 +0000 (16:39 -0700)]
Target "tests" now only builds the modules tagged as "tests"
But not install them.
This prevents "make tests" polluting system.img or userdata.img.
We have new mechanism to build and package up modules into zip file in
build/core/tasks/tools.
Change package-modules.mk to install DATA/ instead of data/ in the
zip file; Better handle of module name conflicting.
Bug:
13585955
Change-Id: I7586a8c7995b984c9ead0ba2fa84dd5d2dd20bd1
Ying Wang [Mon, 5 May 2014 23:46:52 +0000 (16:46 -0700)]
Add tool to package up built modules.
With this change, you can package up modules while avoiding installing
them to the system.img or userdata.img.
- build/core/tasks/tools/package-modules.mk
You can use this template to package up modules into a zip file and
preserve the installed file paths.
- LOCAL_PICKUP_FILES, you can use this variable to package up extra
files/directories.
Bug:
13585955
Change-Id: I103042b24ccf17cf5dc90c016d97ed1dd293e50b
Tsu Chiang Chuang [Thu, 8 May 2014 23:01:48 +0000 (23:01 +0000)]
am
5bd1da1e: am
41d8760d: Merge "Bump userdata image size from 200 MB to 550 MB"
* commit '
5bd1da1e0e9dff444f98fb1b2e2954663041198f':
Bump userdata image size from 200 MB to 550 MB
Tsu Chiang Chuang [Thu, 8 May 2014 22:50:27 +0000 (22:50 +0000)]
am
41d8760d: Merge "Bump userdata image size from 200 MB to 550 MB"
* commit '
41d8760d683f21d2868fbfb6872a3cf65b9edbcb':
Bump userdata image size from 200 MB to 550 MB
Tsu Chiang Chuang [Thu, 8 May 2014 22:39:00 +0000 (22:39 +0000)]
Merge "Bump userdata image size from 200 MB to 550 MB"
Brian Carlstrom [Thu, 8 May 2014 21:57:32 +0000 (21:57 +0000)]
am
4ed19f0f: am
1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for eng build"
* commit '
4ed19f0f4294544d0447025f0079a9d9e185a495':
Add dalvik.vm.dex2oat-flags for eng build
Brian Carlstrom [Thu, 8 May 2014 21:53:14 +0000 (21:53 +0000)]
am
1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for eng build"
* commit '
1e63c2d15cba608a154bbd563f96dde334691147':
Add dalvik.vm.dex2oat-flags for eng build
Xavier Ducrohet [Tue, 1 Apr 2014 19:13:58 +0000 (12:13 -0700)]
Remove SDK Tools from platform builds.
(cherry picked from commit
edf30221b4890673dc714a1efef3b5faf4ae1522)
Change-Id: Ia74c2ece1528adca10a4eec24e73b4ce361af1a9
Brian Carlstrom [Thu, 8 May 2014 21:49:31 +0000 (21:49 +0000)]
Merge "Add dalvik.vm.dex2oat-flags for eng build"
Ying Wang [Thu, 8 May 2014 00:27:03 +0000 (00:27 +0000)]
am
0a61a603: am
3b15cdb8: Merge "Apply LOCAL_LDLIBS to target build rules too."
* commit '
0a61a6032ccfe5b26395da1a0a9512957797fa69':
Apply LOCAL_LDLIBS to target build rules too.
Ying Wang [Thu, 8 May 2014 00:21:35 +0000 (00:21 +0000)]
am
3b15cdb8: Merge "Apply LOCAL_LDLIBS to target build rules too."
* commit '
3b15cdb854dfe79507cace8ce54828861bbe7a8c':
Apply LOCAL_LDLIBS to target build rules too.
Ying Wang [Thu, 8 May 2014 00:15:30 +0000 (00:15 +0000)]
Merge "Apply LOCAL_LDLIBS to target build rules too."
Ying Wang [Wed, 7 May 2014 18:33:19 +0000 (11:33 -0700)]
Apply LOCAL_LDLIBS to target build rules too.
Use LOCAL_LDLIBS to link against prebuilt libraries (such as NDK
libraries).
Previously LOCAL_LDLIBS only applies to host modules and the behaviour
confuses users.
Change-Id: I515546d7b59ef54e8ef09050eb58ec63534c9291
Brian Carlstrom [Tue, 11 Feb 2014 01:52:53 +0000 (17:52 -0800)]
Add dalvik.vm.dex2oat-flags for eng build
Bug:
12869646
Change-Id: I794320267c846225931f12075c7f32d7848081e9
Tsu Chiang Chuang [Wed, 7 May 2014 00:27:20 +0000 (17:27 -0700)]
Bump userdata image size from 200 MB to 550 MB
Change-Id: Ibdf319091a7187dc894f4a923d40868cec4b7b41
Ying Wang [Tue, 6 May 2014 19:19:15 +0000 (19:19 +0000)]
am
ba0bb801: am
a16583a0: Merge "Fix windows/mingw build."
* commit '
ba0bb801c3cfee582e454432e6a0a75491e54236':
Fix windows/mingw build.
Ying Wang [Tue, 6 May 2014 19:16:12 +0000 (19:16 +0000)]
am
a16583a0: Merge "Fix windows/mingw build."
* commit '
a16583a0880f574937f08bf2c86be72b0f4b9274':
Fix windows/mingw build.
Ying Wang [Tue, 6 May 2014 19:13:21 +0000 (19:13 +0000)]
Merge "Fix windows/mingw build."
Ying Wang [Tue, 6 May 2014 19:10:55 +0000 (12:10 -0700)]
Fix windows/mingw build.
Bug:
14446414
Change-Id: I9d12ed8afb6d4d5a09ef9b2844eb193b52b74271
Ying Wang [Tue, 6 May 2014 18:46:10 +0000 (18:46 +0000)]
am
c3b2314a: am
a37550ed: Merge "Use prebuilt flex."
* commit '
c3b2314a58e8d6f90766db2ef82303bafcefb766':
Use prebuilt flex.
Ying Wang [Tue, 6 May 2014 18:43:28 +0000 (18:43 +0000)]
am
a37550ed: Merge "Use prebuilt flex."
* commit '
a37550edd39b3520839251b2a4acceca779a8a8b':
Use prebuilt flex.
Ying Wang [Tue, 6 May 2014 18:40:59 +0000 (18:40 +0000)]
Merge "Use prebuilt flex."
Ying Wang [Tue, 6 May 2014 16:24:30 +0000 (16:24 +0000)]
am
e9dd544d: am
889a93a4: Merge "add silvermont x86 architecture"
* commit '
e9dd544dfed3a974d2bb2e6f783238ecfe64fb6c':
add silvermont x86 architecture
Ying Wang [Tue, 6 May 2014 16:20:51 +0000 (16:20 +0000)]
am
889a93a4: Merge "add silvermont x86 architecture"
* commit '
889a93a49582fa17049f0424af3c1c06f70db407':
add silvermont x86 architecture
Ying Wang [Tue, 6 May 2014 16:18:56 +0000 (16:18 +0000)]
Merge "add silvermont x86 architecture"
Ying Wang [Tue, 6 May 2014 02:05:46 +0000 (02:05 +0000)]
am
2c32044d: am
b7e0bdc0: Merge "Increase system image size of generic_x86_64 to 750MB."
* commit '
2c32044d95501b376cd8f912b28c957accfb1873':
Increase system image size of generic_x86_64 to 750MB.
Ying Wang [Tue, 6 May 2014 02:03:55 +0000 (02:03 +0000)]
am
b7e0bdc0: Merge "Increase system image size of generic_x86_64 to 750MB."
* commit '
b7e0bdc02be3c505c72d431c1addd42016d0a7fc':
Increase system image size of generic_x86_64 to 750MB.
Ying Wang [Tue, 6 May 2014 02:01:58 +0000 (02:01 +0000)]
Merge "Increase system image size of generic_x86_64 to 750MB."
Ying Wang [Tue, 6 May 2014 02:01:28 +0000 (19:01 -0700)]
Increase system image size of generic_x86_64 to 750MB.
Change-Id: I0c3264c7f629bc4d8c30539590de00967188807b
Ying Wang [Tue, 6 May 2014 01:34:57 +0000 (18:34 -0700)]
Use prebuilt flex.
Bug:
14446414
Change-Id: I07fe8d7f246de853e5bae17286834268e36d260c
Colin Cross [Mon, 5 May 2014 23:09:04 +0000 (23:09 +0000)]
am
9150a90d: am
5128237a: Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config"
* commit '
9150a90dafd6554519d41e5efffeb501268cf8de':
build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config
Colin Cross [Mon, 5 May 2014 23:05:14 +0000 (23:05 +0000)]
am
5128237a: Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config"
* commit '
5128237ad3312523c5a1390efce33ad77f0f2ff0':
build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config
Colin Cross [Mon, 5 May 2014 23:02:45 +0000 (23:02 +0000)]
Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config"
Colin Cross [Mon, 5 May 2014 22:25:41 +0000 (15:25 -0700)]
build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config
Set TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS,
TARGET_PREFERS_32_BIT_APPS is enough to get apps to build for
32-bit only, and leaving TARGET_SUPPORTS_64_BIT_APPS unset
confuses zygote64 because it finds an empty 64-bit ABI list.
Change-Id: Iadea7f2b42c216710b54aeac6011a4e30e0f2eaa
Colin Cross [Mon, 5 May 2014 20:18:09 +0000 (20:18 +0000)]
am
735628e8: am
2ff8919d: Merge changes I7e809264,I504cea21,Ibd2165e6
* commit '
735628e8d19fae51574bd5057c142db56797a2b0':
build: add core_64_bit.mk
build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
build: split TARGET_PREFER_32_BIT for apps and executables
Colin Cross [Mon, 5 May 2014 20:14:18 +0000 (20:14 +0000)]
am
2ff8919d: Merge changes I7e809264,I504cea21,Ibd2165e6
* commit '
2ff8919de339209412d9da2a524f566dfcf5847f':
build: add core_64_bit.mk
build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
build: split TARGET_PREFER_32_BIT for apps and executables
Colin Cross [Mon, 5 May 2014 20:11:28 +0000 (20:11 +0000)]
Merge changes I7e809264,I504cea21,Ibd2165e6
* changes:
build: add core_64_bit.mk
build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
build: split TARGET_PREFER_32_BIT for apps and executables
Ying Wang [Mon, 5 May 2014 18:45:57 +0000 (18:45 +0000)]
am
54a570bd: am
57df0c7b: Merge "Increase system image size of generic_x86_64 to 650MB."
* commit '
54a570bd1da36041124965110f4d2d1206558c82':
Increase system image size of generic_x86_64 to 650MB.
Ying Wang [Mon, 5 May 2014 18:41:32 +0000 (18:41 +0000)]
am
57df0c7b: Merge "Increase system image size of generic_x86_64 to 650MB."
* commit '
57df0c7bf5a78b1c4edb7e06d22ccc91ad46b41d':
Increase system image size of generic_x86_64 to 650MB.
Ying Wang [Mon, 5 May 2014 18:37:29 +0000 (18:37 +0000)]
Merge "Increase system image size of generic_x86_64 to 650MB."
Ying Wang [Mon, 5 May 2014 18:33:06 +0000 (11:33 -0700)]
Increase system image size of generic_x86_64 to 650MB.
Change-Id: Iacf6dcd00d78039d1b19595db6f293f8f202ac5a
Justin Koh [Mon, 5 May 2014 17:46:55 +0000 (17:46 +0000)]
am
0e35df2a: Add ContactsProvider to core_tiny.
* commit '
0e35df2a7c77a6308106fa9a48f90c4729b9b8f3':
Add ContactsProvider to core_tiny.
Justin Koh [Sun, 4 May 2014 23:31:02 +0000 (16:31 -0700)]
Add ContactsProvider to core_tiny.
Add ContactsProvider to core_tiny: this is necessary to pass CTS.
Change-Id: I159109740f329e5c540ffb6f1cd1b1a7f9429d86
Dirk Dougherty [Fri, 2 May 2014 22:58:02 +0000 (22:58 +0000)]
am
611d7e14: am
379d9968: am
e21bed28: Merge changes from templates-sdk to templates-sdk-dyn.
* commit '
611d7e14e87d030cd5d89b932a1877289ab68e8d':
Merge changes from templates-sdk to templates-sdk-dyn.
Dirk Dougherty [Fri, 2 May 2014 22:54:45 +0000 (22:54 +0000)]
am
379d9968: am
e21bed28: Merge changes from templates-sdk to templates-sdk-dyn.
* commit '
379d9968ccc31701053eca7e0d809f2f52c0b964':
Merge changes from templates-sdk to templates-sdk-dyn.
Dirk Dougherty [Fri, 2 May 2014 22:50:25 +0000 (22:50 +0000)]
am
e21bed28: Merge changes from templates-sdk to templates-sdk-dyn.
* commit '
e21bed28acdd21f6000d1de30538839085ffa890':
Merge changes from templates-sdk to templates-sdk-dyn.
Dirk Dougherty [Fri, 2 May 2014 22:14:04 +0000 (15:14 -0700)]
Merge changes from templates-sdk to templates-sdk-dyn.
Change-Id: I42e42f8d412eae6fc1160594c235cda81b2baf4f
Tim Murray [Fri, 2 May 2014 18:26:14 +0000 (18:26 +0000)]
am
6ac74e6d: am
d720c5a2: Merge "Add -no-integrated-as for ARM64."
* commit '
6ac74e6d81744654b6ca36b5df369975a1fcc655':
Add -no-integrated-as for ARM64.