David Turner
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
David Turner
6af936361b
am c6444855: Merge "GPU: add gralloc.ranchu library"
...
* commit 'c64448550a5148489346f7ba3ac0a686b32dbc26':
GPU: add gralloc.ranchu library
2015-09-25 17:06:22 +00:00
David Turner
c64448550a
Merge "GPU: add gralloc.ranchu library"
2015-09-25 16:59:31 +00:00
Miroslav Tisma
173615ddee
GPU: add gralloc.ranchu library
...
Change-Id: I76b21f67e081d82ec76242c051569f32b2b6b638
2015-09-24 21:04:24 +02:00
Stephen Hines
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
Stephen Hines
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
Stephen Hines
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
Bo Hu
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
Bo Hu
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
bohu
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
Tom Cherry
844079e0f2
resolved conflicts for merge of b8b53534 to mnc-dr-dev-plus-aosp
...
Change-Id: I72caaa4aaf9ec78abb83e9d9b3ced535ab3f7c04
2015-09-03 15:20:51 -07:00
Tom Cherry
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
Tom Cherry
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
Badhri Jagan Sridharan
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
Badhri Jagan Sridharan
a8a4a93733
Include init.usb.configfs.rc into rootdir
...
Bug=23633457
Change-Id: I26bbc5ff597138b2ccac1de72117753739b31554
2015-09-01 22:43:42 +00:00
Richard Uhler
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
Richard Uhler
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
Richard Uhler
7324f30a4f
Add ahat to runtime_libart product.
...
Change-Id: Iae5837f884c926a9f0e57df56bd21b6260ee8b2d
2015-08-28 16:30:17 -07:00
Nick Kralevich
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
Nick Kralevich
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
Stephen Smalley
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
Konstantinos Menychtas
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
Konstantinos Menychtas
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
Konstantinos Menychtas
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
Konstantinos Menychtas
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
Justin Klaassen
45249ff5d1
Revert "Revert "Switch from Calculator to ExactCalculator""
...
This reverts commit 455ffaafcd
2015-08-13 19:22:06 +00:00
Justin Klaassen
53c5891460
Revert "Revert "Switch from Calculator to ExactCalculator""
...
This reverts commit 455ffaafcd
2015-08-13 12:19:38 -07:00
Mike Dodd
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
Mike Dodd
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
Mike Dodd
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
Nick Kralevich
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
Nick Kralevich
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
Nick Kralevich
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
Mike Dodd
f29b5bd380
Include new AOSP messaging app in base AOSP telephony builds.
...
b/23110861
Change-Id: I31ba32f3341c77ba6eb083a189dffa1a08c6c8d4
2015-08-12 15:44:04 -07:00
Ian Pedowitz
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
Ian Pedowitz
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
Ian Pedowitz
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
Ian Pedowitz
a0372e20a2
Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
2015-08-12 19:41:54 +00:00
Mike Dodd
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
Mike Dodd
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
Mike Dodd
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
Mike Dodd
745d11ccd0
Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
2015-08-12 18:53:47 +00:00
Mike Dodd
018500efea
Revert "Include new AOSP messaging app in base builds."
...
This reverts commit a8b0905e16
2015-08-12 18:48:45 +00:00
Mike Dodd
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
Ian Pedowitz
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
Mike Dodd
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
Mike Dodd
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
Mike Dodd
02389bf940
Merge "Include new AOSP messaging app in base builds." into mnc-dev
2015-08-12 17:01:24 +00:00
Ian Pedowitz
58251fe44d
resolved conflicts for merge of 87eb4007 to mnc-dr-dev-plus-aosp
...
Change-Id: I7cf9b0153457f9cfba93966db78e0c04b5d216aa
2015-08-11 15:41:19 -07:00
Ian Pedowitz
c3bc0b112c
resolved conflicts for merge of e5a63158 to mnc-dev-plus-aosp
...
Change-Id: Ifcbf55d0f4a158602867c01546f4c0f7e668697f
2015-08-11 15:06:29 -07:00
