Sreeram Ramachandran
baf9741d55
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.
2014-05-21 17:04:16 +00:00
Sreeram Ramachandran
feb371ad6b
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.
2014-05-21 17:01:40 +00:00
Sreeram Ramachandran
90a0edbc0b
Merge "Remove netd_client. It has moved to the internal tree."
2014-05-21 16:59:25 +00:00
Sreeram Ramachandran
a7877a4674
Remove netd_client. It has moved to the internal tree.
...
Change-Id: Iffcdb4900373c05086fd1085b861b6520065b7a3
2014-05-21 09:55:44 -07:00
Griff Hazen
0413efd261
resolved conflicts for merge of 3bb81eb0
to klp-modular-dev-plus-aosp
2014-05-20 20:05:08 -07:00
Justin Koh
3bb81eb04d
Merge "Set API version for KKWT. DO NOT MERGE" into klp-modular-dev
2014-05-21 02:42:33 +00:00
Ying Wang
2f4c0a8617
am 8a724260
: am 4e151105
: Merge "Support to extract JNI libs from prebuilt APK"
...
* commit '8a724260f2a3900808e0e733b893a37c119fe3f1':
Support to extract JNI libs from prebuilt APK
2014-05-21 01:10:15 +00:00
Ying Wang
8a724260f2
am 4e151105
: Merge "Support to extract JNI libs from prebuilt APK"
...
* commit '4e151105a02ba09acb277c6a084252d01c561a5f':
Support to extract JNI libs from prebuilt APK
2014-05-21 01:06:03 +00:00
Ying Wang
4e151105a0
Merge "Support to extract JNI libs from prebuilt APK"
2014-05-21 01:02:57 +00:00
Ying Wang
7cf9f28b5f
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
2014-05-20 18:02:17 -07:00
Elliott Hughes
d72b3164bd
am e972f9ff
: am 0dbcff95
: Merge "The generic_arm64 system image is full."
...
* commit 'e972f9ffc00c09d3071c899c68c5de31dd4d122a':
The generic_arm64 system image is full.
2014-05-20 23:40:01 +00:00
Christopher Ferris
bcbf9ae4de
am 965f3919
: am a2cd924b
: Merge "Fix extra/missing : in path setup."
...
* commit '965f39190cb50d97b98d47ba8ca205661cfa2c3d':
Fix extra/missing : in path setup.
2014-05-20 23:40:00 +00:00
Elliott Hughes
e972f9ffc0
am 0dbcff95
: Merge "The generic_arm64 system image is full."
...
* commit '0dbcff9599be1f999df467b7d17b4f2785a8452a':
The generic_arm64 system image is full.
2014-05-20 23:36:30 +00:00
Christopher Ferris
965f39190c
am a2cd924b
: Merge "Fix extra/missing : in path setup."
...
* commit 'a2cd924bef556cb6ceccca1098cae338d37200a6':
Fix extra/missing : in path setup.
2014-05-20 23:36:28 +00:00
Elliott Hughes
0dbcff9599
Merge "The generic_arm64 system image is full."
2014-05-20 21:48:10 +00:00
Elliott Hughes
0499399231
The generic_arm64 system image is full.
...
Change-Id: I454c674033525f2f7847d2c91979dff8093c335b
2014-05-20 14:44:26 -07:00
Christopher Ferris
a2cd924bef
Merge "Fix extra/missing : in path setup."
2014-05-20 21:18:51 +00:00
Christopher Ferris
7110f241ab
Fix extra/missing : in path setup.
...
Change-Id: I4d95efc781c58af704012922d95841e009bf6286
2014-05-20 14:09:36 -07:00
Scott Main
2949843002
am a8fcb35e
: am e0968f0e
: am c426499e
: add 2x version of logo for sticky bar
...
* commit 'a8fcb35ec1901194fe82ba3d1054c1a919e2c1d2':
add 2x version of logo for sticky bar
2014-05-20 17:21:55 +00:00
Scott Main
a8fcb35ec1
am e0968f0e
: am c426499e
: add 2x version of logo for sticky bar
...
* commit 'e0968f0e7027f894f3ff5a630720f12016d7202b':
add 2x version of logo for sticky bar
2014-05-20 17:19:22 +00:00
Scott Main
e0968f0e70
am c426499e
: add 2x version of logo for sticky bar
...
* commit 'c426499ee8e8a3f6df85e46930a6c5aec9cf3d25':
add 2x version of logo for sticky bar
2014-05-20 17:16:03 +00:00
Scott Main
c426499ee8
add 2x version of logo for sticky bar
...
Change-Id: I5127d308ee820d4e77798ebe4aaa0f385b797383
2014-05-20 10:11:17 -07:00
Ben Cheng
dfec8f8915
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 )
2014-05-20 16:08:07 +00:00
Ben Cheng
50e9911179
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 )
2014-05-20 16:04:17 +00:00
Ben Cheng
54bea362ab
Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4 )"
2014-05-20 16:00:08 +00:00
Ben Murdoch
fac17e16a5
am 0861ed07
: Merge "Have core_tiny depend on the NullWebView." into klp-modular-dev
...
* commit '0861ed07f0ef1583ed17dfbfba3ad31c8e50121e':
Have core_tiny depend on the NullWebView.
2014-05-20 11:10:16 +00:00
Ben Murdoch
527ce064c9
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.
2014-05-20 11:10:15 +00:00
Ben Murdoch
0861ed07f0
Merge "Have core_tiny depend on the NullWebView." into klp-modular-dev
2014-05-20 11:06:35 +00:00
Ben Murdoch
cf8cd38fac
Merge "All devices that depend on WebView must have the system feature." into klp-modular-dev
2014-05-20 11:06:08 +00:00
Ben Cheng
d033121431
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
2014-05-19 16:22:21 -07:00
Dirk Dougherty
7a62e01c0b
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.
2014-05-19 18:12:52 +00:00
Dirk Dougherty
63168ffff8
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.
2014-05-19 18:08:50 +00:00
Dirk Dougherty
b4cb3ebc37
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.
2014-05-19 17:24:15 +00:00
Brian Carlstrom
8074ff4d0f
am a8355eca
: am 64f3a191
: Merge "Multilib support for odex"
...
* commit 'a8355ecaadf9a0d052165d0cc14564927eb9a202':
Multilib support for odex
2014-05-19 16:59:16 +00:00
Brian Carlstrom
a8355ecaad
am 64f3a191
: Merge "Multilib support for odex"
...
* commit '64f3a191f92a6ab84a8175ad480633b8c58ac900':
Multilib support for odex
2014-05-19 16:53:35 +00:00
Ji-Hwan Lee
d9f11a3f2b
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
2014-05-19 16:52:15 +00:00
Brian Carlstrom
64f3a191f9
Merge "Multilib support for odex"
2014-05-19 16:50:17 +00:00
Ji-Hwan Lee
c0f0e8cab7
am 13b48588
: Merge "Allow qemu_device read-write access to various processes"
...
* commit '13b485889d95597a839f27f7774d55142bb8b5a7':
Allow qemu_device read-write access to various processes
2014-05-19 16:48:51 +00:00
Ji-Hwan Lee
13b485889d
Merge "Allow qemu_device read-write access to various processes"
2014-05-19 16:46:30 +00:00
Ji-Hwan Lee
93e450767f
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
2014-05-19 20:49:17 +09:00
Ben Murdoch
0b4abb9a77
Have core_tiny depend on the NullWebView.
...
Tiny devices do not support a functioning WebView.
Depends on I6afa169fa31db82c45c0a507e265301e48ac79dc
Bug: 13438487
Change-Id: I5f6e115ee569848d0494e0dd52ef037e3a0ee84e
2014-05-19 11:09:53 +00:00
Dirk Dougherty
ca1230c9a2
Minor fixes for handling cross-browser load issues and positioning of #headings.
...
Change-Id: I276b07cd85cc0e1edaede027b3dc3e4b1d24dcd7
2014-05-18 22:10:43 -07:00
Ying Wang
b9aa5d43de
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
2014-05-18 22:04:58 -07:00
Ji-Hwan Lee
fff1b6d800
am 744e4aa2
: am e624fd28
: Merge "Put prebuilt emulator path after host output"
...
* commit '744e4aa228b4ad25d444acb020ee3816fd2c2eb1':
Put prebuilt emulator path after host output
2014-05-18 07:18:27 +00:00
Ji-Hwan Lee
38c18c3b9a
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
2014-05-18 07:18:26 +00:00
Ji-Hwan Lee
744e4aa228
am e624fd28
: Merge "Put prebuilt emulator path after host output"
...
* commit 'e624fd281a74b42828a1902dfff11503f95fe28d':
Put prebuilt emulator path after host output
2014-05-18 06:50:32 +00:00
Ji-Hwan Lee
acfb27236c
am c60783c9
: Merge "Increase system image size to 650M for generic_arm64"
...
* commit 'c60783c9a291dc03a11326caac920c295ed999dc':
Increase system image size to 650M for generic_arm64
2014-05-18 06:50:32 +00:00
Ji-Hwan Lee
e624fd281a
Merge "Put prebuilt emulator path after host output"
2014-05-18 06:39:50 +00:00
Ji-Hwan Lee
c60783c9a2
Merge "Increase system image size to 650M for generic_arm64"
2014-05-18 06:38:17 +00:00
Ji-Hwan Lee
c89e1826ba
Increase system image size to 650M for generic_arm64
...
Change-Id: I7969ec54dc4225bbe36651c4d9c6a09de1eb89f4
2014-05-18 02:42:14 +09:00