05f47b74f3
Copy video stop sound
...
Bug: 25652382
Change-Id: I72b922a0b3308270a4211700bda7321e1f215c47
2015-11-20 14:00:57 -08:00
4dcd769f2c
Move mips64 target to clang by default.
...
Bug: 23163853
Change-Id: Ia3d449f908b09ce95b3de246c8c699d171dcbaa3
2015-11-20 13:35:44 -08:00
990407e0a5
Move mips target to clang by default.
...
Bug: 23163853
Change-Id: I408ffd90ff2ff075e03962fffd1681fccf0319d3
2015-11-20 13:32:22 -08:00
89b94c827f
Use core-oj alongside core-libart wherever required.
...
With some core classes moved to separate core-oj jar
we need to use the new jar.
Change-Id: Ie069c7a93e63b1df854b3137d984b96520562609
2015-11-20 13:53:22 +00:00
3b4f90cfab
Merge "Include MtpDocumentsProvider in the system image."
2015-11-18 23:38:20 +00:00
bb16dcf28e
Include libGLESv3.so to PRODUCT_PACKAGES
...
Bug: http://b/25754041
Change-Id: If5f5030e7e1da037d873f0252dd8beb8ce6fd4db
2015-11-18 15:30:57 -08:00
14a5e8670d
Merge "Remove unnecessary inheritance layer between aliases." am: 2f05af74bc am: 10021ac19d
...
am: 1f5de04af7
2015-11-18 17:52:32 +00:00
90bf437e7c
Include MtpDocumentsProvider in the system image.
...
BUG=25731385
Change-Id: I9fa90a5c4a0bca3ab7d36968b1e3b40d60d55d31
2015-11-18 13:00:40 +09:00
cc2001fb44
Remove unnecessary inheritance layer between aliases.
...
The extra inheritance layer may cause multiple
PRODUCT_DEVICE/PRODUCT_BRAND values for a product if it doesn't
explicitly override them, eg. gms.
The full_* are deprecated product names. We keep them just for backward
compatibility, for some tools may still use the full_* product names.
Bug: 25611987
Change-Id: I7ecebd422754c3ceb16507b8d9ced65d533fe7c3
2015-11-16 17:21:42 -08:00
3b6db9c4c5
Merge "Make jit the default for all builds."
2015-11-11 08:47:36 +00:00
83c07e93c9
Merge "Let qemu_props service set system properties in ro.emu and ro.emulator" am: 0b4529239f am: 2e4314481e
...
am: 9707c5d724
2015-11-08 01:06:15 +00:00
0517540e8d
Let qemu_props service set system properties in ro.emu and ro.emulator
...
These boot properties are used by android wear emulator to configure
round and chin shaped devices.
Bug: 23324757
Change-Id: I812da02d771bba0ffc63b14459c7de7cbdeed142
2015-11-07 16:53:59 -08:00
20ed978ada
Let qemu_props service set system properties in ro.emu and ro.emulator
...
These boot properties are used by android wear emulator to configure
round and chin shaped devices.
Bug: 23324757
Change-Id: I812da02d771bba0ffc63b14459c7de7cbdeed142
2015-11-07 16:44:54 -08:00
56a84e1b6c
Make jit the default for all builds.
...
Change-Id: Ifa4280cdab0747cae8d3e2becec47b230846def6
2015-11-05 18:02:13 +00:00
4e5955ea7c
Merge "selinux: Grant all processes the domain_deprecated attribute" am: b18da85cb6 am: 6e32d6b0a0
...
am: 10b3d6cfcb
2015-11-04 19:06:04 +00:00
7890fc4d2e
selinux: Grant all processes the domain_deprecated attribute
...
Bug: 25433265
Change-Id: Iafad5abd6e75c5a46f844ef3e744adf1c904b362
2015-11-04 08:49:07 -08:00
afcf77f54b
Add audioserver executable to base config
...
Bug: 24511453
Change-Id: Ic6575fc8f5a4ab1a75854dc488021d7d06fa1e97
2015-10-30 13:11:30 -07:00
6c5754a93f
Merge "Add extractorservice executable to base config"
2015-10-28 17:30:40 +00:00
d1e932e91e
Merge "Move arm64 target to clang by default." am: befb82f204 am: b7ad8778cd
...
am: 72d90d25d0
2015-10-28 01:46:34 +00:00
07be5025d9
resolve merge conflicts of b5775d97b4 to master.
...
Change-Id: I99fda2935ab74e0634c1aa4905ce4da693e96cb6
2015-10-27 16:48:38 -07:00
b7ad8778cd
Merge "Move arm64 target to clang by default."
...
am: befb82f204
2015-10-27 23:12:23 +00:00
639ab89a11
Merge "Move arm target to clang by default."
...
am: 873d394c54
2015-10-27 23:12:13 +00:00
befb82f204
Merge "Move arm64 target to clang by default."
2015-10-27 23:02:26 +00:00
cf67f13792
Move arm64 target to clang by default.
...
Bug: 23163853
Change-Id: I59c311f552ca060bc7bd034fa4f1c03eb24802d5
2015-10-27 13:44:53 -07:00
557fa2f3cd
Move arm target to clang by default.
...
Bug: 23163853
Change-Id: I4cb95ed652ca697461e2fb22811779aa2df8d262
2015-10-27 13:42:34 -07:00
469a926e7f
Add extractorservice executable to base config
...
Change-Id: I0ffbe183decfd76be681e08b8627c3d789c4b916
2015-10-27 10:28:00 -07:00
a7404f6f9a
Merge "Move x86_64 target to clang by default." am: 373a1e36a9 am: bbe8225aca
...
am: 8d28df5804
2015-10-23 00:36:09 +00:00
bbe8225aca
Merge "Move x86_64 target to clang by default."
...
am: 373a1e36a9
2015-10-23 00:30:05 +00:00
373a1e36a9
Merge "Move x86_64 target to clang by default."
2015-10-23 00:26:20 +00:00
b9774f34e1
Move x86_64 target to clang by default.
...
Bug: 23163853
Change-Id: I0587ec75c0000ac99562233de33147ec8e120e65
2015-10-22 16:29:59 -07:00
d51e641dfe
Merge "allow qemu_props to set opengles.version" am: c5a33b0570 am: c6c5b1a969
...
am: 58ddb6d8e8
2015-10-21 18:29:12 +00:00
c6c5b1a969
Merge "allow qemu_props to set opengles.version"
...
am: c5a33b0570
2015-10-21 18:19:49 +00:00
ce1062629f
allow qemu_props to set opengles.version
...
Addresses the following denial:
init: avc: denied { set } for property=opengles.version scontext=u:r:qemu_props:s0 tcontext=u:object_r:default_prop:s0 tclass=property_service
Bug: 25148690
Change-Id: I4b197eeabfe37e794104e4e686e9e388b5bc3e0c
2015-10-21 10:55:21 -07:00
8acf4e7ba9
Merge "Move x86 target to clang by default." am: a993bfff36 am: ebfadd8990
...
am: 9b2e93946e
2015-10-20 23:58:58 +00:00
ebfadd8990
Merge "Move x86 target to clang by default."
...
am: a993bfff36
2015-10-20 20:12:12 +00:00
f0ba2e9da6
Move x86 target to clang by default.
...
Bug: 23163853
Change-Id: Ib5e9beddbeca8968d6e4365abeb44ae97cbe9981
2015-10-20 12:16:57 -07:00
a749f91191
am 6a14ba31: am 58a748d3: am 87f58261: Merge "Error correction: Append codes to verified partitions"
...
* commit '6a14ba317cea22f16db3bb76cb818fd7322b8253':
Error correction: Append codes to verified partitions
2015-10-19 10:07:21 +00:00
58a748d37e
am 87f58261: Merge "Error correction: Append codes to verified partitions"
...
* commit '87f582611a5a5c23abf3237abe0e467e46111567':
Error correction: Append codes to verified partitions
2015-10-19 02:55:51 -07:00
87f582611a
Merge "Error correction: Append codes to verified partitions"
2015-10-19 09:49:18 +00:00
a731c7b466
am 7fffc3d0: am 5eb1f1fb: am f1b066b5: Merge "Remove duplicate local_time.default"
...
* commit '7fffc3d0d0ed74c4b5b75a765483c89912089098':
Remove duplicate local_time.default
2015-10-15 18:50:02 +00:00
5eb1f1fbf1
am f1b066b5: Merge "Remove duplicate local_time.default"
...
* commit 'f1b066b5ce3ebec905cb38dbb48a77dc58d4c457':
Remove duplicate local_time.default
2015-10-15 18:39:45 +00:00
f1b066b5ce
Merge "Remove duplicate local_time.default"
2015-10-15 18:35:26 +00:00
c98da6590a
am ee15a452: am f14b0298: am 5c24a50e: Merge "generic_x86: delete system_server execmem"
...
* commit 'ee15a4527e2ee495141a06774e332cb3c0c61fc4':
generic_x86: delete system_server execmem
2015-10-15 09:55:15 +00:00
f14b0298f6
am 5c24a50e: Merge "generic_x86: delete system_server execmem"
...
* commit '5c24a50e5fba6aad3319edc0770005e20ac0b9e1':
generic_x86: delete system_server execmem
2015-10-15 09:46:45 +00:00
7da1b68236
generic_x86: delete system_server execmem
...
https://android-review.googlesource.com/175922 removed all uses
of system_server execmem and neverallowed it. The x86 emulator policy
inappropriately includes this rule. Delete it.
Fixes the following build breakage:
libsepol.report_failure: neverallow on line 473 of external/sepolicy/system_server.te (or line 12452 of policy.conf) violated by allow system_server system_server:process { execmem };
libsepol.check_assertions: 1 neverallow failures occurred
Error while expanding policy
Change-Id: I7fbfaa0a09e8f4e8a372d2f1a64bbe58d5302204
2015-10-15 02:37:40 -07:00
99fe05567b
am f635a586: Merge "Disable verity metadata for eng builds"
...
* commit 'f635a586e8f4790455ef3dad8c1291c9eb95747e':
Disable verity metadata for eng builds
2015-10-14 20:53:28 +00:00
f99b53143d
Error correction: Append codes to verified partitions
...
Append error-correcting codes to verified partitions provided that
PRODUCT_SUPPORTS_VERITY_FEC is true.
This moves verity metadata to be after the hash tree, and requires
matching changes from
Ide48f581bbba77aed6132f77b309db71630d81ed
Bug: 21893453
Change-Id: I6945cbab99e214566a1f9d3702333f2dbbc35816
2015-10-14 18:06:20 +01:00
58fbd69729
Disable verity metadata for eng builds
...
We don't have dm-verity enabled on eng builds, so don't waste time
generating metadata for images.
Change-Id: Ib2c8d459bb50c30dc32a4ea1fdedc152c09a3a0f
(cherry picked from commit beae6395fc
2015-10-14 18:03:29 +01:00
8638de1f6f
am ab4d8594: Switch from Calculator to ExactCalculator
...
* commit 'ab4d8594591b715934d7a1106d5284e9721070ba':
Switch from Calculator to ExactCalculator
2015-10-13 03:49:41 +00:00
ab4d859459
Switch from Calculator to ExactCalculator
...
Bug: 24875598
Use ExactCalculator for AOSP builds.
This is a manual (due to intervening commits) cherrypick of
commit 53c5891460
2015-10-12 17:08:04 -07:00
30c197eeaf
Include the new "cmd" command-line tool in all Android builds.
...
Change-Id: I93f415ddde0f4e273be04af3379ee706962416d2
2015-10-12 10:39:04 -07:00
7fa65eec72
Remove duplicate local_time.default
...
Seems it's copied from target/product/generic_no_telephony.mk
which had duplicate local_time.default before.
(fixed in commit 567ea28838
2015-10-08 15:07:23 +08:00
b1bee75f79
am 3d6e194e: am 393c6254: Really include drawables for all densities.
...
* commit '3d6e194eafbb441c79d4cd306af85eeb34fb75e8':
Really include drawables for all densities.
2015-09-29 18:13:03 +00:00
3d6e194eaf
am 393c6254: Really include drawables for all densities.
...
* commit '393c62549a6340b3473f14b71d583e118d7e6a6d':
Really include drawables for all densities.
2015-09-29 18:07:41 +00:00
393c62549a
Really include drawables for all densities.
...
Previously with "PRODUCT_AAPT_CONFIG := normal" resource with modifier
"small" isn't included.
Bug: 21643610
Change-Id: I53940d716fb9705462b1abb882e04103e211f8af
2015-09-29 09:57:41 -07:00
ad52d27ba7
am efae8b10: am 6af93636: am c6444855: Merge "GPU: add gralloc.ranchu library"
...
* commit 'efae8b1003cb06cd0d05c8fc4017715dd40ea3f6':
GPU: add gralloc.ranchu library
2015-09-25 17:21:26 +00:00
efae8b1003
am 6af93636: am c6444855: Merge "GPU: add gralloc.ranchu library"
...
* commit '6af936361bbfb23042d7a7cecb3034d4f25795a0':
GPU: add gralloc.ranchu library
2015-09-25 17:13:20 +00:00
6af936361b
am c6444855: Merge "GPU: add gralloc.ranchu library"
...
* commit 'c64448550a5148489346f7ba3ac0a686b32dbc26':
GPU: add gralloc.ranchu library
2015-09-25 17:06:22 +00:00
c64448550a
Merge "GPU: add gralloc.ranchu library"
2015-09-25 16:59:31 +00:00
173615ddee
GPU: add gralloc.ranchu library
...
Change-Id: I76b21f67e081d82ec76242c051569f32b2b6b638
2015-09-24 21:04:24 +02:00
bd264342a0
am 527b6255: am 4a9e0c8c: am 17a41e36: Merge "Add ld.mc as a requirement for core_tiny.mk as well."
...
* commit '527b6255ccd0e41ca8bbdfcf97121c67c0074280':
Add ld.mc as a requirement for core_tiny.mk as well.
2015-09-22 22:22:23 +00:00
527b6255cc
am 4a9e0c8c: am 17a41e36: Merge "Add ld.mc as a requirement for core_tiny.mk as well."
...
* commit '4a9e0c8cc5c15505bfbd6ed03ff6b8855af64420':
Add ld.mc as a requirement for core_tiny.mk as well.
2015-09-22 22:14:30 +00:00
4a9e0c8cc5
am 17a41e36: Merge "Add ld.mc as a requirement for core_tiny.mk as well."
...
* commit '17a41e36dbe75b94bde05a1c511903ae2162aea8':
Add ld.mc as a requirement for core_tiny.mk as well.
2015-09-22 22:06:34 +00:00
5e70468657
Add ld.mc as a requirement for core_tiny.mk as well.
...
Bug: 24171451
I missed this when I initially added ld.mc as a requirement for
core_minimal.mk. This is required for RenderScript linking on the
device.
Change-Id: Ie3ffa2454214f886c38387f45b34df2dcbebd6e6
(cherry picked from commit 446ae75fb7
2015-09-22 12:54:54 -07:00
446ae75fb7
Add ld.mc as a requirement for core_tiny.mk as well.
...
Bug: 24171451
I missed this when I initially added ld.mc as a requirement for
core_minimal.mk. This is required for RenderScript linking on the
device.
Change-Id: Ie3ffa2454214f886c38387f45b34df2dcbebd6e6
2015-09-22 12:49:39 -07:00
87d44ceccd
am 6321e831: am 6d98051a: am 8cb586a5: am ca352f36: am 2ad5c0cc: Merge "emulator.mk: Add ethernet permission" into mnc-dev
...
* commit '6321e831bb0d9f78c300b1c5cdf4871f31ff3949':
emulator.mk: Add ethernet permission
2015-09-16 18:12:35 +00:00
6321e831bb
am 6d98051a: am 8cb586a5: am ca352f36: am 2ad5c0cc: Merge "emulator.mk: Add ethernet permission" into mnc-dev
...
* commit '6d98051a8fab8ba37e661b746f024907b2425be4':
emulator.mk: Add ethernet permission
2015-09-16 18:05:15 +00:00
ca352f3623
am 2ad5c0cc: Merge "emulator.mk: Add ethernet permission" into mnc-dev
...
* commit '2ad5c0cca46b7f0a159dbc90243756c84a93b093':
emulator.mk: Add ethernet permission
2015-09-16 17:45:59 +00:00
beae6395fc
Disable verity metadata for eng builds
...
We don't have dm-verity enabled on eng builds, so don't waste time
generating metadata for images.
Change-Id: Ib2c8d459bb50c30dc32a4ea1fdedc152c09a3a0f
2015-09-16 15:12:39 +01:00
9ee993f60e
emulator.mk: Add ethernet permission
...
Networking on old emulator device(a.k.a. goldfish) relies on RIL;
However, RIL is not available on ranchu device yet. For ranchu device
to have a functional networking, we need to add ethernet permission
and start dhcpcd_eth0 service on ranchu device. This CL adds ethernet
permission to both goldfish (which is harmless) and ranchu devices.
This addition was originally proposed by miroslav.tisma@imgtec.com
and the ethernet permission was only added to arm64 and mips64 after
discussion. With the ranchu device supporting more architectures,
it makes sense to allow this permission on all devices and all CPU
architectures.
related CL by miroslav.tisma@imgtec.com on AOSP:
b09fb84becf73bf2bc578ebf27910d75b79d668a
bug: 24070972
Change-Id: I81ac5d8901adee43784fe9dd45a170fb90bb824a
2015-09-14 16:40:12 -07:00
341bb905e2
am 844079e0: resolved conflicts for merge of b8b53534 to mnc-dr-dev-plus-aosp
...
* commit '844079e0f28420fa463ac8913332c4e8a5101f34':
move init.trace.rc to frameworks/native
2015-09-03 22:31:49 +00:00
844079e0f2
resolved conflicts for merge of b8b53534 to mnc-dr-dev-plus-aosp
...
Change-Id: I72caaa4aaf9ec78abb83e9d9b3ced535ab3f7c04
2015-09-03 15:20:51 -07:00
b8b535349a
am 62062c9d: Merge "move init.trace.rc to frameworks/native"
...
* commit '62062c9d66e38ad404d93e963c1341fa4b7090fe':
move init.trace.rc to frameworks/native
2015-09-03 22:02:38 +00:00
05bd7f3499
move init.trace.rc to frameworks/native
...
init.trace.rc will be renamed to atrace.rc and use the LOCAL_INIT_RC
mechanism to be included on /system appropriately.
Bug 23186545
Change-Id: Ibb86761d3e8d3c6d194ddb1220f93a71a8c6675b
2015-09-03 14:20:43 -07:00
d926d4bd60
am 74415b3b: am 28dd99d8: am a0eb142a: am dfea066f: Merge "Include init.usb.configfs.rc into rootdir" into mnc-dr-dev
...
* commit '74415b3b6d3969374e3062154cb0fd10066e9837':
Include init.usb.configfs.rc into rootdir
2015-09-03 04:34:38 +00:00
74415b3b6d
am 28dd99d8: am a0eb142a: am dfea066f: Merge "Include init.usb.configfs.rc into rootdir" into mnc-dr-dev
...
* commit '28dd99d8eacb5b1baf4f16a07472de8bbd9d5100':
Include init.usb.configfs.rc into rootdir
2015-09-03 04:23:00 +00:00
a8a4a93733
Include init.usb.configfs.rc into rootdir
...
Bug=23633457
Change-Id: I26bbc5ff597138b2ccac1de72117753739b31554
2015-09-01 22:43:42 +00:00
bf8ad93d0b
am 5d463ff9: am 7086e113: am e4c753f4: Merge "Add ahat to runtime_libart product."
...
* commit '5d463ff9ceecb3a2dbc565e33fbbff3c4e60198b':
Add ahat to runtime_libart product.
2015-09-01 17:04:30 +00:00
5d463ff9ce
am 7086e113: am e4c753f4: Merge "Add ahat to runtime_libart product."
...
* commit '7086e1136a898caa0316002419eb9961f554459e':
Add ahat to runtime_libart product.
2015-09-01 16:43:48 +00:00
7086e1136a
am e4c753f4: Merge "Add ahat to runtime_libart product."
...
* commit 'e4c753f428ff404f10ec1bf170ea18ed2687dc07':
Add ahat to runtime_libart product.
2015-09-01 16:36:23 +00:00
7324f30a4f
Add ahat to runtime_libart product.
...
Change-Id: Iae5837f884c926a9f0e57df56bd21b6260ee8b2d
2015-08-28 16:30:17 -07:00
5758846abe
am e7fb896d: am 35a075db: am 36d91b53: Merge "Only allow toolbox exec where /system exec was already allowed."
...
* commit 'e7fb896df309953d010f3c3923b7ed83505cd12b':
Only allow toolbox exec where /system exec was already allowed.
2015-08-26 03:00:03 +00:00
e7fb896df3
am 35a075db: am 36d91b53: Merge "Only allow toolbox exec where /system exec was already allowed."
...
* commit '35a075db60bc5553b57ef3311b9643d3b04ea7da':
Only allow toolbox exec where /system exec was already allowed.
2015-08-26 02:54:08 +00:00
64e4d8a211
am 35a075db: am 36d91b53: Merge "Only allow toolbox exec where /system exec was already allowed."
...
* commit '35a075db60bc5553b57ef3311b9643d3b04ea7da':
Only allow toolbox exec where /system exec was already allowed.
2015-08-25 22:53:03 +00:00
75770de701
Only allow toolbox exec where /system exec was already allowed.
...
When the toolbox domain was introduced, we allowed all domains to exec it
to avoid breakage. However, only domains that were previously allowed the
ability to exec /system files would have been able to do this prior to the
introduction of the toolbox domain. Remove the rule from domain.te and add
rules to all domains that are already allowed execute_no_trans to system_file.
Requires coordination with device-specific policy changes with the same Change-Id.
Change-Id: Ie46209f0412f9914857dc3d7c6b0917b7031aae5
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-08-25 11:46:12 -04:00
2bbb6aa343
am 25067c4d: am 3337d1eb: am 58aacccb: am 39b32b0d: am 956e4693: Increasing MIPS emulator system image size and user-data image size
...
* commit '25067c4dc379e96538e7c551ad5d094197765931':
Increasing MIPS emulator system image size and user-data image size
2015-08-19 02:21:12 +00:00
25067c4dc3
am 3337d1eb: am 58aacccb: am 39b32b0d: am 956e4693: Increasing MIPS emulator system image size and user-data image size
...
* commit '3337d1eb298516a4dd8b43fdc4b00dcde29f3c32':
Increasing MIPS emulator system image size and user-data image size
2015-08-19 01:42:32 +00:00
8694cf75b6
am 956e4693: Increasing MIPS emulator system image size and user-data image size
...
* commit '956e469327b1da4b635f20795ed48f6c36ba10d6':
Increasing MIPS emulator system image size and user-data image size
2015-08-19 01:40:09 +00:00
39b32b0d1f
am 956e4693: Increasing MIPS emulator system image size and user-data image size
...
* commit '956e469327b1da4b635f20795ed48f6c36ba10d6':
Increasing MIPS emulator system image size and user-data image size
2015-08-18 18:28:45 +00:00
956e469327
Increasing MIPS emulator system image size and user-data image size
...
Size increase taken as a precaution against recent built breakage
due to lack of space on a number of targets (e.g. x86, ARM64).
System and user-data image sizes set to match currently most common
setup for the emulator: system image: 1.25gb, user-data image 700mb.
Change-Id: I7118eb26dd78f5fa9e4f0006e15c8d47dee8e28c
2015-08-18 17:34:09 +00:00
fdb22ae470
am ae71306a: Merge "Revert "Revert "Switch from Calculator to ExactCalculator""" into mnc-dr-dev-plus-aosp
...
* commit 'ae71306af68ab60a3e006deb8e4a0f48c3d43ea5':
Revert "Revert "Switch from Calculator to ExactCalculator""
2015-08-17 18:43:27 +00:00
45249ff5d1
Revert "Revert "Switch from Calculator to ExactCalculator""
...
This reverts commit 455ffaafcd
2015-08-13 19:22:06 +00:00
53c5891460
Revert "Revert "Switch from Calculator to ExactCalculator""
...
This reverts commit 455ffaafcd
2015-08-13 12:19:38 -07:00
0477cbe63d
am 742463b3: am 689c097e: am 148839b2: am 17b06910: am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
...
* commit '742463b30fb0f45bd43bf8e0c1c799c9bee35303':
Include new AOSP messaging app in base AOSP telephony builds.
2015-08-13 15:50:24 +00:00
742463b30f
am 689c097e: am 148839b2: am 17b06910: am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
...
* commit '689c097eb3ad838f18fd13493cc0d73260f1137e':
Include new AOSP messaging app in base AOSP telephony builds.
2015-08-13 15:43:39 +00:00
17b0691076
am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
...
* commit '5bf35d0685ba62ded55cc63f3dd2f23b82cc645d':
Include new AOSP messaging app in base AOSP telephony builds.
2015-08-13 15:22:44 +00:00
44af8f9655
am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
...
* commit '5bf35d0685ba62ded55cc63f3dd2f23b82cc645d':
Include new AOSP messaging app in base AOSP telephony builds.
2015-08-13 15:21:46 +00:00
0933e17bb6
am cd8f838d: am c85364c9: am 5f79bcdd: Merge changes from topic \'file_contexts.bin\'
...
* commit 'cd8f838d079b38d8c125396f7932c4be24063193':
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
2015-08-13 00:10:36 +00:00
cd8f838d07
am c85364c9: am 5f79bcdd: Merge changes from topic \'file_contexts.bin\'
...
* commit 'c85364c9c91961461a6d81a37c8b30b34b02383b':
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
2015-08-13 00:01:09 +00:00
420662b9cd
am c85364c9: am 5f79bcdd: Merge changes from topic \'file_contexts.bin\'
...
* commit 'c85364c9c91961461a6d81a37c8b30b34b02383b':
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
2015-08-13 00:00:36 +00:00
5f79bcdd07
Merge changes from topic 'file_contexts.bin'
...
* changes:
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
2015-08-12 23:46:28 +00:00
f29b5bd380
Include new AOSP messaging app in base AOSP telephony builds.
...
b/23110861
Change-Id: I31ba32f3341c77ba6eb083a189dffa1a08c6c8d4
2015-08-12 15:44:04 -07:00
01090a42ef
am 28c3907d: am 35bdf149: am 7e8d6f25: am 0fd879cd: am a0372e20: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
...
* commit '28c3907d695786f19b6e1e8b96d4484b28a4a79b':
Removing VisualizationWallpapers as it does not comply with API 23 rules
2015-08-12 20:56:34 +00:00
28c3907d69
am 35bdf149: am 7e8d6f25: am 0fd879cd: am a0372e20: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
...
* commit '35bdf149e7deeea5eebb61ebd3e64261f5eb506d':
Removing VisualizationWallpapers as it does not comply with API 23 rules
2015-08-12 20:49:10 +00:00
0fd879cd65
am a0372e20: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
...
* commit 'a0372e20a24283002c2d27b372194d88e1983a3f':
Removing VisualizationWallpapers as it does not comply with API 23 rules
2015-08-12 20:17:30 +00:00
3584355bb9
am a0372e20: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
...
* commit 'a0372e20a24283002c2d27b372194d88e1983a3f':
Removing VisualizationWallpapers as it does not comply with API 23 rules
2015-08-12 19:51:22 +00:00
a1e7e8a5f6
am 97bb3986: am e4f29f0b: am 00e15cd5: am 09baf014: am 745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
...
* commit '97bb3986f5ed7cb0adaf4fbd9a7ce5ad926d4fcf':
Revert "Include new AOSP messaging app in base builds."
2015-08-12 19:48:55 +00:00
a0372e20a2
Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
2015-08-12 19:41:54 +00:00
97bb3986f5
am e4f29f0b: am 00e15cd5: am 09baf014: am 745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
...
* commit 'e4f29f0bb76a2f581714c082270cee7964d7004e':
Revert "Include new AOSP messaging app in base builds."
2015-08-12 19:18:16 +00:00
09baf01491
am 745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
...
* commit '745d11ccd077060b5d3b0e3e53682e8c1f85dd66':
Revert "Include new AOSP messaging app in base builds."
2015-08-12 18:58:59 +00:00
5e1a991973
am 745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
...
* commit '745d11ccd077060b5d3b0e3e53682e8c1f85dd66':
Revert "Include new AOSP messaging app in base builds."
2015-08-12 18:58:54 +00:00
745d11ccd0
Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
2015-08-12 18:53:47 +00:00
018500efea
Revert "Include new AOSP messaging app in base builds."
...
This reverts commit a8b0905e16
2015-08-12 18:48:45 +00:00
c370bb53f6
am 2cd27c35: am 71fde725: am af172736: am d95990e6: am 02389bf9: Merge "Include new AOSP messaging app in base builds." into mnc-dev
...
* commit '2cd27c35b4b0c86b91e734ce79bbbe2bc67f7e22':
Include new AOSP messaging app in base builds.
2015-08-12 18:22:06 +00:00
2cd27c35b4
am 71fde725: am af172736: am d95990e6: am 02389bf9: Merge "Include new AOSP messaging app in base builds." into mnc-dev
...
* commit '71fde725b61abc637aab6be41a50353702775431':
Include new AOSP messaging app in base builds.
2015-08-12 18:16:07 +00:00
68c62e78ad
Removing VisualizationWallpapers as it does not comply with API 23 rules
...
Bug: 23021372
Change-Id: Ib985ac99bd9068c21f8a1c48e77c72426f69ea79
2015-08-12 11:11:55 -07:00
d95990e685
am 02389bf9: Merge "Include new AOSP messaging app in base builds." into mnc-dev
...
* commit '02389bf940f751ffb85c8c2187a7039f0c18dad1':
Include new AOSP messaging app in base builds.
2015-08-12 17:49:48 +00:00
5d5a3e0d90
am 02389bf9: Merge "Include new AOSP messaging app in base builds." into mnc-dev
...
* commit '02389bf940f751ffb85c8c2187a7039f0c18dad1':
Include new AOSP messaging app in base builds.
2015-08-12 17:35:04 +00:00
02389bf940
Merge "Include new AOSP messaging app in base builds." into mnc-dev
2015-08-12 17:01:24 +00:00
eef23a78b8
am 58251fe4: resolved conflicts for merge of 87eb4007 to mnc-dr-dev-plus-aosp
...
* commit '58251fe44d120b284bcdc47c3f28fbdfa6fb524d':
Increasing arm(64)? emulator partition sizes to 1.5GB
2015-08-11 23:14:09 +00:00
58251fe44d
resolved conflicts for merge of 87eb4007 to mnc-dr-dev-plus-aosp
...
Change-Id: I7cf9b0153457f9cfba93966db78e0c04b5d216aa
2015-08-11 15:41:19 -07:00
c3bc0b112c
resolved conflicts for merge of e5a63158 to mnc-dev-plus-aosp
...
Change-Id: Ifcbf55d0f4a158602867c01546f4c0f7e668697f
2015-08-11 15:06:29 -07:00
c055f9b51a
am e5a63158: Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev
...
* commit 'e5a631585a7b07c329f9ada04c99ed04b6c16b62':
Increasing arm(64)? emulator partition sizes to 1.5GB
2015-08-11 21:59:25 +00:00
a8b0905e16
Include new AOSP messaging app in base builds.
...
b/23110861
Change-Id: I365bedc809425c901982f867e671070344d1112b
2015-08-11 13:14:09 -07:00
4e0d34c7c7
Increasing arm(64)? emulator partition sizes to 1.5GB
...
Bug: 23093319
Change-Id: I5e493ef4715cee96ae6ab40d6415f5330075fad6
2015-08-11 12:53:39 -07:00
8fb75ec37d
am 35abe706: am c7e051e0: am 112f4c07: am 0150dae6: am 073f74d9: Merge "Increasing x86 emulator system partition size" into mnc-dev
...
* commit '35abe70636009dfec96a20efc9f81c5eb907c7a2':
Increasing x86 emulator system partition size
2015-08-11 19:46:26 +00:00
35abe70636
am c7e051e0: am 112f4c07: am 0150dae6: am 073f74d9: Merge "Increasing x86 emulator system partition size" into mnc-dev
...
* commit 'c7e051e0b1a7956bddcf8955ef837f2c1acff4af':
Increasing x86 emulator system partition size
2015-08-11 19:39:45 +00:00
c08c3507be
am 073f74d9: Merge "Increasing x86 emulator system partition size" into mnc-dev
...
* commit '073f74d90853b39de32308fa3eeab9aa8998bd69':
Increasing x86 emulator system partition size
2015-08-11 19:18:43 +00:00
0150dae615
am 073f74d9: Merge "Increasing x86 emulator system partition size" into mnc-dev
...
* commit '073f74d90853b39de32308fa3eeab9aa8998bd69':
Increasing x86 emulator system partition size
2015-08-11 19:18:13 +00:00
5394e8bd12
Increasing x86 emulator system partition size
...
Seems sdk_google_phone_x86 is building larger than 750MB
Bug: 23093319
Change-Id: Ib3ddbbb96a9dcea02eb6da7362ac0142bdfae4de
2015-08-11 03:39:34 +00:00
16853a6c35
am 5620d94c: am 449b8a06: am c4904316: am ffe86de5: Merge "vboot_signer: Add kernel subkey required for signing kernel keyblock" into mnc-dr-dev
...
* commit '5620d94c5fd5a249f1805ca7acd5fe22930ddef4':
vboot_signer: Add kernel subkey required for signing kernel keyblock
2015-08-10 12:59:13 +00:00
5620d94c5f
am 449b8a06: am c4904316: am ffe86de5: Merge "vboot_signer: Add kernel subkey required for signing kernel keyblock" into mnc-dr-dev
...
* commit '449b8a0664db86e9a556c323e3f4720303abae95':
vboot_signer: Add kernel subkey required for signing kernel keyblock
2015-08-10 12:53:56 +00:00
e8c212235f
vboot_signer: Add kernel subkey required for signing kernel keyblock
...
Currently, the keyblock was being generated using
data_key.vbprivk. However, we need to use kernel_subkey.vbprivk for
kernel keyblock generation. This did not create any issues until now
because dev-mode just throws a message saying that keyblock is
invalid. But, normal-mode does not boot if keyblock is
invalid. Add extra parameter for passing in kernel subkey to
vboot_signer script.
TEST="make bootimage-nodeps" generates correctly signed
boot.img. Verified that the image boots fine in normal mode.
Change-Id: I0fc2183b466e34ddf1d98c9532072548504fcec4
Signed-off-by: Furquan Shaikh <furquan@google.com>
2015-08-07 12:01:20 -07:00
315890973d
Remove mention of EXTENDED_FONT_FOOTPRINT.
...
This has been a null operation for a while, as devices are on the
extended font footprint by default.
Bug: 21785576
Change-Id: I884752876fa529b9ff29b14d08b0e9e618fa7348
2015-08-06 16:45:30 -07:00
ae61c885c6
am 450c53ac: am fa977ff3: am 09185f5a: Merge "Replace Browser with Browser2 and BookmarkProvider"
...
* commit '450c53ace6a8c61f0fdf2058307b5e04db617f49':
Replace Browser with Browser2 and BookmarkProvider
2015-08-04 23:43:29 +00:00
450c53ace6
am fa977ff3: am 09185f5a: Merge "Replace Browser with Browser2 and BookmarkProvider"
...
* commit 'fa977ff366f54c6ae244f3ba99e3481f7d29796d':
Replace Browser with Browser2 and BookmarkProvider
2015-08-04 23:35:33 +00:00
15a45a6ea7
am fa977ff3: am 09185f5a: Merge "Replace Browser with Browser2 and BookmarkProvider"
...
* commit 'fa977ff366f54c6ae244f3ba99e3481f7d29796d':
Replace Browser with Browser2 and BookmarkProvider
2015-08-04 23:35:29 +00:00
d3a803e668
build: switch over to file_contexts.bin only
...
Change all uses of the file_contexts file to use the
file_contexts.bin file instead.
Depends on
I75a781100082c23536f70ce3603f7de42408b5ba
I43806d564b83d57f05f5c36c8eba7b1ff4831b04
Id560d093440a2aba99cef28c20133b35feebf950
I15660f4b3e4c5cb8ae0ec1498c74d6fcbb9a0400
Change-Id: Iaf8c4b2e420f610425a07f48db7af32bda3f5b3a
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-08-04 14:59:06 -04:00
a65637d230
Update embedded.mk to support file_contexts.bin
...
This change supports external/libselinux changes to implement
a PCRE formatted binary file_contexts file.
Change-Id: I75a781100082c23536f70ce3603f7de42408b5ba
Signed-off-by: Richard Haines <richard_c_haines@btinternet.com>
2015-08-04 14:53:12 -04:00
4271a9b3ed
Replace Browser with Browser2 and BookmarkProvider
...
Browser is going away. Browser2 is a tiny, WebView-based browser for
testing purposes. BookmarkProvider will take over the
"com.android.browser;browser" authorities and return empty Cursors for
all queries. See packages/apps/Browser2/README for how to obtain a
regular browser.
BUG:19351071
Change-Id: I8af605ec65a1185923598ba553a98e3fd9b887db
2015-07-30 18:12:21 -07:00
3c133ddcdf
am 4cdbb26c: am 86162e64: am b1c0a86f: Merge "Bump generic_arm64 system partition size to 1200 MB."
...
* commit '4cdbb26ca2c0174c6846e1a8a9cf624390c616e9':
Bump generic_arm64 system partition size to 1200 MB.
2015-07-27 19:31:22 +00:00
4cdbb26ca2
am 86162e64: am b1c0a86f: Merge "Bump generic_arm64 system partition size to 1200 MB."
...
* commit '86162e6439e8035494b187efbf138d9cabae92fb':
Bump generic_arm64 system partition size to 1200 MB.
2015-07-27 19:19:15 +00:00
9e7d6d152b
am 86162e64: am b1c0a86f: Merge "Bump generic_arm64 system partition size to 1200 MB."
...
* commit '86162e6439e8035494b187efbf138d9cabae92fb':
Bump generic_arm64 system partition size to 1200 MB.
2015-07-27 19:17:51 +00:00
97ba885a7b
Bump generic_arm64 system partition size to 1200 MB.
...
Change-Id: I31740673829e578d7fc0edd895868bf1f21cfe15
2015-07-27 11:01:50 -07:00
33ca9db5c5
am 17ca1f5d: am 4a5f5a7b: am a972891f: Merge "file_contexts: Label /dev/ttyS2 as console_device"
...
* commit '17ca1f5d26aebd25fa89e86082d2fe423174aeae':
file_contexts: Label /dev/ttyS2 as console_device
2015-07-16 19:35:23 +00:00
17ca1f5d26
am 4a5f5a7b: am a972891f: Merge "file_contexts: Label /dev/ttyS2 as console_device"
...
* commit '4a5f5a7b15e27ed159e2398c77de1de7f9fd4da9':
file_contexts: Label /dev/ttyS2 as console_device
2015-07-16 19:19:56 +00:00
385457dc31
am 4a5f5a7b: am a972891f: Merge "file_contexts: Label /dev/ttyS2 as console_device"
...
* commit '4a5f5a7b15e27ed159e2398c77de1de7f9fd4da9':
file_contexts: Label /dev/ttyS2 as console_device
2015-07-16 19:19:20 +00:00
df2620ada4
file_contexts: Label /dev/ttyS2 as console_device
...
This fixes the issue with the emulator "-shell" option.
Init tries to open the console which is passed through
the kernel androidboot.console property, but fails to
open it because "avc" denies it. Init only has permissions
to open console_device in rw mode. This ensures that
/dev/ttyS2 is properly labeled as console_device.
Replaced tabs with spaces.
Change-Id: I9ef94576799bb724fc22f6be54f12de10ed56768
2015-07-16 20:36:07 +02:00
e821d139ce
am 460a5abb: am 70198185: Merge "Build "secdiscard" for securely discarding data from flash devices." into mnc-dr-dev
...
* commit '460a5abbee35836f152a9be2fe11664e7bfa5432':
Build "secdiscard" for securely discarding data from flash devices.
2015-07-14 00:02:42 +00:00
7019818511
Merge "Build "secdiscard" for securely discarding data from flash devices." into mnc-dr-dev
2015-07-13 20:54:43 +00:00
Chien-Yu Chen