Commit graph

986 commits

Author SHA1 Message Date
Brian Carlstrom
8fd9944e8f am 32d25fda: am dab766a7: Merge "Switch from core to core-libart"
* commit '32d25fdabfaadc95292b43a29b695d8229333bcf':
  Switch from core to core-libart
2014-06-19 02:17:54 +00:00
Brian Carlstrom
32d25fdabf am dab766a7: Merge "Switch from core to core-libart"
* commit 'dab766a7312b1313c89930b5307f33f0baec1549':
  Switch from core to core-libart
2014-06-19 02:14:26 +00:00
Brian Carlstrom
b1dafb1804 Switch from core to core-libart
Bug: 14298175
Change-Id: I1db40e7c67322d80a108b2b88e6d2e6d275d7898
2014-06-18 17:42:32 -07:00
Brian Carlstrom
0d073451e7 am 9a954de3: am 8fb55d06: Merge "Remove some uses of the deprecated WITH_HOST_DALVIK."
* commit '9a954de366bad8ba2cce2cb6c917a1bec7c61c77':
  Remove some uses of the deprecated WITH_HOST_DALVIK.
2014-06-18 20:51:14 +00:00
Brian Carlstrom
9a954de366 am 8fb55d06: Merge "Remove some uses of the deprecated WITH_HOST_DALVIK."
* commit '8fb55d06c7bd153e673c1372b3af75bcb849ed9d':
  Remove some uses of the deprecated WITH_HOST_DALVIK.
2014-06-18 20:46:53 +00:00
Ian Rogers
a00ba56c63 Remove some uses of the deprecated WITH_HOST_DALVIK.
Bug: 13751317.
Change-Id: I4beb81089b4ad7dac4d87571509389d1dae22bf3
2014-06-18 13:38:44 -07:00
Narayan Kamath
b60ccd6672 am ae65e2eb: am d73ec26a: Merge "Make default 64-bit primary, 32-bit secondary"
* commit 'ae65e2eb8d5f530d4292a5c70bac113f18900e9d':
  Make default 64-bit primary, 32-bit secondary
2014-06-17 10:05:13 +00:00
Narayan Kamath
ae65e2eb8d am d73ec26a: Merge "Make default 64-bit primary, 32-bit secondary"
* commit 'd73ec26a19e82cefca45e3c80b37b015d423bda7':
  Make default 64-bit primary, 32-bit secondary
2014-06-17 09:56:18 +00:00
Steve Moyer
97f49221ad Merge "DO NOT MERGE: Combine emulator test projects into a single apk" into stage-aosp-master 2014-06-17 04:56:28 +00:00
Brian Carlstrom
d795046319 Make default 64-bit primary, 32-bit secondary
Change-Id: I2613a5072e2778307eebdc95d81f184f748ce9f5
2014-06-16 23:59:43 -07:00
Steve Moyer
16e2e04730 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-16 09:53:34 -07:00
Adam Lesinski
b9c024c674 am e20af003: Merge "Add drm framework library to core_tiny" into klp-modular-dev
* commit 'e20af003e443ff2fd38a446613ecc28f0d10330a':
  Add drm framework library to core_tiny
2014-06-13 20:47:33 +00:00
Nick Kralevich
64dd84a94f am 003f84fb: am c80e876c: Merge "Add service_contexts to embedded.mk."
* commit '003f84fbbbffa0eb0b6958a2f7f4a120206decc8':
  Add service_contexts to embedded.mk.
2014-06-12 21:10:20 +00:00
Nick Kralevich
003f84fbbb am c80e876c: Merge "Add service_contexts to embedded.mk."
* commit 'c80e876cd2eab6452313a98c6ddeca403510784c':
  Add service_contexts to embedded.mk.
2014-06-12 21:03:37 +00:00
Riley Spahn
8b834ecedb Add service_contexts to embedded.mk.
Add service_contexts to embedded.mk to support MAC checks in the
service manager.

Bug: 12909011
Change-Id: I31f4f4e1acb2be8167f2f11f93c936c18303135a
2014-06-12 20:45:58 +00:00
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
b300792c65 Add drm framework library to core_tiny
Change-Id: If6a451a9b26789ad8689722425a2a34372c123d9
2014-06-06 15:55: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
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
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