Elliott Hughes
b515347710
am c7504124: am 47cdacd5: Merge "Remove libportable from core_base.mk."
...
* commit 'c75041243c1c189e6972eb8680c83f1b17dacfd7':
Remove libportable from core_base.mk.
2014-06-10 19:27:47 +00:00
Elliott Hughes
c75041243c
am 47cdacd5: Merge "Remove libportable from core_base.mk."
...
* commit '47cdacd5e633c8256a5dd32c769b5469882fc0aa':
Remove libportable from core_base.mk.
2014-06-10 19:25:57 +00:00
Elliott Hughes
4e8c6991e5
Remove libportable from core_base.mk.
...
Change-Id: I3fae0625c68db885bd2fba502d31fe3c524d4f47
2014-06-10 12:19:01 -07:00
Adam Lesinski
2f9a705e5e
am 3f1b5c52: Merge "The public Telephony APIs must be present in all Android products" into klp-modular-dev
...
* commit '3f1b5c52d27165fc5aa0fbf443f10e8ad3e81ab7':
The public Telephony APIs must be present in all Android products
2014-06-05 22:21:32 +00:00
Qiwen Zhao
e8e7ebbde4
Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
...
This reverts commit a5abefbbb5
.
2014-06-04 11:21:21 -07:00
Qiwen Zhao
a5abefbbb5
Revert "DO NOT MERGE: Combine emulator test projects into a single apk"
...
This reverts commit 0ced06ea0f
.
2014-06-04 10:02:29 -07:00
Steve Moyer
37773821f1
DO NOT MERGE: Combine emulator test projects into a single apk
...
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests
Conflicts:
target/product/sdk.mk
Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
2014-06-04 09:41:24 -07:00
Steve Moyer
008dc16cb0
DO NOT MERGE: Combine emulator test projects into a single apk
...
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests
Conflicts:
target/product/sdk.mk
Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
2014-06-04 09:38:32 -07:00
Adam Lesinski
40703e9473
The public Telephony APIs must be present in all Android products
...
Change-Id: I8d510a422b00b65beed2675c611301e20fd1356f
2014-06-03 21:12:25 -07:00
Nick Kralevich
362d2d4123
am 333005f1: am c706ea79: Merge "Include selinux_version file with builds."
...
* commit '333005f1bfa7dc36d327ddb45fdf8fa2d38ca768':
Include selinux_version file with builds.
2014-06-02 19:27:04 +00:00
Nick Kralevich
333005f1bf
am c706ea79: Merge "Include selinux_version file with builds."
...
* commit 'c706ea79629792f4432774643887f5681e8f145d':
Include selinux_version file with builds.
2014-06-02 19:25:21 +00:00
Nick Kralevich
c706ea7962
Merge "Include selinux_version file with builds."
2014-06-02 19:23:12 +00:00
Dave Allison
faa2d24991
am f4115cdf: am 2a2ba735: Merge "Add libsigchain to the embedded.mk makefile"
...
* commit 'f4115cdfac6bfde8e3d7cab1e7782d078d764209':
Add libsigchain to the embedded.mk makefile
2014-05-29 21:06:26 +00:00
Brian Carlstrom
8fe9c76d9a
resolved conflicts for merge of 2267c22b
to klp-modular-dev-plus-aosp
...
Change-Id: I636a1ebd2f68e2c505875bf3333f18a8977a0e2c
2014-05-29 14:01:24 -07:00
Dave Allison
f4115cdfac
am 2a2ba735: Merge "Add libsigchain to the embedded.mk makefile"
...
* commit '2a2ba735df028a6168368a399b6df27a6ec33fa4':
Add libsigchain to the embedded.mk makefile
2014-05-29 19:57:50 +00:00
Dave Allison
2a2ba735df
Merge "Add libsigchain to the embedded.mk makefile"
2014-05-29 19:51:50 +00:00
Brian Carlstrom
2267c22b3d
am f2a2406b: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
...
* commit 'f2a2406b8c01e71603feaa5eaccd75d26ea76804':
Remove dependencies on runtime_libdvm and libdvm.so in general
2014-05-29 19:39:49 +00:00
Brian Carlstrom
1e60fe58f0
Remove dependencies on runtime_libdvm and libdvm.so in general
...
Bug: 14298175
(cherry picked from commit bf8a374a92
)
Change-Id: I183d1ff078a54c422305d8798ea200855265ebb6
2014-05-29 09:37:25 -07:00
Elliott Hughes
55b2c3600f
am ad319779: am 4afe808c: Merge "Fix all the system image sizes."
...
* commit 'ad319779ff31f9c03b05b65ae84bc2b81ba0d9ee':
Fix all the system image sizes.
2014-05-28 04:07:39 +00:00
Elliott Hughes
ad319779ff
am 4afe808c: Merge "Fix all the system image sizes."
...
* commit '4afe808c640ac2bfdd1e665d322b7c9fbe38a974':
Fix all the system image sizes.
2014-05-28 04:04:36 +00:00
Elliott Hughes
368600b1e8
Fix all the system image sizes.
...
x86 just bit me. I did manage to build mips today, but I assume it
can't be long before we hit the limit there too if every other target
has hit it already.
Change-Id: I28dfe3b4f9565cb79e0bf6b0ffc55a9d6e64a9b0
2014-05-27 16:47:44 -07:00
Narayan Kamath
38c3c9309f
am 6c2ae327: am 8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary."
...
* commit '6c2ae327665396958ba6f08dc72bc30b3455d046':
Switch x86_64 emulator to 64 bit primary.
2014-05-27 11:23:34 +00:00
Narayan Kamath
06db73241a
resolved conflicts for merge of 0f99bb3d
to klp-modular-dev-plus-aosp
...
Change-Id: I9be144d41d8ad3c4792f5ca2a3b8aaa65a77530f
2014-05-27 12:21:22 +01:00
Narayan Kamath
6c2ae32766
am 8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary."
...
* commit '8d3b9c9e456e1d62a025d2eb3a03f2566823d2e3':
Switch x86_64 emulator to 64 bit primary.
2014-05-27 11:15:57 +00:00
Narayan Kamath
0f99bb3d0b
am 7b31bd3e: Merge "Remove hardcoded TARGET_PREFER_32_BIT_APPS."
...
* commit '7b31bd3e8f25b9b232204d4b64399d78d6e41163':
Remove hardcoded TARGET_PREFER_32_BIT_APPS.
2014-05-27 11:15:56 +00:00
Narayan Kamath
8d3b9c9e45
Merge "Switch x86_64 emulator to 64 bit primary."
2014-05-27 11:13:42 +00:00
Narayan Kamath
7b31bd3e8f
Merge "Remove hardcoded TARGET_PREFER_32_BIT_APPS."
2014-05-27 11:12:34 +00:00
Narayan Kamath
62da5fd161
Switch x86_64 emulator to 64 bit primary.
...
Also siezes the opportunity to remove the hardcoded
TARGET_PREFER_32_BIT_APPS directing in core_64_bit.mk.
This avoids the need for further hacks but needs supporting
changes to a few apps to force them to 32 bit.
Change-Id: I36ba9e5f5b08dd87d6a4afc27961a436306eed99
2014-05-27 12:12:00 +01:00
Narayan Kamath
214c53a022
Remove hardcoded TARGET_PREFER_32_BIT_APPS.
...
This isn't required any longer, besides individual products
should be allowed to set this value themselves.
(cherry picked from commit 7b9347a7f9
)
Change-Id: If459eab32c6e7831596224ad3503baefbf028133
2014-05-27 12:08:33 +01:00
Mark Salyzyn
1309152ec1
am 1fe58202: am ea65c191: Merge "libctest: zap"
...
* commit '1fe582026940c70f4a7ff8f130372234d07d3611':
libctest: zap
2014-05-21 21:16:28 +00:00
Mark Salyzyn
1fe5820269
am ea65c191: Merge "libctest: zap"
...
* commit 'ea65c191e7c08233c97c5b854537d2a0d2127733':
libctest: zap
2014-05-21 21:08:24 +00:00
Mark Salyzyn
ae0d241144
libctest: zap
...
Change-Id: Ia3ff0cad0995af428adf2dbdf10587dae904ec7d
2014-05-21 13:27:58 -07:00
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
a7877a4674
Remove netd_client. It has moved to the internal tree.
...
Change-Id: Iffcdb4900373c05086fd1085b861b6520065b7a3
2014-05-21 09:55:44 -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
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
Elliott Hughes
0499399231
The generic_arm64 system image is full.
...
Change-Id: I454c674033525f2f7847d2c91979dff8093c335b
2014-05-20 14:44:26 -07: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
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
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
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