Commit graph

1613 commits

Author SHA1 Message Date
bohu
6b7006a3bf Revert "emulator.mk: Add ethernet permission"
ranchu device now has gsm working properly, remove ethernet.

This reverts commit 9dcb26902571b6d8aa1a41e28be6fb87fd483425.
(cherry picked from commit 58d066f7ccb65cc1f2fc69aff5e95fbfc7f5f0f7)

Change-Id: I05ced00f7e24cb2af6654fc38d71d63453ce4944
2016-02-19 01:48:20 +00:00
Chaoren Lin
72fb84651d emulator: Include the ranchu gps library
Change-Id: I45b8bec7739b42744766852b68580b01b4ce26a0
(cherry picked from commit b8b6638dd0183c68e12ed88f1a4cbdce84c09a15)
2016-02-19 00:53:54 +00:00
Lingfeng Yang
aae222f5f7 Add camera.ranchu.* to target/product/emulator.mk
This is for QEMU2 camera support in
the new emulator.

Change-Id: I036773719eff97619594e9d9ac161c10b5e218b5
(cherry picked from commit 6a3bbdce10aae72727d97ab09d90c967cfd51b9c)
2016-02-17 13:23:54 -08:00
Jeff Tinker
1fefb8270e Add mediadrm service
Part of media security hardening

This is an intermediate step toward moving
mediadrm to a new service separate from mediaserver.
This first step allows mediadrmservice to run based
on the system property media.mediadrmservice.enable
so it can be selectively enabled on devices that
support using native_handles for secure buffers.

bug: 22990512
Change-Id: I9fecb59158d560201f64721cdc026f5604cc3945
2016-02-12 09:00:49 -08:00
Marco Nelissen
2a88eb3be2 Add mediacodec binary for codec process
Bug: 22775369

Change-Id: If8087fd289968a6eb09a7f038243447ade5dd9d3
2016-02-08 13:28:28 -08:00
Mathieu Chartier
bdc048ecb5 Merge "Add default app image format property" 2016-02-03 22:14:14 +00:00
Maria Garcia Puyol
cda68f4ecb Merge "Add EmergencyInfo to devices with telephony" 2016-02-02 17:10:34 +00:00
mariagpuyol
b44b3cc890 Add EmergencyInfo to devices with telephony
Change-Id: Ied881184ac67a0f72c896e3225f3bf3faa5af4c4
2016-01-29 11:26:54 -08:00
Mathieu Chartier
b7a044e10a Add default app image format property
Defaults to lz4.

Bug: 22858531
Change-Id: Iab65a650b67e7bde1fc3582f166d4f17a0367749
2016-01-28 16:52:14 -08:00
Marco Nelissen
71d28206b3 Merge "Revert "Add mediacodec binary for codec process"" 2016-01-28 21:55:42 +00:00
Marco Nelissen
4fb65b332b Revert "Add mediacodec binary for codec process"
This reverts commit 3402a41879.

Change-Id: Id97fe54862a6450ff9313dabab542a00f8578fdd
2016-01-28 21:41:43 +00:00
Chien-Yu Chen
30037e0ef6 Merge "Add cameraserver process" 2016-01-28 02:04:35 +00:00
Jesse Hall
311fc185c8 Merge "Add libvulkan to base PRODUCT_PACKAGES" 2016-01-27 21:43:44 +00:00
Marco Nelissen
9516cf18a3 Merge "Add mediacodec binary for codec process" 2016-01-27 17:46:47 +00:00
Jesse Hall
a7ec71d62b Add libvulkan to base PRODUCT_PACKAGES
Change-Id: Ie0d583a349a6ef5542da91e5c1f1f348f02fe435
2016-01-27 00:20:35 -08:00
Yin-Chia Yeh
39f1d88038 Merge "Revert "Revert "Camera: add NDK camera library""" 2016-01-27 00:14:43 +00:00
Yin-Chia Yeh
821375c718 Revert "Revert "Camera: add NDK camera library""
This reverts commit e4329eb24f.

Change-Id: I414845a9e12148499db46a2c1b083d65175dea09
2016-01-27 00:13:51 +00:00
Kevin Cernekee
27498f2e39 Merge "README: Update docs" am: 30177c45b4
am: 753536092c

* commit '753536092c2cde7e959bdcaef9c45207351e9a18':
  README: Update docs
2016-01-26 23:53:34 +00:00
Kevin Cernekee
753536092c Merge "README: Update docs"
am: 30177c45b4

* commit '30177c45b4e61ae11749bf9106c64d1b1e2ae517':
  README: Update docs
2016-01-26 23:51:39 +00:00
Kevin Cernekee
30177c45b4 Merge "README: Update docs" 2016-01-26 23:45:37 +00:00
Yin-Chia Yeh
6f138d7eac Merge "Revert "Camera: add NDK camera library"" 2016-01-26 23:44:15 +00:00
Yin-Chia Yeh
e4329eb24f Revert "Camera: add NDK camera library"
This reverts commit 153005787d.

Breaking seed/andromeda build now. Investigating.

Change-Id: Id0884cc8b126694c9142d7771dc2187b10fdd415
2016-01-26 23:42:43 +00:00
Yin-Chia Yeh
c6eedaff72 Merge "Camera: add NDK camera library" 2016-01-26 22:30:08 +00:00
Yin-Chia Yeh
153005787d Camera: add NDK camera library
Bug: 23012001
Change-Id: I19b9d4c7a83f3baaf5e6102c5f0b7876546fe95d
2016-01-25 14:48:10 -08:00
Christopher Ferris
07b0a0da9f Merge "Add libc_malloc_debug to the always build list." am: 4d15f2f8c9
am: 093ca195bd

* commit '093ca195bd6a3e21c11ad04553b3fe5c6447ea97':
  Add libc_malloc_debug to the always build list.
2016-01-25 21:33:46 +00:00
Christopher Ferris
093ca195bd Merge "Add libc_malloc_debug to the always build list."
am: 4d15f2f8c9

* commit '4d15f2f8c9adc463c6e904667b9793a3f3544ef4':
  Add libc_malloc_debug to the always build list.
2016-01-25 21:31:54 +00:00
Christopher Ferris
4d15f2f8c9 Merge "Add libc_malloc_debug to the always build list." 2016-01-25 21:27:57 +00:00
Marco Nelissen
3402a41879 Add mediacodec binary for codec process
Bug: 22775369
Change-Id: Ia0632d8329cf16c6435df87bf208e2750bb31542
2016-01-22 14:43:13 -08:00
Alex Klyubin
24b1c64c5b resolve merge conflicts of bb3d77ba95 to master.
Change-Id: Ib69e2a457c416b4da94fb76c231120632d47a07a
2016-01-22 11:05:03 -08:00
James Hawkins
bb3d77ba95 Merge "bootstat: Add bootstat to the embedded target to support logging boot time across devices."
am: cb9da42c87

* commit 'cb9da42c878f5afb32513b441eaf72868163b655':
  bootstat: Add bootstat to the embedded target to support logging boot time across devices.
2016-01-22 18:28:19 +00:00
James Hawkins
bc5dc64232 bootstat: Add bootstat to the embedded target to support logging boot
time across devices.

Bug: 21724738
Change-Id: I165e8597103ea235a0826e321a1658823c4b4664
2016-01-21 15:39:45 -08:00
Calin Juravle
388bae1ca3 Merge "Enable the use of jit profiles" 2016-01-20 22:31:37 +00:00
Makoto Onuki
00003c38b3 Add BlockedNumberProvider to core.mk
Bug 26232372

Change-Id: I4e77588587d75dcb110caef8d76b64bb396ca052
2016-01-14 11:31:27 -08:00
Andy Huang
b7da60c2fa Merge "remove Exchange2 from core.mk" into mnc-dr1.5-dev am: 0936632c93 am: 624ecb988b
am: 400d9ff4ba

* commit '400d9ff4ba0a606d5bf1f7c29cb2d61f3de4b4cc':
  remove Exchange2 from core.mk
2016-01-13 23:42:59 +00:00
Andy Huang
400d9ff4ba Merge "remove Exchange2 from core.mk" into mnc-dr1.5-dev am: 0936632c93
am: 624ecb988b

* commit '624ecb988b037a4eee46d06b3618bee1e5d2b9cb':
  remove Exchange2 from core.mk
2016-01-13 21:28:07 +00:00
Calin Juravle
910581eee5 Enable the use of jit profiles
Effects:
- JIT profiles will be saved to disk
- dex2oat daemon will perform profile based compilation

Bug: 26080105
Change-Id: I284106b205ccf26630a8b86923d1219e121c29c2
2016-01-12 16:47:47 -08:00
Jim Kaye
206fb06c2c Emulator: Have the Settings page say "About emulated device"
The Settings page for a real device says "About phone" or
"About tablet". This text is selected at build time, so the
Emulator cannot get the Sytem to choose correctly at launch time.

Our solution is to say "About emulated device" for all types
of virtual devices.

Change-Id: Ia52c20b794f76230f5b73694fb193c18b173c329
2016-01-11 23:41:34 +00:00
Narayan Kamath
0abf9152fc Merge "Remove libsqlite_jni from all product configs." am: 4203ee20f1
am: 3eb6d15e6f

* commit '3eb6d15e6f207391f574fa0259e51e3deb391248':
  Remove libsqlite_jni from all product configs.
2016-01-11 11:45:56 +00:00
Narayan Kamath
3eb6d15e6f Merge "Remove libsqlite_jni from all product configs."
am: 4203ee20f1

* commit '4203ee20f13b1dd3ec9100f5045c19541f70da33':
  Remove libsqlite_jni from all product configs.
2016-01-11 11:43:46 +00:00
Narayan Kamath
58408f645a Remove libsqlite_jni from all product configs.
It's only used by libcore tests so there's no need to ship it on
all products.

bug: 26457850
Change-Id: I907f781d215e94e1cbf554d81fda9e6eed07a4de
2016-01-08 11:02:36 +00:00
Chien-Yu Chen
e677b1af96 Add cameraserver process
Bug: 24511454
Change-Id: Ieac05311b3e5deb10c4b255d22ba699dc3cb6a4e
2016-01-05 15:06:52 -08:00
Narayan Kamath
45ae4eb8a2 Merge changes from topic \'aosp-merge-24-12\'
am: 8b9589216d

* commit '8b9589216dd8c2a644dab9623952b5fd8a32e550':
  Temporary workaround to build bouncycastle / nist-pkits
  Build: Build changes for multi oat/image support.
  Allow modules to override the default NOTICE file.
  Track introduction of libopenjdkjvm.
  Allow for 5200 words in dump-words-to-file
  Update the package whitelist for the boot image.
  Use core-oj alongside core-libart wherever required.
2015-12-24 12:04:50 +00:00
Narayan Kamath
fa257cc709 Track introduction of libopenjdkjvm.
(cherry picked from commit 2eb52037e8)

Change-Id: Ib8683d7e628ae4b09f359ecedc93f77199205cef
2015-12-24 10:10:55 +00:00
Piotr Jastrzebski
052a00f64e 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.

(cherry picked from commit 89b94c827f)

Change-Id: I025c0adc70535bf23def3ab0ce28a1bfaef72514
2015-12-24 10:10:55 +00:00
Jack Yu
ac978e48eb Merge "Included CellBroadcastReceiver app to the image." 2015-12-22 23:49:03 +00:00
Jack Yu
17aa86c69e Included CellBroadcastReceiver app to the image.
Included CellBroadcastReceiver app to the image.

bug: 26290349
Change-Id: Icb39909ac2c9f751ad95a28f411b84a0d787ac0d
2015-12-21 11:16:48 -08:00
Narayan Kamath
2eb52037e8 Track introduction of libopenjdkjvm.
Change-Id: Ibb0e64b81cb033764a865be1f05be5f3334feaa5
2015-12-18 12:34:45 +00:00
Christopher Ferris
ccaeb65d8e Add libc_malloc_debug to the always build list.
Change-Id: I26e553478b5ef4017aea1e06530931d4b18e308b
2015-12-17 15:15:32 -08:00
Andy Hung
04aa83cfb4 Merge "Add audioserver executable to base config" 2015-12-11 20:08:51 +00:00
Andy Huang
6019adf259 remove Exchange2 from core.mk
Change-Id: I962d706d19eef5bbde3abed516d0a674ba50c1c1
2015-12-09 12:21:49 -08:00
Dimitry Ivanov
4a1db8a2a1 Merge "Include libGLESv3.so to PRODUCT_PACKAGES" am: 73661d4220 am: 973decf35c
am: fb70c580b1

* commit 'fb70c580b1497a31ff345b36f032241fa55415b2':
  Include libGLESv3.so to PRODUCT_PACKAGES
2015-12-08 03:04:34 +00:00
Dimitry Ivanov
fb70c580b1 Merge "Include libGLESv3.so to PRODUCT_PACKAGES" am: 73661d4220
am: 973decf35c

* commit '973decf35c2592d6ab9ab5ad9e94e36cd61e0c16':
  Include libGLESv3.so to PRODUCT_PACKAGES
2015-12-08 03:01:12 +00:00
Chien-Yu Chen
3ee276a009 Merge "Copy video stop sound" 2015-11-30 21:47:55 +00:00
Vince Harron
7bb7263600 Shorten TARGET_BRAND from generic_<arch> to Android am: 5806531f92 am: e13b13c7f6 am: aba12deedb
am: 6fe5ec0db2

* commit '6fe5ec0db2ba95d793361399d037d89a684cffb6':
  Shorten TARGET_BRAND from generic_<arch> to Android
2015-11-24 23:01:15 +00:00
Vince Harron
6fe5ec0db2 Shorten TARGET_BRAND from generic_<arch> to Android am: 5806531f92 am: e13b13c7f6
am: aba12deedb

* commit 'aba12deedb9cdcf8ef01952de1cc51057d8d2bf7':
  Shorten TARGET_BRAND from generic_<arch> to Android
2015-11-24 22:57:53 +00:00
Vince Harron
5806531f92 Shorten TARGET_BRAND from generic_<arch> to Android
Switching to userdebug emulator images increased ro.build.fingerprint
Past the 91 character limit.  This should bring the build server
builds under this limit.

Fixing it for local builds will be a bit more difficult.

Bug: 25829506

Change-Id: I7daee3478716adcb860cced1b770a2d00a72f1a2
(cherry picked from commit efbeab78d3581009b3da20991a3a83d733393f45)
2015-11-24 18:51:59 +00:00
Chien-Yu Chen
05f47b74f3 Copy video stop sound
Bug: 25652382
Change-Id: I72b922a0b3308270a4211700bda7321e1f215c47
2015-11-20 14:00:57 -08:00
Piotr Jastrzebski
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
Daichi Hirono
3b4f90cfab Merge "Include MtpDocumentsProvider in the system image." 2015-11-18 23:38:20 +00:00
Dmitriy Ivanov
bb16dcf28e Include libGLESv3.so to PRODUCT_PACKAGES
Bug: http://b/25754041
Change-Id: If5f5030e7e1da037d873f0252dd8beb8ce6fd4db
2015-11-18 15:30:57 -08:00
Ying Wang
14a5e8670d Merge "Remove unnecessary inheritance layer between aliases." am: 2f05af74bc am: 10021ac19d
am: 1f5de04af7

* commit '1f5de04af7ac7e8b4250dd4fa4bf7c7d8f2f110b':
  Remove unnecessary inheritance layer between aliases.
2015-11-18 17:52:32 +00:00
Daichi Hirono
90bf437e7c Include MtpDocumentsProvider in the system image.
BUG=25731385

Change-Id: I9fa90a5c4a0bca3ab7d36968b1e3b40d60d55d31
2015-11-18 13:00:40 +09:00
Ying Wang
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
Nicolas Geoffray
56a84e1b6c Make jit the default for all builds.
Change-Id: Ifa4280cdab0747cae8d3e2becec47b230846def6
2015-11-05 18:02:13 +00:00
Andy Hung
afcf77f54b Add audioserver executable to base config
Bug: 24511453
Change-Id: Ic6575fc8f5a4ab1a75854dc488021d7d06fa1e97
2015-10-30 13:11:30 -07:00
Marco Nelissen
469a926e7f Add extractorservice executable to base config
Change-Id: I0ffbe183decfd76be681e08b8627c3d789c4b916
2015-10-27 10:28:00 -07:00
Sami Tolvanen
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
Sami Tolvanen
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
Sami Tolvanen
87f582611a Merge "Error correction: Append codes to verified partitions" 2015-10-19 09:49:18 +00:00
Ying Wang
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
Ying Wang
5eb1f1fbf1 am f1b066b5: Merge "Remove duplicate local_time.default"
* commit 'f1b066b5ce3ebec905cb38dbb48a77dc58d4c457':
  Remove duplicate local_time.default
2015-10-15 18:39:45 +00:00
Ying Wang
f1b066b5ce Merge "Remove duplicate local_time.default" 2015-10-15 18:35:26 +00:00
Sami Tolvanen
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
Sami Tolvanen
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
Sami Tolvanen
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
Hans Boehm
8638de1f6f am ab4d8594: Switch from Calculator to ExactCalculator
* commit 'ab4d8594591b715934d7a1106d5284e9721070ba':
  Switch from Calculator to ExactCalculator
2015-10-13 03:49:41 +00:00
Hans Boehm
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 (ag/748830).

Change-Id: I6c0acef640e62f8a70b7b2832b7eea662a0d301b
2015-10-12 17:08:04 -07:00
Dianne Hackborn
30c197eeaf Include the new "cmd" command-line tool in all Android builds.
Change-Id: I93f415ddde0f4e273be04af3379ee706962416d2
2015-10-12 10:39:04 -07:00
Chih-Wei Huang
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)

Change-Id: I09dcdffc14de08b3d25a5fd08364d38b2712bb08
2015-10-08 15:07:23 +08:00
Ying Wang
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
Ying Wang
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
Ying Wang
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
David Turner
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
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
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
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
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
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
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
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
Sami Tolvanen
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
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
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
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