leozwang
01e6853556
Add bcc into /system/bin.
...
Bug: 16161758
Change-Id: I492f6780ecf7d18f291532fc934a80ff7ac643cf
2014-07-14 13:27:02 -07:00
Stephen Hines
60a0ba2b34
Merge "Remove bcc from generic_no_telephony.mk."
2014-07-14 16:03:19 +00:00
leozwang
176b0d3f86
Remove bcc from generic_no_telephony.mk.
...
bcc was added into core_minimal.mk.
Change-Id: I29fa6eb3df0dada609e2f6b3e28ffd08d13c6afc
2014-07-14 10:28:38 -07:00
Baligh Uddin
af0aa3ca6d
Fix Tamil country code. ta_TN should be ta_IN
...
Change-Id: I177bc5ba09f0c529409c5a81d67b6dc61d5afdf6
Bug: 16234964
2014-07-12 19:28:17 +00:00
Paul Jensen
d42ae84863
Add app to handle captive portal login.
...
This app is only used if no other app handles the broadcast to perform captive
portal login.
Bug:15409233
Bug:15409354
Change-Id: Ie240d7eac4bdbab8cc7578782bd72d8b26de7951
2014-07-10 17:18:35 +00:00
Brian Carlstrom
b1c9734b68
am ef0b6e0c
: am 8a749606
: am 02a5b517
: Merge "Make dex2oat heap size product configurable [build]"
...
* commit 'ef0b6e0c19eb37f4fbc42491771611e247168519':
Make dex2oat heap size product configurable [build]
2014-07-09 15:07:13 +00:00
Brian Carlstrom
ef0b6e0c19
am 8a749606
: am 02a5b517
: Merge "Make dex2oat heap size product configurable [build]"
...
* commit '8a7496060df85c241b976d6cd69b13828e452ef9':
Make dex2oat heap size product configurable [build]
2014-07-09 12:36:31 +00:00
Brian Carlstrom
8a7496060d
am 02a5b517
: Merge "Make dex2oat heap size product configurable [build]"
...
* commit '02a5b51798b06434b08ffe2f6e6c485e73cd42bc':
Make dex2oat heap size product configurable [build]
2014-07-09 12:21:56 +00:00
Brian Carlstrom
cffe289dc6
Make dex2oat heap size product configurable [build]
...
Bug: 15919420
Change-Id: If92318a6e3d5b9c8c6a2d08a3371386fa5ad8f45
2014-07-08 11:33:45 -07:00
Joe LaPenna
bde7cc108c
CW on Master: Add wifi-service to core_tiny
...
BUG: 15143878
Change-Id: Idd31188456fa5cf9622f2ff754157286b3de97d1
2014-07-08 11:38:10 -07:00
Nick Vaccaro
684ee2b544
Add ims-common to PRODUCT_PACKAGES
...
Bug: 15143878
Change-Id: I0f244530d46380b329cc43112981f6daaee39628
2014-07-02 19:35:10 +00:00
Brian Carlstrom
de5dce1ad1
Fixes for core_tiny zygote to boot
...
Change-Id: Ie926eb316d05702ddb715ca4519397e9be0e7049
2014-07-01 11:51:17 -07:00
Baligh Uddin
0a74bf180a
Merge "Add new locales for Platform (L) release"
2014-06-26 18:07:29 +00:00
Baligh Uddin
c8ae20330c
Add new locales for Platform (L) release
...
Bug: 13437459
Change-Id: Ic186d288469b503118513a437de3a2ef446e34fc
2014-06-26 22:40:06 +00:00
Nick Vaccaro
56eb2f983e
Add logd to core_tiny.mk (for logcat functionality)
...
Bug: 15143878
Change-Id: Ief73aac31b0d4689d38c734dc23f0d20cdcdea17
2014-06-26 19:35:40 +00:00
Narayan Kamath
4c5d3daef5
am 6fdf121c
: Fix 64 bit emulator booting (again).
...
* commit '6fdf121c192944f13255a8908df802051fec6535':
Fix 64 bit emulator booting (again).
2014-06-23 19:46:09 +00:00
Narayan Kamath
6fdf121c19
Fix 64 bit emulator booting (again).
...
Not only should they inherit from core_64_bit.mk, we should
inherit from that first to make sure sdk.mk doesn't override
those values with other cruft.
Change-Id: Ibcd3c47b5be92544c1e86b6e85608b875c468461
2014-06-23 17:52:53 +01:00
Tsu Chiang Chuang
39175e172c
Merge "Make default 64-bit primary, 32-bit secondary" into lmp-preview-dev
2014-06-20 20:43:34 +00:00
Narayan Kamath
31033fe08d
SDK targets should inherit from core_64_bit.mk
...
bug: 15661143
(cherry picked from commit e78ba32d23
)
Change-Id: Icf9d0a7d429f848ca6163a8658c6e5f208fdd039
2014-06-20 17:10:26 +01:00
Brian Carlstrom
85455b6cce
Make default 64-bit primary, 32-bit secondary
...
This is required to get aarch64 & x86_64 emulators booting
on lmp-preview-dev. Without this change, the system_server
is a 32 bit process but java only apps that use the
"android.uid.system" shared UID are dex2oated to 64 bit and
won't work correctly.
The correct fix needs build system changes, so this is the
easiest fix for now.
Note that this happens to work on volantis because the package
manager adjusts their ABI correctly during boot. That can't
happen on emulators because of dex-preopt; dex2oat can't oatify
a dex file from inside an existing oat file.
(cherry picked from commit d795046319
)
Change-Id: Id94bcc382e90b279e726f2d1d0350fc60a5020df
2014-06-20 14:24:32 +01:00
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
6db9e1c887
Merge changes Ib9d1863c,I2a6eb327
...
* changes:
SDK targets should inherit from core_64_bit.mk
Fix issue in symlinking 64 bit executables.
2014-06-17 21:55:55 +00:00
Brian Carlstrom
55fa2ea206
resolved conflicts for merge of 8fd9944e
to master
...
Change-Id: I1ceda92267675d4ca460b6f990c0acea4b4812a8
2014-06-18 19:25:30 -07:00
Daniel Rosenberg
0df5e7270b
Added filesystem management tools to core_minimal.mk and core_tiny.mk
...
Required for supporting resizing asecs
Change-Id: If7de23aa4baf97f3d0ccec423e52534f379f0881
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-06-18 23:15:20 +00:00
Brian Carlstrom
85b70c039f
am 0d073451
: am 9a954de3
: am 8fb55d06
: Merge "Remove some uses of the deprecated WITH_HOST_DALVIK."
...
* commit '0d073451e7a453ccfb952505b27ec1effdc3a674':
Remove some uses of the deprecated WITH_HOST_DALVIK.
2014-06-18 21:40:31 +00:00
Narayan Kamath
e78ba32d23
SDK targets should inherit from core_64_bit.mk
...
bug: 15661143
Change-Id: Ib9d1863c7acf7b607a027f4945ee4755624967b3
2014-06-17 17:43:14 +01: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
Narayan Kamath
9d62dbc532
resolved conflicts for merge of b60ccd66
to master
...
Change-Id: I731af090c472d70a6c0627cef87239dc6df91645
2014-06-17 11:11:35 +01:00
Elliott Hughes
2e5371ae92
Remove libportable from core_base.mk.
...
(cherry picked from commit 4e8c6991e5
)
Change-Id: Icefe7dccbca87798d4ec0761bf90aa169253839e
2014-06-16 16:52:36 -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
bd55fc56e1
am b9c024c6
: am e20af003
: Merge "Add drm framework library to core_tiny" into klp-modular-dev
...
* commit 'b9c024c674968c6b05101a8de65108a62917cf17':
Add drm framework library to core_tiny
2014-06-13 22:26:48 +00:00
Wink Saville
2d5486a006
Merge "Merge kwd to master"
2014-06-13 21:09:46 +00: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
08ccd188e0
am 64dd84a9
: am 003f84fb
: am c80e876c
: Merge "Add service_contexts to embedded.mk."
...
* commit '64dd84a94f468b0e70996c55411d2be08c985267':
Add service_contexts to embedded.mk.
2014-06-12 21:16:52 +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
Wink Saville
273c22cbc0
Merge kwd to master
...
Add ims-common support from kwd
Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
2014-06-11 15:21:03 -07:00
Elliott Hughes
59c9bea1da
am b5153477
: am c7504124
: am 47cdacd5
: Merge "Remove libportable from core_base.mk."
...
* commit 'b5153477107fd0cba9e073c4445c11c78ee35c92':
Remove libportable from core_base.mk.
2014-06-11 19:34:31 +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
Lajos Molnar
f1831cb022
am 93d45370
: core_base.mk: add hevc software decoder
...
* commit '93d45370bea37e2c1e5931181fef12c67e9d2f98':
core_base.mk: add hevc software decoder
2014-06-06 23:03:31 +00:00
Adam Lesinski
b300792c65
Add drm framework library to core_tiny
...
Change-Id: If6a451a9b26789ad8689722425a2a34372c123d9
2014-06-06 15:55:01 -07:00
Lajos Molnar
93d45370be
core_base.mk: add hevc software decoder
...
Bug: 14571712
Change-Id: I41c57023c6bcba73859b61052cacfd4ffd02e3dd
2014-06-05 22:29:49 -07:00
Adam Lesinski
c1dd8b4e67
Merge commit '2f9a705e' into manualmerge
...
Conflicts:
target/product/core_tiny.mk
Change-Id: I6d2f57be8d4e65768d51f6db65d78295d1d3e3fa
2014-06-05 15:27:26 -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
Eric Laurent
e807ab0269
Merge "add sound trigger service library"
2014-06-05 15:33:10 +00:00
Eric Laurent
b0baa27f3d
add sound trigger service library
...
Change-Id: I444396c5a1df13ad59c2a236849e9c729faed956
2014-06-04 15:37:15 -07: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
Dave Allison
7f73ca804a
Add libsigchain to the embedded.mk makefile
...
This library is used in a LD_PRELOAD environment variable and the linker shows
a warning if it is not present. This change is to added it to all targets so
that the warning is not shown. If ART is not provided on the device this
library has no effect.
Change-Id: I81f01b66fa9c78048534f4bcfc04d62b18057a03
2014-06-02 15:53:31 -07:00
Nick Kralevich
e2618cdc52
am 362d2d41
: am 333005f1
: am c706ea79
: Merge "Include selinux_version file with builds."
...
* commit '362d2d4123a755a3e39a2015cf49da7db24a26ad':
Include selinux_version file with builds.
2014-06-02 19:29:10 +00: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
Ying Wang
21e9474252
am b541ab6c
: Support to build 64-bit unbundled binaries.
...
* commit 'b541ab6c51734530ed615e307f8912f32e616967':
Support to build 64-bit unbundled binaries.
2014-05-30 01:02:44 +00:00
Ying Wang
b541ab6c51
Support to build 64-bit unbundled binaries.
...
Change-Id: I4656c983d60aaf535ce4d14528c28ae8cef98fd8
2014-05-29 17:57:40 -07:00
Dave Allison
7127da62c8
am faa2d249
: am f4115cdf
: am 2a2ba735
: Merge "Add libsigchain to the embedded.mk makefile"
...
* commit 'faa2d24991682e31804f8cfcdc16a4f09fb4dbad':
Add libsigchain to the embedded.mk makefile
2014-05-29 21:09:56 +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
Brian Carlstrom
5da48a3394
am bf8a374a
: Remove dependencies on runtime_libdvm and libdvm.so in general
...
* commit 'bf8a374a92e327efed95892fe67e6917a89c6c2b':
Remove dependencies on runtime_libdvm and libdvm.so in general
2014-05-29 16:37:19 +00:00
Brian Carlstrom
bf8a374a92
Remove dependencies on runtime_libdvm and libdvm.so in general
...
Bug: 14298175
Change-Id: I8441b64dc33543a912aebcfb8fdf76114ec50abe
2014-05-28 21:27:47 -07:00
Narayan Kamath
7d55bea91f
resolved conflicts for merge of 38c3c930
to master
...
Change-Id: I88bb5131ce15bc5a4d7a7870d33c78fc9d952bb2
2014-05-27 12:29:41 +01: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
Lorenzo Colitti
87b6b24f86
Merge "Build EthernetService."
2014-05-22 05:57:58 +00:00
Eric Laurent
9b71d1de32
Merge "split audio policy library"
2014-05-22 00:40:24 +00:00
Mark Salyzyn
5eb187beaf
am 1309152e
: am 1fe58202
: am ea65c191
: Merge "libctest: zap"
...
* commit '1309152ec189e670d1c246bbabe1f33942e401b1':
libctest: zap
2014-05-21 21:23:26 +00: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
Svetoslav Ganov
0e7533fca5
Revert "Fix build: Revert "Switching to the final PDF rendering library""
...
This reverts commit fa4f6471c4
.
Change-Id: I7541ddad1302ca0f39aec62e3c4ca399046e56a6
2014-05-21 19:40:31 +00:00
Lorenzo Colitti
f1669ddcec
Build EthernetService.
...
This is included in the PRODUCT_BOOT_JARS because it needs to be
loaded by system_server via SystemServiceManager.startService,
which only looks at the boot classpath.
This is compiled on all devices as opposed to only devices with
a physical Ethernet port because we also support Ethernet over
USB.
Change-Id: I55bc422e2a7b700eea4b7513f96079502be36882
2014-05-21 12:27:48 -07:00
Ed Heyl
fa4f6471c4
Fix build: Revert "Switching to the final PDF rendering library"
...
This reverts commit 7a32ace471
.
Change-Id: Icf5b4e16e12a0ca6f7fb662472801f90840a743f
2014-05-21 19:21:54 +00:00
Svetoslav
7a32ace471
Switching to the final PDF rendering library
...
Change-Id: I27fdb9b937fa08986f52084d3647d4d23d2db6a4
2014-05-21 10:40:00 -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
Eric Laurent
08f9097e39
split audio policy library
...
Split the audio policy library into the service part
and the policy part. This will allow OEMs to customize
the policy part.
Change-Id: I3b33d7e0cfd70595b806e3267af8a6a7b5571ec2
2014-05-21 08:04:50 -07:00
Ben Murdoch
fe7b5c04dd
am fac17e16
: am 0861ed07
: Merge "Have core_tiny depend on the NullWebView." into klp-modular-dev
...
* commit 'fac17e16a5ffd46d2f649e4b230503acb6013431':
Have core_tiny depend on the NullWebView.
2014-05-20 18:15:42 +00:00
Ben Murdoch
a9136595b8
am 527ce064
: am cf8cd38f
: Merge "All devices that depend on WebView must have the system feature." into klp-modular-dev
...
* commit '527ce064c9c68affd1fc08f982f0850789ba4c89':
All devices that depend on WebView must have the system feature.
2014-05-20 18:15:41 +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
Ye Wen
bd78847647
Merge "MMS API: build file change to add MmsService"
2014-05-19 22:52:11 +00:00
Brian Carlstrom
8d422a3a0b
am 8074ff4d
: am a8355eca
: am 64f3a191
: Merge "Multilib support for odex"
...
* commit '8074ff4d0f962a933586b9809d1f1bdffe1fe5ed':
Multilib support for odex
2014-05-19 17:04:54 +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
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
Adam Hampson
2b47ce7e28
Merge "move telephony, mms, and voip common jars to core_minimal"
2014-05-16 22:35:33 +00:00
Justin Koh
94f5febdd5
am fa1a8333
: am 3446af69
: Add CalendarProvider to core_tiny
...
* commit 'fa1a8333afa51ebb00c5509defc480f61ba638cb':
Add CalendarProvider to core_tiny
2014-05-16 21:10:39 +00:00
Dave Allison
330584ee81
Add libsigchain to the embedded.mk makefile
...
This library is used in a LD_PRELOAD environment variable and the linker shows
a warning if it is not present. This change is to added it to all targets so
that the warning is not shown. If ART is not provided on the device this
library has no effect.
Change-Id: I81f01b66fa9c78048534f4bcfc04d62b18057a03
2014-05-16 13:51:36 -07:00
Justin Koh
fa1a8333af
am 3446af69
: Add CalendarProvider to core_tiny
...
* commit '3446af6977e43adde2cca643c2105a94c6fad275':
Add CalendarProvider to core_tiny
2014-05-16 20:48:34 +00:00
Justin Koh
3446af6977
Add CalendarProvider to core_tiny
...
This is required for CTS.
Bug: 15003038
Change-Id: I9ac43f4875e979b086c88859a09626254f3ad06a
2014-05-16 11:30:06 -07:00
Adam Hampson
ba14d0e337
move telephony, mms, and voip common jars to core_minimal
...
These jars need to be present on Molly to pass CTS.
Bug: 13075332
Change-Id: I175871c2e7cff107e3f30ba4541171ebc13509d2
Signed-off-by: Adam Hampson <ahampson@google.com>
2014-05-15 16:33:06 -07:00
Svetoslav
af39741f1e
Merge "Adding the PDF rendering library to the build"
2014-05-15 20:14:52 +00:00
Ye Wen
e77676cbdb
MMS API: build file change to add MmsService
...
b/14095333
Change-Id: I573dc16569fada9032c6d3f532a9b10f8ea75d2f
2014-05-15 13:06:50 -07:00
Victoria Lease
2d32ad48ce
Merge "deprecate external/sil-fonts"
2014-05-15 14:47:50 +00:00
Sreeram Ramachandran
d86151135a
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.
2014-05-14 19:51:41 +00:00
Sreeram Ramachandran
6af650d6e3
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.
2014-05-14 19:48:13 +00:00
Kenny Root
4884f8738d
am d36d61be
: am abe42666
: Move libkeystore to minimal
...
* commit 'd36d61bec8d728088a300a392b9815555a0203d4':
Move libkeystore to minimal
2014-05-14 19:46:07 +00:00
Kenny Root
d36d61bec8
am abe42666
: Move libkeystore to minimal
...
* commit 'abe426663a0534db685f2d44b8cd9a47480fb52f':
Move libkeystore to minimal
2014-05-14 19:40:53 +00:00
Kenny Root
abe426663a
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
2014-05-14 11:50:35 -07:00
Sreeram Ramachandran
a280216494
Introduce netd_client, a dynamic library that talks to netd.
...
(cherry picked from commit 440de6b9f715cb18b8ee888c58d5c7a659ff5073)
Change-Id: Ib6198e19dbc306521a26fcecfdf6e8424d163fc9
2014-05-14 11:21:01 -07:00
Sreeram Ramachandran
61fa8d83e3
Introduce netd_client, a dynamic library that talks to netd.
...
(cherry picked from commit 440de6b9f715cb18b8ee888c58d5c7a659ff5073)
Change-Id: Ib6198e19dbc306521a26fcecfdf6e8424d163fc9
2014-05-14 15:59:05 +00:00
Svetoslav
41278dd27e
Adding the PDF rendering library to the build
...
Change-Id: I4e77d60154e8a6c9d1ceba0224d8710e36e56193
2014-05-13 15:47:49 -07:00
Victoria Lease
d8141b26f7
deprecate external/sil-fonts
...
Change-Id: Ic6113453acf94e1346dede99274cb4b20ad5a866
2014-05-13 10:44:49 -07:00
Ying Wang
2ec7c7a21c
am 5c7c9887
: am 03d02a26
: am b082b5f1
: Merge "Disable DEXPREOPT until we have multilib support"
...
* commit '5c7c9887f4216dbd94cc40451b3e4cc3dfd5a441':
Disable DEXPREOPT until we have multilib support
2014-05-13 17:06:01 +00:00
Ying Wang
5c7c9887f4
am 03d02a26
: am b082b5f1
: Merge "Disable DEXPREOPT until we have multilib support"
...
* commit '03d02a2687cbd59b8871ccbe0eeb3c2c51df063c':
Disable DEXPREOPT until we have multilib support
2014-05-13 16:58:47 +00:00
Ying Wang
03d02a2687
am b082b5f1
: Merge "Disable DEXPREOPT until we have multilib support"
...
* commit 'b082b5f1b2d1a45ee91de186428d5e341d02c08a':
Disable DEXPREOPT until we have multilib support
2014-05-13 16:54:29 +00:00
Ying Wang
a93102d411
Disable DEXPREOPT until we have multilib support
...
Bug: 14694978
Change-Id: I31d0f1c78a668435646c99e659cec46cd2f3ddf7
2014-05-13 09:46:23 -07:00
Baligh Uddin
b3fa045281
am efa671d2
: Add the Telecomm entry in core.mk
...
* commit 'efa671d2fd17280d096d914e492dd25db114c787':
Add the Telecomm entry in core.mk
2014-05-12 23:25:28 +00:00
Geremy Condra
c10320eef3
Merge "Add verity support to make dist
."
2014-05-12 17:00:58 +00:00
Geremy Condra
5b5f4958d8
Add verity support to make dist
.
...
Without this, system images will be built that do not contain the
necessary bits for verification.
Change-Id: I87c15282b26377d7a2a1540e3d0e30b0299622e3
2014-05-10 18:31:07 -07:00
Ed Heyl
0cd5ec5b16
Merge "Fix build: Revert "Add verity support to make dist
.""
2014-05-09 05:58:28 +00:00
Ed Heyl
3e92fd0fba
Fix build: Revert "Add verity support to make dist
."
...
This reverts commit 5dee206d8e
.
Change-Id: I6f4f536c127d3e5dcb6594efb193231cd8dece7e
2014-05-09 05:53:54 +00:00
Xavier Ducrohet
7b967dc13f
am a6a2969e
: Resolved conflicts for merge of 05a7a955
to klp-modular-dev-plus-aosp
...
* commit 'a6a2969e020ea16edbe24661d2b63f7f2bdf98b6':
Remove SDK Tools from platform builds.
2014-05-09 02:13:32 +00:00
Xavier Ducrohet
a6a2969e02
Resolved conflicts for merge of 05a7a955
to klp-modular-dev-plus-aosp
...
Change-Id: Ife0d1ef3d5a0cb4b91c8b813d259c947c85018f8
2014-05-08 18:48:26 -07:00
Geremy Condra
c921b1eb19
Merge "Add verity support to make dist
."
2014-05-09 01:39:44 +00:00
Xavier Ducrohet
05a7a955c1
am afe444a5
: Merge "Remove SDK Tools from platform builds."
...
* commit 'afe444a564ed72cdda792822a0c9dab57a8c9172':
Remove SDK Tools from platform builds.
2014-05-09 00:52:34 +00:00
Xavier Ducrohet
51e303a281
Remove SDK Tools from platform builds.
...
(cherry picked from commit edf30221b4890673dc714a1efef3b5faf4ae1522)
Change-Id: Ia74c2ece1528adca10a4eec24e73b4ce361af1a9
2014-05-08 14:50:15 -07:00
Narayan Kamath
7b9347a7f9
Remove hardcoded TARGET_PREFER_32_BIT_APPS.
...
This isn't required any longer, besides individual products
should be allowed to set this value themselves.
Change-Id: I684edf073b5c19f412b4617f8aa22824193c19be
2014-05-08 08:03:02 +00:00
Geremy Condra
5dee206d8e
Add verity support to make dist
.
...
Without this, system images will be built that do not contain the
necessary bits for verification.
Change-Id: Icaa636085dbfd386424c90dfbe404c5960df0fe4
2014-05-06 18:06:18 -07:00
Colin Cross
d2151e1402
am 40aabbee
: am 9150a90d
: am 5128237a
: Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config"
...
* commit '40aabbeeac53a01d42316423c7091612a1302b3f':
build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config
2014-05-05 23:37:07 +00:00
Colin Cross
40aabbeeac
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
2014-05-05 23:09:04 +00:00
Colin Cross
9150a90daf
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
2014-05-05 23:05:14 +00:00
Colin Cross
772c216e71
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
2014-05-05 15:25:41 -07:00
Marco Nelissen
5f3be2ddcd
Merge "Add libmediandk"
2014-05-05 21:28:25 +00:00
Colin Cross
39fef1f420
am 6f916664
: am 735628e8
: am 2ff8919d
: Merge changes I7e809264,I504cea21,Ibd2165e6
...
* commit '6f9166640a62f694a257a307284ea1c442f66a7b':
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
2014-05-05 20:22:36 +00:00
Colin Cross
6f9166640a
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
2014-05-05 20:18:09 +00:00
Colin Cross
735628e8d1
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
2014-05-05 20:14:18 +00:00
Justin Koh
f0e151152a
am 007f8c80
: am 0e35df2a
: Add ContactsProvider to core_tiny.
...
* commit '007f8c804fbabfea461db546eb46ac9b1d3e9e3d':
Add ContactsProvider to core_tiny.
2014-05-05 17:50:37 +00:00
Justin Koh
007f8c804f
am 0e35df2a
: Add ContactsProvider to core_tiny.
...
* commit '0e35df2a7c77a6308106fa9a48f90c4729b9b8f3':
Add ContactsProvider to core_tiny.
2014-05-05 17:46:55 +00:00
Justin Koh
0e35df2a7c
Add ContactsProvider to core_tiny.
...
Add ContactsProvider to core_tiny: this is necessary to pass CTS.
Change-Id: I159109740f329e5c540ffb6f1cd1b1a7f9429d86
2014-05-04 16:31:02 -07:00
Colin Cross
75b29ae078
build: add core_64_bit.mk
...
Add a new product, core_64_bit.mk, that products can inherit from
to configure zygote and the rest of the build system for a standard
64-bit product.
Make the 64-bit emulator targets for arm64, mips64, and x86_64
inherit from it.
Change-Id: I7e809264db39472f554cd5290529f3d6499345d4
2014-05-01 10:56:12 -07:00
Colin Cross
e5381d074f
Merge "verity: clean up verity build dependencies"
2014-04-30 20:47:58 +00:00
Ying Wang
09a4e6870d
Add SDK product for arm64, x86_64 and mips64.
...
Bug: 14411602
Change-Id: Ia609321864ddade27df97448c8037f25c4ef99aa
2014-04-29 12:48:06 -07:00
Bill Yi
1e4adfa837
Merge commit '8113e43601aac7702b9ec007e81a179826143d1e' into HEAD
2014-04-29 11:32:53 -07:00
Colin Cross
8a30f72c0c
verity: clean up verity build dependencies
...
Move image dependencies out of PRODUCT_PACKAGES and into direct
dependencies for the image building rules.
Fix the test for PRODUCT_SUPPORTS_VERITY, it needs to check for
the current project as the global is no longer set.
Change-Id: I811501834ae5ec658229bd505fcc48275ff578c9
2014-04-28 17:19:04 -07:00
Robert Craig
65dad28716
Include selinux_version file with builds.
...
The selinux_version file is used to perform policy
versioning checks by libselinux and SELinuxMMAC. When
loading policy a check is first performed to determine
if the policy out in /data/security/current should be
used to override the base policy shipped with the device.
The selinux_version file is used to make that choice. The
contents of the file simply contains the BUILD_ID that
the policy was built against. A simple string comparison
is then performed by libselinux and SELinuxMMAC.
Change-Id: I69d9d071743cfd46bb247c98f94a193396f8ebbd
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-04-28 22:05:54 +00:00
Ying Wang
8d4562a14d
resolved conflicts for merge of 0a694f4c
to master
...
Change-Id: Idec6e6837c6329dae423a12fc084a11bca82463d
2014-04-25 09:28:00 -07:00
Ying Wang
0a694f4c57
am c564b691
: Remove libs from target/product/base.mk.
...
* commit 'c564b691d55d4dcede7ce46248b1a87acf3d2618':
Remove libs from target/product/base.mk.
2014-04-25 16:13:55 +00:00
Ying Wang
c564b691d5
Remove libs from target/product/base.mk.
...
LatinIME has libjni_latinime as dependency, so we don't need it in
PRODUCT_PACKAGES;
Moved libpac close to PacProcesser, which requires libpac.
Change-Id: I8674d76bcfde4c0e1f1b04bc96e636022d008576
2014-04-24 17:12:58 -07:00
Lajos Molnar
9fcc2da4db
Merge "Remove VideoEditor"
2014-04-22 18:33:39 +00:00
Ian Rogers
2b96d6ae78
resolved conflicts for merge of 77efd7b4
to master
...
Change-Id: I2ff1be499d3c4a5c7da3b016c63a519edcda458f
2014-04-22 10:03:16 -07:00
Ian Rogers
77efd7b4cd
am f1d5dcdd
: am 850299f6
: Merge "Make the zygote 64-bit for the x86-64 emulator."
...
* commit 'f1d5dcdd30e1f181cc1fce6d99f0f3aa589c8edd':
Make the zygote 64-bit for the x86-64 emulator.
2014-04-22 15:45:44 +00:00
Ian Rogers
f1d5dcdd30
am 850299f6
: Merge "Make the zygote 64-bit for the x86-64 emulator."
...
* commit '850299f6a6a831d47af68a3004a62df21b5fee3a':
Make the zygote 64-bit for the x86-64 emulator.
2014-04-22 15:43:04 +00:00
Lajos Molnar
e685ff0f0c
Remove VideoEditor
...
This app is no longer supported as there are 3rd party video editing
apps, such as Google+ Video Editor.
Bug: 13542518
Change-Id: Ib3a4e2e7d3e261e12355650fc4db62ac59daef8e
2014-04-22 00:18:42 +00:00
Marco Nelissen
863c9e9cf5
Add libmediandk
...
Change-Id: I2c9645d16b56aafb05b52369b0774adffb575197
2014-04-21 10:26:17 -07:00
Ian Rogers
d4186e8c1f
Make the zygote 64-bit for the x86-64 emulator.
...
Change-Id: I4ad5d1ef2406e947176c8e180822b25c04fc83f0
2014-04-18 17:09:33 -07:00
Ying Wang
105ed03cf0
am 25e75aba
: am 6e3bbf64
: am 0ac89b45
: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
...
* commit '25e75abac2c9229c0c4741e33f504a341a36ad94':
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
2014-04-15 23:42:38 +00:00
Ying Wang
25e75abac2
am 6e3bbf64
: am 0ac89b45
: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
...
* commit '6e3bbf64b2c8ac49b5b1e1ff368a120118c04e65':
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
2014-04-15 23:36:05 +00:00
Ying Wang
6e3bbf64b2
am 0ac89b45
: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
...
* commit '0ac89b459542ef88a8c61f45f0d6b680f9931ddf':
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
2014-04-15 23:34:34 +00:00
Ying Wang
e948255ac6
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
...
Bug: 11368415
Bug: 14087863
Change-Id: I05d406d174ea1d1bf67c7922c03950e700978baa
2014-04-15 14:42:27 -07:00
Ben Murdoch
675919dfc7
All devices that depend on WebView must have the system feature.
...
We add a new system feature that declares if a functioning WebView is
present on the device, so copy that permission into builds that
depend on the WebView.
Bug: 13438487
Change-Id: I05bcfec2417862d41aacbacb8b2cc0e59f7c4549
2014-04-04 21:20:55 +01:00
Steve Moyer
b9d6f6f15c
Merge "DO NOT MERGE: Combine emulator test projects into a single apk"
2014-04-04 16:32:06 +00:00
Geremy Condra
8cc491cff3
Merge "Add verity dev keys to build."
2014-04-04 00:49:51 +00:00
Steve Moyer
0ced06ea0f
DO NOT MERGE: Combine emulator test projects into a single apk
...
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests
Conflicts:
target/product/sdk.mk
Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
2014-04-03 16:01:06 -07:00
Ji-Hwan Lee
dccce7bbe9
Add handheld_core_hardware.xml to telephony base
...
Bug: 13683526
Change-Id: I8085fa1abfa460213c3c9fe2a63217ee16b9ff8a
2014-04-03 14:23:40 +09:00
Geremy Condra
7afae2c115
Add verity dev keys to build.
...
These will be used when making images from your dev machine.
Change-Id: Ib1c894f6874a8e1a7d3d6e8133c8e897d40080d4
2014-04-02 18:17:39 -07:00
Narayan Kamath
c54d7f2148
am b6cc8421
: am 2c9552b7
: am aafbbe7e
: Merge "Add a default value for ro.zygote."
...
* commit 'b6cc84212875fda1b8d2ccc0a66fc6a2169933d9':
Add a default value for ro.zygote.
2014-04-01 18:33:37 +00:00
Narayan Kamath
b6cc842128
am 2c9552b7
: am aafbbe7e
: Merge "Add a default value for ro.zygote."
...
* commit '2c9552b78486ae1592303932dc70e00ff487d76f':
Add a default value for ro.zygote.
2014-04-01 16:33:26 +00:00
Narayan Kamath
39fd21a2df
Add a default value for ro.zygote.
...
Also makes sure the correct init config file is
copied across.
Change-Id: I281d00dab17f780bda21bf3fbc35418df18dffb1
2014-03-31 12:33:45 +01:00
Geremy Condra
9a6e87648b
Merge "Add the verity key to the verity dependencies."
2014-03-26 01:03:53 +00:00
Tim Kilbourn
428854952e
Add wifi-service to PRODUCT_PACKAGES.
...
Bug: 13622394
Change-Id: Ifa186db4b804bcb123b26324978c7a1ad986c1e2
2014-03-24 23:45:52 -07:00
Colin Cross
cf1f9d2d67
fix bad merge conflict resolution
...
Change-Id: I56c885df873ff6281f62a5c4e5d4db19138b591d
2014-03-21 17:41:26 -07:00
Colin Cross
f2b60c0f80
resolved conflicts for merge of f8e4d1b7
to master
...
Change-Id: I387a979ac119fc9423af6f07b6700c85384aeb94
2014-03-21 17:25:08 -07:00
Adam Hampson
e3290e9e46
Merge "move libbcc from core_base to core_minimal"
2014-03-21 21:31:02 +00:00
Lajos Molnar
3d402686ca
Merge "stagefright: use media_codecs_google*.xml files"
2014-03-21 21:15:32 +00:00
Adam Hampson
ce91d3c0c0
move libbcc from core_base to core_minimal
...
Bug: 13528787
Change-Id: If8b531f71bf3831e4d3d59e2a2bc04dd72f4a8b1
Signed-off-by: Adam Hampson <ahampson@google.com>
2014-03-21 12:40:57 -07:00
Mark Renouf
50449c9cfa
am 37f3c5cc
: Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
...
* commit '37f3c5cc1de11f7b316c2d03ed8f6951d4f95372':
Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
2014-03-21 16:22:07 +00:00
Mark Renouf
37f3c5cc1d
Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
...
Change-Id: I8a6bad054ac22592f0d341bb3ebbe4cc74828698
2014-03-21 11:50:35 -04:00
Ying Wang
636dc20d1a
resolved conflicts for merge of ad495272
to master
...
Change-Id: I6b47768f44b1a6136ca31936e19f943ee72cb627
2014-03-20 15:24:52 -07:00
Ying Wang
7796921cc5
am 9ce34617
: am 4f9d6f57
: Merge "Fix embedded build"
...
* commit '9ce34617a001338093b0de85443925a37a967f0d':
Fix embedded build
2014-03-20 19:38:45 +00:00
Ying Wang
46d69e9914
am 9ce34617
: am 4f9d6f57
: Merge "Fix embedded build"
...
* commit '9ce34617a001338093b0de85443925a37a967f0d':
Fix embedded build
2014-03-20 19:36:32 +00:00
Ying Wang
8c7e74ee05
Fix embedded build
...
1) Disable dexpreopt if DALVIK_VM_LIB isn't set up by the product.
2) DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES is moved to config.mk,
for it's only decided by target arch.
3) Move Java module input from embedded.mk to base.mk.
Change-Id: Ife70b0cd8cee2e5c92f356c808affa56f494b49a
2014-03-20 12:13:10 -07:00
Lajos Molnar
f40956fbbf
stagefright: use media_codecs_google*.xml files
...
Bug: 13549114
Change-Id: I25d6344c78da152f394fa7b4855a2eb61008afc6
2014-03-19 17:39:39 -07:00
Geremy Condra
a8a7572169
Add the verity key to the verity dependencies.
...
Missed this last time around. Needed to boot.
Change-Id: I67f25ed442365ad0171ecbc37bc2de02b7108399
2014-03-18 21:25:26 -07:00
Geremy Condra
acd99d9367
Merge "Add verity build targets for verity-enabled devices."
2014-03-18 22:23:48 +00:00
Geremy Condra
0ac3b5d8e5
Add verity build targets for verity-enabled devices.
...
Change-Id: Ia9fa8e7ebe01b63e50d61071d36165a6a820c6c4
2014-03-17 20:18:49 -07:00
Eric Laurent
2044c09202
Merge "move audio policy service to a separate library"
2014-03-18 00:14:24 +00:00
Andy McFadden
68e1654aed
Remove "screenshot"
...
Remove the old "screenshot" utility, which has been replaced
by "screencap".
Change-Id: I5bad1fdad308339e4a16ce92f2a65e2437b1be65
2014-03-11 13:51:57 -07:00
Victoria Lease
e19b86cbbd
am 4e965ac6
: am 38626e63
: Merge "Add external/google-fonts/*/fonts.mk."
...
* commit '4e965ac6f56de2071a381ed37e4a9899062e5ab2':
Add external/google-fonts/*/fonts.mk.
2014-03-11 18:28:39 +00:00
Mark Salyzyn
5e9a4fa67b
am 4c65c202
: am 7fc3a06d
: Merge "build: add logd"
...
* commit '4c65c202355572f22b3cb48babf0436098807dc7':
build: add logd
2014-03-11 18:16:24 +00:00
Stephen Hines
033aa738a8
am f1ad4d2d
: Merge "Add bcc to the list of PRODUCT_PACKAGES to install."
...
* commit 'f1ad4d2d2eea9952963fd52fa56e9ab16b108618':
Add bcc to the list of PRODUCT_PACKAGES to install.
2014-03-07 19:40:01 +00:00
Colin Cross
21bef6460d
am 2fbe5018
: Merge "add linker64 and debuggerd64 to all products"
...
* commit '2fbe5018f94f536541c0137be472e58c79890813':
add linker64 and debuggerd64 to all products
2014-03-07 19:33:27 +00:00
Colin Cross
8743fc32df
am f10efbc1
: Merge "make 64-bit builds into multiarch builds"
...
* commit 'f10efbc15e458f50bb29fe9ad0653fb2e08fd8fb':
make 64-bit builds into multiarch builds
2014-03-07 19:33:07 +00:00
Ying Wang
14040db928
am bec954d0
: Merge "Clean up dangling module names"
...
* commit 'bec954d05e0eeec178c796d2332ee9a86becb5dc':
Clean up dangling module names
2014-03-07 02:27:32 +00:00
Ying Wang
16ce683377
am ba46260f
: Merge "Runtime resource overlay, iteration 2"
...
* commit 'ba46260f8dee97138d2eb456560b45eb9f914930':
Runtime resource overlay, iteration 2
2014-03-07 02:27:02 +00:00
David 'Digit' Turner
41925c4b06
am 145562fc
: Merge "Add missing font files to SDK system images."
...
* commit '145562fcef979e4fea946987717618dba6148aeb':
Add missing font files to SDK system images.
2014-03-07 02:25:51 +00:00
Elliott Hughes
17a1e7a412
am efb9603a
: Merge "[MIPS64] Add mips64 target"
...
* commit 'efb9603aeb5ac71e23fa2a3ade6aa4fc2efdeb5e':
[MIPS64] Add mips64 target
2014-03-07 02:24:02 +00:00
Eric Laurent
20d5476f7f
move audio policy service to a separate library
...
Change-Id: I2612253148238e0cce12bd5a0effcb790e86e5f0
2014-03-06 14:42:00 -08:00
Victoria Lease
c9b7f3d6a1
am 3c14d21a
: am 14a5be01
: am 4e965ac6
: am 38626e63
: Merge "Add external/google-fonts/*/fonts.mk."
...
* commit '3c14d21a2a62398322479e015fecdb43652fb331':
Add external/google-fonts/*/fonts.mk.
2014-03-03 23:49:36 +00:00
Victoria Lease
14a5be0174
am 4e965ac6
: am 38626e63
: Merge "Add external/google-fonts/*/fonts.mk."
...
* commit '4e965ac6f56de2071a381ed37e4a9899062e5ab2':
Add external/google-fonts/*/fonts.mk.
2014-03-03 23:42:48 +00:00
Victoria Lease
8da3a02c1f
Add external/google-fonts/*/fonts.mk.
...
Bug: 12384866
Change-Id: I30abb9fb962a59b46be1cb9f12b099ea29850a50
2014-02-28 15:35:07 -08:00
Mark Salyzyn
b8424c7925
am 4c65c202
: am 7fc3a06d
: Merge "build: add logd"
...
* commit '4c65c202355572f22b3cb48babf0436098807dc7':
build: add logd
2014-02-27 16:26:54 +00:00
Nick Kralevich
1884833c3a
build: add logd
...
Original-Change-Id: I1b96d7e6dd823a83b07b312bf07792482e883789
Signed-off-by: Nick Kralevich <nnk@google.com>
* merge conflicts
* rename syslog to logd to avert confusion with bionic syslog
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Change-Id: I137fb639a80dd28d2f0042b3ae9b7d6eb5eb5bc4
2014-02-26 15:39:38 -08:00
Nicolas Prevot
c1b2536f63
Making ManagedProvisioning present in all phones/tablets.
...
Change-Id: Icf004835f526e5e6a2798fc5a0003c25d837289d
2014-02-25 10:04:12 +00:00
Mark Salyzyn
5bcb2c86d7
Merge "build: add logd"
2014-02-20 22:50:03 +00:00
Baligh Uddin
efa671d2fd
Add the Telecomm entry in core.mk
2014-02-20 14:15:01 -08:00
Steve Moyer
6bbb6a1fe3
Combine emulator test projects into a single apk
...
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests
Change-Id: I39e02fbe2cf9761607dfb4c2f0d6c4906e8b1e51
2014-02-19 10:39:20 -08:00
Stephen Hines
a0d13d81d6
am 515f379f
: am f1ad4d2d
: Merge "Add bcc to the list of PRODUCT_PACKAGES to install."
...
* commit '515f379f1dd14e7564ad99dec42549a263863166':
Add bcc to the list of PRODUCT_PACKAGES to install.
2014-02-18 23:18:06 +00:00
Stephen Hines
515f379f1d
am f1ad4d2d
: Merge "Add bcc to the list of PRODUCT_PACKAGES to install."
...
* commit 'f1ad4d2d2eea9952963fd52fa56e9ab16b108618':
Add bcc to the list of PRODUCT_PACKAGES to install.
2014-02-18 23:12:37 +00:00
Stephen Hines
816b86f759
Add bcc to the list of PRODUCT_PACKAGES to install.
...
Bug: 7342767
As part of the process of sandboxing the online RenderScript compiler, we
need to install bcc.
Change-Id: Ia650bdcb760246f3f1e15ebb867f07d9802cdfbe
2014-02-18 14:21:39 -08:00
Colin Cross
b01233f26f
am a0eb50ac
: resolved conflicts for merge of 2fbe5018
to klp-modular-dev-plus-aosp
...
* commit 'a0eb50accabe83b18bd3fe3b9d6417a4718af9e2':
add linker64 and debuggerd64 to all products
2014-02-14 00:51:53 +00:00
Colin Cross
a0eb50acca
resolved conflicts for merge of 2fbe5018
to klp-modular-dev-plus-aosp
...
Change-Id: I623332e427ce8bfcf1b17e708ccca1d50cdbeadd
2014-02-13 16:32:48 -08:00
Colin Cross
381435353d
add linker64 and debuggerd64 to all products
...
Add linker64 and debuggerd64 to embedded.mk. They will be silently
ignored on 32-bit builds, and filtered out on 32-bit sdk builds.
Change-Id: I8c30ea65e2b7e224ee73cc9fbbcb7555d3be04b5
2014-02-13 16:23:33 -08:00
Colin Cross
59dc65a28a
am 481fed17
: am f10efbc1
: Merge "make 64-bit builds into multiarch builds"
...
* commit '481fed17fad5141154d8cf9532c0803ade24a6a6':
make 64-bit builds into multiarch builds
2014-02-13 21:38:00 +00:00
Colin Cross
481fed17fa
am f10efbc1
: Merge "make 64-bit builds into multiarch builds"
...
* commit 'f10efbc15e458f50bb29fe9ad0653fb2e08fd8fb':
make 64-bit builds into multiarch builds
2014-02-13 21:20:31 +00:00
Colin Cross
930b5fbcb9
make 64-bit builds into multiarch builds
...
Also enable the 64-bit binder interface and make them only use ART.
Change-Id: I05de41ce348c14722c84a658f745659bde5ba423
2014-02-12 19:49:47 -08:00
Ying Wang
e6a65a5f15
resolved conflicts for merge of b6d53f0b
to master
...
Change-Id: Id01809e2a72ca8ba13594621690273fc6f982095
2014-02-12 14:58:06 -08:00
Ying Wang
b6d53f0b31
am bec954d0
: Merge "Clean up dangling module names"
...
* commit 'bec954d05e0eeec178c796d2332ee9a86becb5dc':
Clean up dangling module names
2014-02-12 19:22:52 +00:00
Ying Wang
d18e570fba
Clean up dangling module names
...
Those modules have disappeared from the source tree.
https://code.google.com/p/android/issues/detail?id=61210
Change-Id: Iab369d2f591f46eb86b9fccf2087515edf974662
2014-02-11 17:28:30 -08:00
Ying Wang
1eba3c14c7
am 484c7dec
: am ba46260f
: Merge "Runtime resource overlay, iteration 2"
...
* commit '484c7dec798c8ba068f282d1d4398bfdd9b634d3':
Runtime resource overlay, iteration 2
2014-02-11 19:41:03 +00:00
Ying Wang
484c7dec79
am ba46260f
: Merge "Runtime resource overlay, iteration 2"
...
* commit 'ba46260f8dee97138d2eb456560b45eb9f914930':
Runtime resource overlay, iteration 2
2014-02-11 19:34:55 +00:00
Ying Wang
ba46260f8d
Merge "Runtime resource overlay, iteration 2"
2014-02-11 19:27:59 +00:00
Justin Koh
f26c96edc5
resolved conflicts for merge of 34cb6460
to master
...
Change-Id: I46982ef15b479e55b5cdf2f446577fbaa1356cea
2014-02-11 11:26:14 -08:00
Justin Koh
34cb646077
am f0c58da0
: Change core_tiny to not be minimal font footprint.
...
* commit 'f0c58da07d6ebcff215338c1cd1f4410786c1858':
Change core_tiny to not be minimal font footprint.
2014-02-11 18:59:47 +00:00
Justin Koh
f0c58da07d
Change core_tiny to not be minimal font footprint.
...
Change core_tiny to not be minimal font footprint: UX really wants roboto
condensed. Checked /proc/meminfo before and after the change and didn't
see much difference.
Change-Id: I94072f674ff678dfdbddd66d3792e63245e5e7da
2014-02-11 10:28:11 -08:00
Steve Moyer
60250d42a1
Merge "Adding SmsTest to sdk build"
2014-02-11 00:42:16 +00:00
David 'Digit' Turner
35cfe9e8af
am cc57457c
: am 145562fc
: Merge "Add missing font files to SDK system images."
...
* commit 'cc57457c880fdf5e85dd07b11fa61928ca692b45':
Add missing font files to SDK system images.
2014-02-10 13:29:51 +00:00
David 'Digit' Turner
cc57457c88
am 145562fc
: Merge "Add missing font files to SDK system images."
...
* commit '145562fcef979e4fea946987717618dba6148aeb':
Add missing font files to SDK system images.
2014-02-10 12:10:22 +00:00
David 'Digit' Turner
145562fcef
Merge "Add missing font files to SDK system images."
2014-02-10 11:31:18 +00:00
Steve Moyer
577e914b03
Adding SmsTest to sdk build
...
Change-Id: I42cf752e188ce579ecb9e9c6439d369bdbb0c177
2014-02-07 11:46:08 -08:00
Elliott Hughes
77f88ce0da
am 3f040869
: am efb9603a
: Merge "[MIPS64] Add mips64 target"
...
* commit '3f0408695b23a8d21c3227ae845006381b26f666':
[MIPS64] Add mips64 target
2014-02-06 20:29:48 +00:00
Elliott Hughes
3f0408695b
am efb9603a
: Merge "[MIPS64] Add mips64 target"
...
* commit 'efb9603aeb5ac71e23fa2a3ade6aa4fc2efdeb5e':
[MIPS64] Add mips64 target
2014-02-06 20:21:41 +00:00
Andreas Huber
a42d3a4865
fix the build, libstagefright_chromium_http is no longer needed.
...
Change-Id: I1777b3e9157a4bdb868b9e14cc62422b1e017c5d
2014-02-06 09:29:48 -08:00
Chris Dearman
1efd9e462a
[MIPS64] Add mips64 target
...
Change-Id: Ice1621101c0d5a3314db288542ca8020e3f406bf
Signed-off-by: Duane Sand <duane.sand@imgtec.com>
2014-02-05 19:07:57 -08:00
David 'Digit' Turner
b0dac93412
Add missing font files to SDK system images.
...
This adds a few missing font families to SDK system images.
This allows, in particular, support for the Korean language.
Note that this depends on other patches under device/generic/
to fix some board and product configuration files, otherwise
this change will have no effect.
See http://b.android.com/40340
Change-Id: Idba6471de32232833f511a4da97fd652906fec51
2014-02-04 14:49:23 +01:00
Noreen Tolland
c816e06127
Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev
2014-01-31 23:13:24 +00:00
Nick Vaccaro
2422e76192
am ec0c99a6
: Add atrace for supporting systrace tool
...
* commit 'ec0c99a6c574954fb37bd94ba18b02a20edbe122':
Add atrace for supporting systrace tool
2014-01-31 16:41:07 +00:00
Mårten Kongstad
2e1ade925c
Runtime resource overlay, iteration 2
...
Support any number of overlay packages. Support any target package.
UPDATED PACKAGE MATCHING
------------------------
In Runtime resource overlay, iteration 1, only a single overlay package
was considered. Package matching was based on file paths:
/vendor/overlay/system/framework-res.apk corresponded to
/system/framework-res.apk. Introduce a more flexible matching scheme
where any package is an overlay package if its manifest includes
<overlay targetPackage="com.target.package"/>
For security reasons, an overlay package must fulfill certain criteria
to take effect: see below.
THE IDMAP TOOL AND IDMAP FILES
------------------------------
Idmap files are created by the 'idmap' binary; idmap files must be
present when loading packages. For the Android system, Zygote calls
'idmap' as part of the resource pre-loading. For application packages,
'idmap' is invoked via 'installd' during package installation (similar
to 'dexopt').
UPDATED FLOW
------------
The following is an outline of the start-up sequences for the Android
system and Android apps. Steps marked with '+' are introduced by this
commit.
Zygote initialization
Initial AssetManager object created
+ idmap --scan creates idmaps for overlays targeting 'android', \
stores list of overlays in /data/resource-cache/overlays.list
AssetManager caches framework-res.apk
+ AssetManager caches overlay packages listed in overlays.list
Android boot
New AssetManager's ResTable acquired
AssetManager re-uses cached framework-res.apk
+ AssetManager re-uses cached 'android' overlays (if any)
App boot
ActivityThread prepares AssetManager to load app.apk
+ ActivityThread prepares AssetManager to load app overlays (if any)
New AssetManager's ResTable acquired as per Android boot
SECURITY
--------
Overlay packages are required to be pre-loaded (in /vendor/overlay).
These packages are trusted by definition. A future iteration of runtime
resource overlay may add support for downloaded overlays, which would
likely require target and overlay signatures match for the overlay to
be trusted.
LOOKUP PRIORITY
---------------
During resource lookup, packages are sequentially queried to provide a
best match, given the constraints of the current configuration. If any
package provide a better match than what has been found so far, it
replaces the previous match. The target package is always queried last.
When loading a package with more than one overlay, the order in which
the overlays are added become significant if several packages overlay
the same resource.
Had downloaded overlays been supported, the install time could have been
used to determine the load order. Regardless, for pre-installed
overlays, the install time is randomly determined by the order in which
the Package Manager locates the packages during initial boot. To support
a well-defined order, pre-installed overlay packages are expected to
define an additional 'priority' attribute in their <overlay> tags:
<overlay targetPackage="com.target.package" priority="1234"/>
Pre-installed overlays are loaded in order of their priority attributes,
sorted in ascending order.
Assigning the same priority to several overlays targeting the same base
package leads to undefined behaviour. It is the responsibility of the
vendor to avoid this.
The following example shows the ResTable and PackageGroups after loading
an application and two overlays. The resource lookup framework will
query the packages in the order C, B, A.
+------+------+- -+------+------+
| 0x01 | | ... | | 0x7f |
+------+------+- -+------+------+
| |
"android" Target package A
|
Pre-installed overlay B (priority 1)
|
Pre-installed overlay C (priority 2)
Change-Id: If49c963149369b1957f7d2303b3dd27f669ed24e
2014-01-31 14:44:07 +01:00
Nick Vaccaro
572041e6d0
am ec0c99a6
: Add atrace for supporting systrace tool
...
* commit 'ec0c99a6c574954fb37bd94ba18b02a20edbe122':
Add atrace for supporting systrace tool
2014-01-30 18:42:15 -08:00
Justin Mattson
b60a3f97d1
(DO NOT MERGE) Revert "Make libart the default runtime"
...
This reverts commit 08d410f532
.
2014-01-30 15:30:08 -08:00
Nick Vaccaro
ec0c99a6c5
Add atrace for supporting systrace tool
...
Change-Id: I6504a447218a70b0d148c0b5802228fb28934a0a
Signed-off-by: Nick Vaccaro <nvaccaro@google.com>
2014-01-30 20:33:46 +00:00
Brian Carlstrom
03e1caed18
Make libart the default runtime
...
(cherry picked from commit 08d410f532
)
Change-Id: I4e78a03fcd92e52f34be30726e40af287bb67309
2014-01-28 17:41:40 -08:00
Brian Carlstrom
0b0d6277e0
am be7575ec
: am cba215dd
: am d21197d5
: Merge "Make libart the default runtime"
...
* commit 'be7575ecb1827784f83582847749aa59c664d29e':
Make libart the default runtime
2014-01-29 00:44:02 +00:00
Brian Carlstrom
be7575ecb1
am cba215dd
: am d21197d5
: Merge "Make libart the default runtime"
...
* commit 'cba215dd3241ae62416800f8d97d114d8a6e1a9a':
Make libart the default runtime
2014-01-29 00:41:31 +00:00
Brian Carlstrom
cba215dd32
am d21197d5
: Merge "Make libart the default runtime"
...
* commit 'd21197d50caaa025bd823a004984a2820bb3c2e2':
Make libart the default runtime
2014-01-29 00:39:45 +00:00
Brian Carlstrom
08d410f532
Make libart the default runtime
...
Change-Id: I4394f2bdef6f1be36f0f17f3b42d3e62bc2245ef
2014-01-28 09:52:15 -08:00
Elliott Hughes
d63d974c49
am 6fe9a949
: am 69c36ee7
: am 4fbf23ef
: am 0a3cf1a0
: Merge "Remove libthread_db from the default include path."
...
* commit '6fe9a94989879babb859a24fdef0b2553955cc53':
Remove libthread_db from the default include path.
2014-01-28 01:04:55 +00:00
Elliott Hughes
6fe9a94989
am 69c36ee7
: am 4fbf23ef
: am 0a3cf1a0
: Merge "Remove libthread_db from the default include path."
...
* commit '69c36ee7a8c1e3d8c7ca04d61f75d95585c58253':
Remove libthread_db from the default include path.
2014-01-28 00:59:15 +00:00
Elliott Hughes
69c36ee7a8
am 4fbf23ef
: am 0a3cf1a0
: Merge "Remove libthread_db from the default include path."
...
* commit '4fbf23ef8267849ce88217a256b394de3904a4f6':
Remove libthread_db from the default include path.
2014-01-28 00:54:33 +00:00
Elliott Hughes
4fbf23ef82
am 0a3cf1a0
: Merge "Remove libthread_db from the default include path."
...
* commit '0a3cf1a0e5c6dbe132c1dc5e13293960c5e7b103':
Remove libthread_db from the default include path.
2014-01-28 00:43:29 +00:00
Elliott Hughes
2f8dcdd961
Remove libthread_db from the default include path.
...
This should never have been on the default include path.
The NDK statically links its own libthread_db, so I'm removing
bionic's unused copy from devices.
Bug: 11882807
Change-Id: I49a67fe0902cc4bc178360f6c993959774d74e3a
2014-01-27 15:45:17 -08:00
Colin Cross
194c2a39be
am de89397b
: am 5119fcfc
: am f81cc531
: am d5227a83
: Merge "build: rename aarch64 target to arm64"
...
* commit 'de89397b1636b9d77cbcdea1cfb347251e1d5b0c':
build: rename aarch64 target to arm64
2014-01-24 21:24:54 +00:00
Colin Cross
de89397b16
am 5119fcfc
: am f81cc531
: am d5227a83
: Merge "build: rename aarch64 target to arm64"
...
* commit '5119fcfc2052e9f3a5d4415759fb5bf252d651e8':
build: rename aarch64 target to arm64
2014-01-24 20:48:20 +00:00
Colin Cross
5119fcfc20
am f81cc531
: am d5227a83
: Merge "build: rename aarch64 target to arm64"
...
* commit 'f81cc531b41617b91ef2c46b7f2fb1bf1abb8dc7':
build: rename aarch64 target to arm64
2014-01-24 20:45:41 +00:00
Colin Cross
f81cc531b4
am d5227a83
: Merge "build: rename aarch64 target to arm64"
...
* commit 'd5227a833cde624532ec34e8b25c29af001e427f':
build: rename aarch64 target to arm64
2014-01-24 12:42:35 -08:00
Colin Cross
4f0eb7d50c
build: rename aarch64 target to arm64
...
Rename aarch64 build targets to arm64. The gcc toolchain is still
aarch64.
Change-Id: Ia92d8a50824e5329cf00fd6f4f92eae112b7f3a3
2014-01-23 22:39:38 -08:00
David Turner
28e2108d9a
am 82064659
: am 327c3fef
: am fa2c68e8
: am 51c47855
: Merge "Vibra: compile and stage vibrator.default on all targets"
...
* commit '82064659b8c56ad72f722d96733fe0b6f9ea0002':
Vibra: compile and stage vibrator.default on all targets
2014-01-24 05:51:22 +00:00
David Turner
82064659b8
am 327c3fef
: am fa2c68e8
: am 51c47855
: Merge "Vibra: compile and stage vibrator.default on all targets"
...
* commit '327c3fef766052c4e8d492d2102a39deb3bdcaa4':
Vibra: compile and stage vibrator.default on all targets
2014-01-24 05:47:17 +00:00
David Turner
327c3fef76
am fa2c68e8
: am 51c47855
: Merge "Vibra: compile and stage vibrator.default on all targets"
...
* commit 'fa2c68e81a356556298f7bab21a29c14f99f3051':
Vibra: compile and stage vibrator.default on all targets
2014-01-24 05:44:04 +00:00
David Turner
fa2c68e81a
am 51c47855
: Merge "Vibra: compile and stage vibrator.default on all targets"
...
* commit '51c47855f01223b88e1eb134504782695867301f':
Vibra: compile and stage vibrator.default on all targets
2014-01-23 21:36:34 -08:00
David Turner
51c47855f0
Merge "Vibra: compile and stage vibrator.default on all targets"
2014-01-24 05:33:09 +00:00
Nick Kralevich
690b10e662
build: add logd
...
Original-Change-Id: I1b96d7e6dd823a83b07b312bf07792482e883789
Signed-off-by: Nick Kralevich <nnk@google.com>
* merge conflicts
* rename syslog to logd to avert confusion with bionic syslog
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Change-Id: I137fb639a80dd28d2f0042b3ae9b7d6eb5eb5bc4
2014-01-23 11:09:52 -08:00
Doug Zongker
00aba87b7b
add the uncrypt binary to device builds
...
The uncrypt binary needs to be present on any device which reboots
into recovery.
Change-Id: I684a279484876e8a596829e41218095a793ea26b
2014-01-16 12:45:21 -08:00
David Wagner
4e0ee6c74a
Vibra: compile and stage vibrator.default on all targets
...
Add the vibrator.default package to all targets deriving from
generic_no_telephony, i.e. virtually all targets.
This change is related to other changes in:
- hardware/libhardware
- hardware/libhardware_legacy
- frameworks/base
- device/generic/goldfish
Change-Id: Ic8464844e12f7d31ca49597dfc4995b13e9ff419
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: David Wagner <david.wagner@intel.com>
Author-tracking-BZ: 94611
2014-01-10 13:56:20 +01:00
Vinit Deshapnde
af5ad49846
Move Wifi services to a new git project
...
Bug: 12175455
Change-Id: I1fa07e29c6a9aae38d9e334d519a9f2445d15613
2014-01-08 10:43:31 -08:00
Narayan Kamath
fa36195096
am f57caaa3
: am fa0e1626
: am 6ab8c86b
: am 8530e25f
: Merge "Remove libSR_AudioIn from base.mk"
...
* commit 'f57caaa32e473010c30ae97326c632e08791d6d1':
Remove libSR_AudioIn from base.mk
2014-01-08 10:12:12 +00:00
Narayan Kamath
f57caaa32e
am fa0e1626
: am 6ab8c86b
: am 8530e25f
: Merge "Remove libSR_AudioIn from base.mk"
...
* commit 'fa0e1626bdd0964f6f9665c41df66ef27ef32caf':
Remove libSR_AudioIn from base.mk
2014-01-08 10:10:02 +00:00
Narayan Kamath
fa0e1626bd
am 6ab8c86b
: am 8530e25f
: Merge "Remove libSR_AudioIn from base.mk"
...
* commit '6ab8c86b56a5914f30f95b73ab906de3295da03e':
Remove libSR_AudioIn from base.mk
2014-01-08 10:07:49 +00:00
Narayan Kamath
6ab8c86b56
am 8530e25f
: Merge "Remove libSR_AudioIn from base.mk"
...
* commit '8530e25ff666987c7c968c2a323a8b1e7867bcca':
Remove libSR_AudioIn from base.mk
2014-01-08 02:05:12 -08:00
Narayan Kamath
8530e25ff6
Merge "Remove libSR_AudioIn from base.mk"
2014-01-08 09:59:56 +00:00
Ying Wang
cd6ad402a4
am c7471757
: Now PRODUCT_BOOT_JARS is a list of jar names.
...
* commit 'c74717574fab08700f657a3f5ebf8934cf4572c7':
Now PRODUCT_BOOT_JARS is a list of jar names.
2014-01-08 01:26:04 +00:00
Ying Wang
c74717574f
Now PRODUCT_BOOT_JARS is a list of jar names.
...
See commit ad6674cd60
.
Change-Id: I5e45c400644b6b98dcf64d96eb2425cdbafb3021
2014-01-07 17:22:10 -08:00
Ying Wang
a21b8ea724
am a292b7b0
: am 83709a21
: am 95fc1a50
: am f12d4810
: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space"
...
* commit 'a292b7b02bdf051df9eebbe4a51c6a55ce91a7a2':
PRODUCT_BOOT_JARS as a list of jar names separated by space
2014-01-08 01:01:21 +00:00
Ying Wang
a292b7b02b
am 83709a21
: am 95fc1a50
: am f12d4810
: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space"
...
* commit '83709a21c1cd3cd30f193ebcb8001344647329e5':
PRODUCT_BOOT_JARS as a list of jar names separated by space
2014-01-08 00:58:31 +00:00
Ying Wang
83709a21c1
am 95fc1a50
: am f12d4810
: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space"
...
* commit '95fc1a50750f8d0341e10f7ea39d37e3af5b21f3':
PRODUCT_BOOT_JARS as a list of jar names separated by space
2014-01-08 00:53:31 +00:00
Ying Wang
95fc1a5075
am f12d4810
: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space"
...
* commit 'f12d48104ba782d877afc31a081748fdc881f2b6':
PRODUCT_BOOT_JARS as a list of jar names separated by space
2014-01-07 16:50:49 -08:00
Ying Wang
ad6674cd60
PRODUCT_BOOT_JARS as a list of jar names separated by space
...
This makes it easier for OEMs to extend the PRODUCT_BOOT_JARS in their
product configuration files.
Change-Id: I5feca2f808b1914c275f28c7a4c38cca2ba6851f
2014-01-07 14:31:49 -08:00
Narayan Kamath
8ef82240e1
Remove libSR_AudioIn from base.mk
...
This is an obsolete rule that was grandfathered in because
it was a USER module at some point. It's no longer
required, even by builds that use packages/app/VoiceDialer.
Change-Id: Ife9e89bd1b03c0364e27650863a83bad945b8089
2014-01-07 10:06:13 +00:00
Todd Poynor
1dd90e33f8
am a2466857
: build lmkd
...
* commit 'a2466857412d3abe8351f7339d4b658ab0c899b8':
build lmkd
2014-01-06 21:28:57 +00:00
Todd Poynor
a246685741
build lmkd
...
Change-Id: I5e7c785d3f76ec2d0f30ae6aa948436f5d04957b
2014-01-06 21:05:08 +00:00
Ying Wang
65cd1e9535
am b86c34ae
: am f05eecc3
: am a47d12e3
: Merge "Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt"
...
* commit 'b86c34ae64177ee725ebd3cad77c9f044a41d36c':
Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt
2014-01-04 02:05:30 +00:00
Ying Wang
f05eecc368
am a47d12e3
: Merge "Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt"
...
* commit 'a47d12e38ae38a6fdceb54172490c94408efa0de':
Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt
2014-01-03 17:59:59 -08:00