Commit Graph

1745 Commits

Author SHA1 Message Date
Maurice Lam 285ea2188d Merge "Add be and bs to l10n builds" into nyc-dev
am: e09b2c1

* commit 'e09b2c16e32cee89d6b5ac29fe5a905b76872179':
  Add be and bs to l10n builds

Change-Id: I4dc1d353dd5a3d0ed3f4c0f9dc2192421946d87a
2016-04-11 21:54:51 +00:00
Maurice Lam e09b2c16e3 Merge "Add be and bs to l10n builds" into nyc-dev 2016-04-11 21:35:46 +00:00
Svetoslav Ganov 07f509784c Merge "Add ext libs to AOSP - they are part of the system" into nyc-dev
am: 048faf9

* commit '048faf920cde39ccb97a0bd937362860199295b6':
  Add ext libs to AOSP - they are part of the system

Change-Id: Iddadf028161702bb7199d47165fbb189bebe22f8
2016-04-07 23:48:12 +00:00
Svetoslav Ganov 8ead371831 Add ext libs to AOSP - they are part of the system
bug:27698377

Change-Id: Ic426e08e450598c53e4dbf9c734d808b19fae705
2016-04-07 15:29:58 -07:00
Maurice Lam cc06c5998a Add be and bs to l10n builds
Bug: 27409618
Change-Id: I244796a12d756521f8191abcacf1f15134079783
2016-04-01 12:08:05 -07:00
Philip P. Moltmann 3d25656b2e Merge "Add PrintServiceRecommendationService to the default distro" into nyc-dev
am: 8690de4

* commit '8690de4302cb231668def658a1e3b1bfe30eacda':
  Add PrintServiceRecommendationService to the default distro

Change-Id: I3b2a8bf61507ce0eb93deb736078501478765505
2016-03-31 02:10:43 +00:00
Philip P. Moltmann 8690de4302 Merge "Add PrintServiceRecommendationService to the default distro" into nyc-dev 2016-03-31 01:33:17 +00:00
Andreas Gampe 9b69d2bda7 Merge "Build: Switch eng build boot dexopt to verify-at-runtime" into nyc-dev
am: be97a41

* commit 'be97a415715824562e4ea93efb211b0d5baeb300':
  Build: Switch eng build boot dexopt to verify-at-runtime

Change-Id: I9b0f42aa72fe33fac9f8afee90820bab02b2729b
2016-03-30 23:18:12 +00:00
Andreas Gampe 8e121663e6 Build: Switch eng build boot dexopt to verify-at-runtime
To have faster turnaround.

Bug: 26794212
Change-Id: I1d7877ec8c9cfff62bf14cbd23a790ee7a0b2734
2016-03-30 12:55:53 -07:00
Philip P. Moltmann 85ec6296c1 Add PrintServiceRecommendationService to the default distro
Bug: 24533249
Change-Id: I0736b842c813c63924d026b2ab5d5e92ff92df76
2016-03-28 15:15:56 -07:00
Andreas Gampe 6cbc22cbec Build: Add first-boot dexopt settings defaults
am: b9171a3

* commit 'b9171a320680a85f4302c9cdfc2b2f54516f9c3f':
  Build: Add first-boot dexopt settings defaults
2016-03-28 03:14:52 +00:00
Andreas Gampe b9171a3206 Build: Add first-boot dexopt settings defaults
Needed for factory-reset/first-boot/upgrade to N.

Bug: 27689078
Change-Id: I010e38c8a10445f87e95e1ff8d9daf1d051f2b06
2016-03-25 18:08:40 -07:00
Joe Onorato 978cda07ee Merge "Set WifiHAL to only log debug by default." into nyc-dev
am: 11a4a85

* commit '11a4a85b75557dd0d0ae9ef84720316036d7c8d8':
  Set WifiHAL to only log debug by default.
2016-03-26 00:45:18 +00:00
Joe Onorato f83213a5b5 Set WifiHAL to only log debug by default.
This is not the proper way to really fix this, but it is the best thing to
do in the time period we have for N.  In the future they will be moving
more to a dumpsys style approach.

Change-Id: I98ec7928cd93a3edfb93cdbf3703132ac6658699
2016-03-25 15:36:42 -07:00
Ying Wang 77f67cd048 Merge "Support x86+arm multilib build."
am: d314805

* commit 'd314805c29fdbee3508b99c14ca63e1a8d170c3b':
  Support x86+arm multilib build.
2016-03-25 21:51:21 +00:00
Ying Wang 87538e4f8b Support x86+arm multilib build.
Support TARGET_2ND_ARCH as the binary translation arch.
See target/board/generic_x86_arm/BoardConfig.mk and
target/product/aosp_x86_arm.mk as example for the setup.

In BoardConfig, use the TARGET_2ND_ARCH/etc. variables to set up the
binary translation arch;
Set "TARGET_TRANSLATE_2ND_ARCH := true" to tell the build system it's
not a typical 64-bit multilib configuration.
In product makefile, use "PRODUCT_PACKAGES += libfoo_<2nd_arch>" to
install the TARGET_2ND_ARCH libraries. This also pulls in any dependency
libraries.
By default we don't install any TARGET_2ND_ARCH modules, unless it's
pulled in by PRODUCT_PACKAGES.

Bug: 27526885
Change-Id: I0578e9c80da0532d2fa886a8fcdb140bbc703009
(cherry-pick from commit 277e75a488)
2016-03-25 13:29:53 -07:00
Andreas Gampe 0647bcb8e5 Build: Provide default values for dexopt settings
Provide default values for system properties used by the package
manager.

Bug: 27689078
Change-Id: Iedab0c0b1da6c905658546df7992f77fd6b55da1
2016-03-23 15:04:36 -07:00
Pierre Imai 0040280747 Remove references to deleted dhcpcd
Change-Id: Ic977c3aaa72544310696b970e73c64401aafbbc8
2016-03-18 10:18:50 +09:00
Dimitry Ivanov 19946aef6a Add config file listing public native libraries
This file contains list of libraries that should be directly or
indirectly accessible to apps for the platform. Note that this
file is not device specific but rather device class specific.

Bug: http://b/27546414
Change-Id: Ica2e6c5cedac6e4af9bd78addaa512b2fa272d64
(cherry picked from commit 795132dccd)
2016-03-17 11:22:06 -07:00
Dimitry Ivanov 795132dccd Add config file listing public native libraries
This file contains list of libraries that should be directly or
indirectly accessible to apps for the platform. Note that this
file is not device specific but rather device class specific.

Bug: http://b/27546414
Change-Id: Ica2e6c5cedac6e4af9bd78addaa512b2fa272d64
2016-03-16 15:07:19 -07:00
Prathmesh Prabhu 8f8c9cbd47 emulator: Add a product packages overlay.
Emulator is a product, so add an overlay that allows us to override some
stock android resources.

BUG: 27484734
Change-Id: I1b651316a14f6d5c79651813ad13302b67507cae
2016-03-04 13:43:04 -08:00
Prathmesh Prabhu 98afd8ab2a [Emulator] Add comment about including AOSP messaging on AOSP images.
We've gone back and forth on this a few times.
Just state clearly why we're including the AOSP messaging APP here.

BUG:22097835
Change-Id: I26864ba033f0a211d038fa3526241c869d677217
2016-02-26 19:26:05 +00:00
Lorenzo Colitti a8f699a6a2 Remove dhcpcd from the base target makefile.
Bug: 27192644
Change-Id: Iacac58e05c441dd267c7f09f91dbfcb94f54167c
2016-02-26 10:02:32 +09:00
bohu 08ddb47165 Emulator: Add fingerprint permission to sdk system images
Since N, the android.hardware.fingerprint.xml is required.
bug: 27324642

Change-Id: Ib2f77f68bb4b9a68e1e77311fae3ce2a30bc37cb
2016-02-23 16:28:26 -08:00
Calin Juravle 3d0d0aebba Merge "Add profman to the build scripts"
am: 487479f301

* commit '487479f301e49e8955d0930c760b739507f76ddc':
  Add profman to the build scripts
2016-02-23 14:11:56 +00:00
Calin Juravle c9e3d16fdb Add profman to the build scripts
Bug: 26719109
Bug: 26563023

(cherry picked from commit aab43390a0)

Change-Id: Idc49872eebb283436fcdd02fe095e8c8826aff44
2016-02-23 12:02:05 +00:00
Calin Juravle 5d598c12fe Merge "Add profman to the build scripts" into nyc-dev 2016-02-22 11:42:02 +00:00
Prathmesh Prabhu 61ec9aed12 Merge "Allow smooth upgrade of AVD's from older API's." into nyc-dev 2016-02-20 01:02:03 +00:00
Lingfeng Yang ae74914ed9 Allow smooth upgrade of AVD's from older API's.
If we are using an old API for the emulator
(API 19 for example) and then upgrade the AVD
to API 23 through the AVD settings, we get a bunch
of crashes in the TelephonyProvider,
as it is looking for a file that does not exist
that concerns upgrading from old "apn"'s.

This CL adds this file to the files to be copied
to /etc in the system image.

BUG: b.android.com/200390
BUG=27273457

RELEASE NOTE: Fixed telephony service crashes on startup when upgrading from an old API.

Change-Id: I227713880bf20541c759aab588c00197ac7aebfd
(cherry picked from commit e5083159401edf1df5109b56d1aedbbb739584e6)
2016-02-20 00:34:21 +00:00
Bjoern Johansson d2cd53a41b Explicitly use messaging app in SDK phone builds
This change explicitly includes only the messaging app instead of all of
aosp_base_telephony. This fixes the issue where on initial boot the user
was prompted to select a Home app. This happened because the
aosp_base_telephony makefile includes other makefiles that in turn add
the package Provision which has an activity with an intent filter for
handling HOME. SdkSetup already had such an activity so with two choices
it was left to the user to decide which one to use.

BUG=27273457

Change-Id: I42e77b892ce235a5fa858561325ae37973cfb0cd
(cherry picked from commit 12de252f451b34cfa67f7256027dad84dcfd984d)
2016-02-19 23:25:46 +00:00
Calin Juravle aab43390a0 Add profman to the build scripts
Bug: 26719109
Bug: 26563023
Change-Id: I91e4baa0102362035d9a73dcfd5bc4645906aae1
2016-02-19 16:54:20 +00:00
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
Bill Yi 4a459aee75 Merge commit '75bbddecaa9f9d82c2f2751b389188f0a41e3284' into HEAD 2016-02-17 09:50:15 -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
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 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
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 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
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
Justin Klaassen 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
Justin Klaassen 45249ff5d1 Revert "Revert "Switch from Calculator to ExactCalculator""
This reverts commit 455ffaafcd.

Bug: 23186109
Change-Id: If768c4c85b8dbf1ffe881eca3412d92150fb019f
2015-08-13 19:22:06 +00:00
Justin Klaassen 53c5891460 Revert "Revert "Switch from Calculator to ExactCalculator""
This reverts commit 455ffaafcd.

Bug: 23186109
Change-Id: If768c4c85b8dbf1ffe881eca3412d92150fb019f
2015-08-13 12:19:38 -07:00
Mike Dodd 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
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 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
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 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
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
Mike Dodd 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
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 018500efea Revert "Include new AOSP messaging app in base builds."
This reverts commit a8b0905e16.

Change-Id: Ia8b8eaf6576937907b073ad97593440e114c0b6f
2015-08-12 18:48:45 +00:00
Mike Dodd 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
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 a8b0905e16 Include new AOSP messaging app in base builds.
b/23110861

Change-Id: I365bedc809425c901982f867e671070344d1112b
2015-08-11 13:14:09 -07:00
Furquan Shaikh 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
Furquan Shaikh 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
Furquan Shaikh 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
Paul Miller 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
Paul Miller 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
Paul Miller 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
Stephen Smalley 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
Richard Haines 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
Paul Miller 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
Paul Crowley 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
Paul Crowley 7019818511 Merge "Build "secdiscard" for securely discarding data from flash devices." into mnc-dr-dev 2015-07-13 20:54:43 +00:00
Paul Crowley 36e792b894 Build "secdiscard" for securely discarding data from flash devices.
Bug: 19706593
Change-Id: I073b7b39f25b054abdf2b983a63d029d690970a9
(cherry picked from commit 54a28654e6)
2015-06-30 15:40:00 +01:00
Michael Wright 57ec4c9bab am b20475db: am 7371a7a5: Add hid command to base build
* commit 'b20475db100bd21e98239c1ce6f7ef2676e6d0e4':
  Add hid command to base build
2015-06-24 17:26:33 +00:00
Michael Wright b20475db10 am 7371a7a5: Add hid command to base build
* commit '7371a7a5b596f96f8bebf157a7dc261c545a2315':
  Add hid command to base build
2015-06-24 17:13:52 +00:00
Michael Wright 7371a7a5b5 Add hid command to base build
Bug: 21662862
Change-Id: I11ed67b8f0efd1232ddfbb6e0a5f4bdbb065397e
2015-06-24 15:55:47 +01:00
Bo Hu 61749e2dbc am 232a195a: am dc175a0f: am 3d81b7d6: Merge "Add android.hardware.ethernet.xml for ranchu targets"
* commit '232a195a68925fa534a553ca8516a4f41cd9b394':
  Add android.hardware.ethernet.xml for ranchu targets
2015-06-23 07:12:37 +00:00
Bo Hu 232a195a68 am dc175a0f: am 3d81b7d6: Merge "Add android.hardware.ethernet.xml for ranchu targets"
* commit 'dc175a0fa8641552696b25a59f99f58942b7c2d3':
  Add android.hardware.ethernet.xml for ranchu targets
2015-06-23 07:00:39 +00:00
Miroslav Tisma 39b59502c7 Add android.hardware.ethernet.xml for ranchu targets
This commit adds android.hardware.ethernet.xml file for ethernet
permission to PRODUCT_COPY_FILES which will be copied to
/system/etc/permission folder on the target. Reason for adding
this permission file is for enabling the ethernet and having
functional networking until RIL backend support in ranchu is
implemented.

This requires dhcpcd_eth0 service definition in init.ranchu.rc.

Architectures that use goldfish emulator do not need ethernet
support, because networking is provided by RIL.

Change-Id: I7972f80cf78c0fdecf3fde45bf018230bbcefd38
2015-06-19 11:35:38 +02:00
Paul Crowley 4fbba49cfc Merge "Build "secdiscard" for securely discarding data from flash devices." 2015-06-17 22:37:16 +00:00
Ying Wang 7af2b076bf am 138fb205: am 1010cc81: am c5672344: Merge "Really include drawables for all densities."
* commit '138fb205d5f89729043caf1b05382fbdd284c1d7':
  Really include drawables for all densities.
2015-06-17 21:52:21 +00:00
Ying Wang 138fb205d5 am 1010cc81: am c5672344: Merge "Really include drawables for all densities."
* commit '1010cc8123893bc154ae1b53b2ab559dc6896240':
  Really include drawables for all densities.
2015-06-17 21:39:22 +00:00
Ying Wang f054bd34b6 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-06-17 21:18:09 +00:00
Tim Kilbourn 5b1d9f78b1 Add input.evdev.default to base.mk
The new inputflinger requires it (as of now), so it doesn't make sense
to have it included only in generic_no_telephony.mk.

Change-Id: I8e34c8d75839e1bfe31bf29fe22a2fc6111b44c1
2015-06-10 16:27:47 -07:00
Ying Wang 8c7dd85758 am bc0f1f56: am ac3f88d8: am 080f57ae: Merge "Remove the unnecessary full_x86_64 and full_mips64."
* commit 'bc0f1f565143a676dfdb5e2234c94e7da3116a0f':
  Remove the unnecessary full_x86_64 and full_mips64.
2015-06-08 20:21:12 +00:00
Ying Wang bc0f1f5651 am ac3f88d8: am 080f57ae: Merge "Remove the unnecessary full_x86_64 and full_mips64."
* commit 'ac3f88d8a2812cd2134f9b67ec4a928d886a4eb6':
  Remove the unnecessary full_x86_64 and full_mips64.
2015-06-08 20:08:09 +00:00
Ying Wang 0a76df5ce7 Remove the unnecessary full_x86_64 and full_mips64.
For historical reason, the aosp_* products were named full_*.
We keep the full, full_x86 and full_mips in case some tools still
reference these legacy names; But no reason the have the full_* product
names for the new 64-bit archs.

Change-Id: I240ed0c6ded0ded2d80603bd0c5ff24750999afc
2015-06-08 11:57:26 -07:00
Paul Crowley 54a28654e6 Build "secdiscard" for securely discarding data from flash devices.
Bug: 19706593
Change-Id: I073b7b39f25b054abdf2b983a63d029d690970a9
2015-06-04 09:59:33 +01:00
Yorke Lee bc4e48ff39 am 24deb5d0: am 05f9da8e: Merge "Add \'adb shell telecom\' command to packages list" into mnc-dev
* commit '24deb5d08f7e258af3e48afc3068be9786462a3d':
  Add 'adb shell telecom' command to packages list
2015-06-03 22:27:03 +00:00
Yorke Lee a1e1d9cea5 Add 'adb shell telecom' command to packages list
Change-Id: I193b54dd9f4511eb7959c5dbbf38f90267b8fcc9
2015-06-03 13:57:33 -07:00
Jeff Sharkey e95d555c12 am c79068be: am c2fb6e10: Merge "Both ext4 and f2fs binaries for adoptable storage." into mnc-dev
* commit 'c79068be5c90aefedcb2e171e8700eace4e8f05c':
  Both ext4 and f2fs binaries for adoptable storage.
2015-05-29 05:15:59 +00:00
Jeff Sharkey c2fb6e107d Merge "Both ext4 and f2fs binaries for adoptable storage." into mnc-dev 2015-05-28 19:54:17 +00:00
bohu 9db8d53432 am bb1ead79: am 1d8b2702: Include fingerprintd on emulator images
* commit 'bb1ead7920ad5bb98d6989a763d242826663e241':
  Include fingerprintd on emulator images
2015-05-28 02:38:04 +00:00