OSDN Git Service

android-x86/build.git
9 years agoSwitch from Calculator to ExactCalculator
Justin Klaassen [Fri, 17 Apr 2015 00:28:05 +0000 (17:28 -0700)]
Switch from Calculator to ExactCalculator

Bug: 20301980
Change-Id: I95373aba826a0b5d58d2845b77e9849b674c5ed3

9 years agoam 144423a0: am 9ec90ec8: am 1004eccb: Merge "Fix bookmark title"
Glenn Kasten [Thu, 16 Apr 2015 23:59:05 +0000 (23:59 +0000)]
am 144423a0: am 9ec90ec8: am 1004eccb: Merge "Fix bookmark title"

* commit '144423a0580fe03a00053da785bcfdc8e46a87b5':
  Fix bookmark title

9 years agoam 9ec90ec8: am 1004eccb: Merge "Fix bookmark title"
Glenn Kasten [Thu, 16 Apr 2015 23:37:23 +0000 (23:37 +0000)]
am 9ec90ec8: am 1004eccb: Merge "Fix bookmark title"

* commit '9ec90ec81347aa71eb7538c5e8354c3ffbd858e8':
  Fix bookmark title

9 years agoam 1004eccb: Merge "Fix bookmark title"
Glenn Kasten [Thu, 16 Apr 2015 23:22:28 +0000 (23:22 +0000)]
am 1004eccb: Merge "Fix bookmark title"

* commit '1004eccb166908b1411e966ca7f6fac315ad3bb0':
  Fix bookmark title

9 years agoMerge "Fix bookmark title"
Glenn Kasten [Thu, 16 Apr 2015 23:12:45 +0000 (23:12 +0000)]
Merge "Fix bookmark title"

9 years agoMerge "Adding the new CarrierConfig app to the system image."
Junda Liu [Thu, 16 Apr 2015 20:13:26 +0000 (20:13 +0000)]
Merge "Adding the new CarrierConfig app to the system image."

9 years agoFix bookmark title
Glenn Kasten [Thu, 16 Apr 2015 18:56:22 +0000 (11:56 -0700)]
Fix bookmark title

Bug: 20299601
Change-Id: Ie57daf7b378cf370e34ff282d97fd36f2d74031a

9 years agoam db6a4158: am 86e441fc: am 1ff61a9b: Merge "build: fs_config_generate must open...
Mark Salyzyn [Thu, 16 Apr 2015 17:53:46 +0000 (17:53 +0000)]
am db6a4158: am 86e441fc: am 1ff61a9b: Merge "build: fs_config_generate must open file in binary mode"

* commit 'db6a4158fe45c1ff94fe71a94ea48ebb24c16799':
  build: fs_config_generate must open file in binary mode

9 years agoam 86e441fc: am 1ff61a9b: Merge "build: fs_config_generate must open file in binary...
Mark Salyzyn [Thu, 16 Apr 2015 17:31:36 +0000 (17:31 +0000)]
am 86e441fc: am 1ff61a9b: Merge "build: fs_config_generate must open file in binary mode"

* commit '86e441fc9c4191439b53b9917cf432ca2d16330a':
  build: fs_config_generate must open file in binary mode

9 years agoAdding the new CarrierConfig app to the system image.
Jonathan Basseri [Tue, 7 Apr 2015 19:28:12 +0000 (12:28 -0700)]
Adding the new CarrierConfig app to the system image.

Bug: b/19483786
Change-Id: I0173246997d6edddf4d9afb508a2427818f71928

9 years agoam 1ff61a9b: Merge "build: fs_config_generate must open file in binary mode"
Mark Salyzyn [Thu, 16 Apr 2015 17:20:03 +0000 (17:20 +0000)]
am 1ff61a9b: Merge "build: fs_config_generate must open file in binary mode"

* commit '1ff61a9b2d169477b476fdf4f03a92388f3ba444':
  build: fs_config_generate must open file in binary mode

9 years agoMerge "build: fs_config_generate must open file in binary mode"
Mark Salyzyn [Thu, 16 Apr 2015 17:05:08 +0000 (17:05 +0000)]
Merge "build: fs_config_generate must open file in binary mode"

9 years agoam 8cd7e944: am fb102b1b: am 7c794b16: Merge "Revert "core_base.mk: switch to new...
Lajos Molnar [Thu, 16 Apr 2015 16:40:35 +0000 (16:40 +0000)]
am 8cd7e944: am fb102b1b: am 7c794b16: Merge "Revert "core_base.mk: switch to new H264 and MPEG2 software codecs""

* commit '8cd7e9442cfbd8247bb99c312f6e98649b3afe42':
  Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"

9 years agoam fb102b1b: am 7c794b16: Merge "Revert "core_base.mk: switch to new H264 and MPEG2...
Lajos Molnar [Thu, 16 Apr 2015 16:19:14 +0000 (16:19 +0000)]
am fb102b1b: am 7c794b16: Merge "Revert "core_base.mk: switch to new H264 and MPEG2 software codecs""

* commit 'fb102b1b5107fced1fb7cfdb98b051efb3575ec5':
  Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"

9 years agoam 7c794b16: Merge "Revert "core_base.mk: switch to new H264 and MPEG2 software codecs""
Lajos Molnar [Thu, 16 Apr 2015 16:07:37 +0000 (16:07 +0000)]
am 7c794b16: Merge "Revert "core_base.mk: switch to new H264 and MPEG2 software codecs""

* commit '7c794b165975c1d21753a46282dd3ea6da26fcb0':
  Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"

9 years agoMerge "Revert "core_base.mk: switch to new H264 and MPEG2 software codecs""
Lajos Molnar [Thu, 16 Apr 2015 15:57:01 +0000 (15:57 +0000)]
Merge "Revert "core_base.mk: switch to new H264 and MPEG2 software codecs""

9 years agoRevert "core_base.mk: switch to new H264 and MPEG2 software codecs"
Lajos Molnar [Thu, 16 Apr 2015 15:49:08 +0000 (15:49 +0000)]
Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"

clang builds fail on the dependent libraries

This reverts commit c628500ca5cfd46152e238e9dc24217a3d08b906.

Change-Id: Ibd4cdce82b890bd3cb9d03a1a1bc0e4fc0e22ee8

9 years agoam ec1c2c0f: am b5f7b187: am 161c6971: Merge "core_base.mk: switch to new H264 and...
Lajos Molnar [Thu, 16 Apr 2015 15:45:56 +0000 (15:45 +0000)]
am ec1c2c0f: am b5f7b187: am 161c6971: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"

* commit 'ec1c2c0fea5b82ecf480d32dd3679f8437f720eb':
  core_base.mk: switch to new H264 and MPEG2 software codecs

9 years agobuild: fs_config_generate must open file in binary mode
Mark Salyzyn [Thu, 16 Apr 2015 15:42:19 +0000 (08:42 -0700)]
build: fs_config_generate must open file in binary mode

Bug: 19908228
Change-Id: I2361b8af90b3729deb438e6a7a7179de12680b65

9 years agoam b5f7b187: am 161c6971: Merge "core_base.mk: switch to new H264 and MPEG2 software...
Lajos Molnar [Thu, 16 Apr 2015 15:24:42 +0000 (15:24 +0000)]
am b5f7b187: am 161c6971: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"

* commit 'b5f7b18749a490a61eac66572ab1a009c608468b':
  core_base.mk: switch to new H264 and MPEG2 software codecs

9 years agoam 161c6971: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
Lajos Molnar [Thu, 16 Apr 2015 15:13:05 +0000 (15:13 +0000)]
am 161c6971: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"

* commit '161c69714db0a5a12ef09d85533773b7ab6152d9':
  core_base.mk: switch to new H264 and MPEG2 software codecs

9 years agoMerge "core_base.mk: switch to new H264 and MPEG2 software codecs"
Lajos Molnar [Thu, 16 Apr 2015 15:02:01 +0000 (15:02 +0000)]
Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"

9 years agoMerge changes from topic 'mwd-merge-041515'
Vinit Deshpande [Thu, 16 Apr 2015 02:36:02 +0000 (02:36 +0000)]
Merge changes from topic 'mwd-merge-041515'

* changes:
  am d8e3b5e..bc7fc60 from mirror-m-wireless-internal-release
  am "DO NOT MERGE - Bump version to 5.1.1 automerge: 1c..."
  am 5d1e929..fae98a4 from mirror-m-wireless-internal-release
  am "resolved conflicts for merge of 68000907 to lmp-mr..."
  am bcfe6fa..7d5716e from mirror-m-wireless-internal-release

9 years agoam d756e736: am c9402076: am 7a1d4d5e: Merge "fs_config: Add fs_config_generate"
Mark Salyzyn [Thu, 16 Apr 2015 00:38:06 +0000 (00:38 +0000)]
am d756e736: am c9402076: am 7a1d4d5e: Merge "fs_config: Add fs_config_generate"

* commit 'd756e7367ab60d5e4138d7561aaabf4256e3d247':
  fs_config: Add fs_config_generate

9 years agoam c9402076: am 7a1d4d5e: Merge "fs_config: Add fs_config_generate"
Mark Salyzyn [Thu, 16 Apr 2015 00:15:47 +0000 (00:15 +0000)]
am c9402076: am 7a1d4d5e: Merge "fs_config: Add fs_config_generate"

* commit 'c9402076b65025c994c28bac0350d5b600d1d6fe':
  fs_config: Add fs_config_generate

9 years agoam 7a1d4d5e: Merge "fs_config: Add fs_config_generate"
Mark Salyzyn [Wed, 15 Apr 2015 23:59:52 +0000 (23:59 +0000)]
am 7a1d4d5e: Merge "fs_config: Add fs_config_generate"

* commit '7a1d4d5e49a4068d8cf4fead175016c9b944c42b':
  fs_config: Add fs_config_generate

9 years agoMerge "fs_config: Add fs_config_generate"
Mark Salyzyn [Wed, 15 Apr 2015 23:50:43 +0000 (23:50 +0000)]
Merge "fs_config: Add fs_config_generate"

9 years agocore_base.mk: switch to new H264 and MPEG2 software codecs
Lajos Molnar [Wed, 15 Apr 2015 23:14:39 +0000 (16:14 -0700)]
core_base.mk: switch to new H264 and MPEG2 software codecs

Change-Id: I86777e5efc7dbb138e9348a4ec7271ff047d328f

9 years agoam 54c1d36e: am 5a1c89e9: am 36fb373a: Merge "fs_config: use libcutils and libselinux...
Mark Salyzyn [Wed, 15 Apr 2015 22:56:22 +0000 (22:56 +0000)]
am 54c1d36e: am 5a1c89e9: am 36fb373a: Merge "fs_config: use libcutils and libselinux shared libraries"

* commit '54c1d36eaee59c62a652b071bdec9e71c40002ae':
  fs_config: use libcutils and libselinux shared libraries

9 years agoam 3bc25d69: am 683a387e: am 4ed95088: Merge "Add support for ubsan."
Dan Albert [Wed, 15 Apr 2015 22:56:21 +0000 (22:56 +0000)]
am 3bc25d69: am 683a387e: am 4ed95088: Merge "Add support for ubsan."

* commit '3bc25d69580b5cdedd834fe6accf9cc27c0fb102':
  Add support for ubsan.

9 years agoam 5a1c89e9: am 36fb373a: Merge "fs_config: use libcutils and libselinux shared libra...
Mark Salyzyn [Wed, 15 Apr 2015 22:40:50 +0000 (22:40 +0000)]
am 5a1c89e9: am 36fb373a: Merge "fs_config: use libcutils and libselinux shared libraries"

* commit '5a1c89e94ee4a96e31bd66f01a27c2c75cba4065':
  fs_config: use libcutils and libselinux shared libraries

9 years agoam 683a387e: am 4ed95088: Merge "Add support for ubsan."
Dan Albert [Wed, 15 Apr 2015 22:32:08 +0000 (22:32 +0000)]
am 683a387e: am 4ed95088: Merge "Add support for ubsan."

* commit '683a387efb079fefd3d2895875868b7c2a5a4a06':
  Add support for ubsan.

9 years agoam 36fb373a: Merge "fs_config: use libcutils and libselinux shared libraries"
Mark Salyzyn [Wed, 15 Apr 2015 22:31:26 +0000 (22:31 +0000)]
am 36fb373a: Merge "fs_config: use libcutils and libselinux shared libraries"

* commit '36fb373adfe8bbf9397dc8ccf405fd4d6baeef2f':
  fs_config: use libcutils and libselinux shared libraries

9 years agoMerge "fs_config: use libcutils and libselinux shared libraries"
Mark Salyzyn [Wed, 15 Apr 2015 22:22:42 +0000 (22:22 +0000)]
Merge "fs_config: use libcutils and libselinux shared libraries"

9 years agoam 4ed95088: Merge "Add support for ubsan."
Dan Albert [Wed, 15 Apr 2015 22:21:24 +0000 (22:21 +0000)]
am 4ed95088: Merge "Add support for ubsan."

* commit '4ed95088425a7de5b4fac37fff4888f0a187d5d6':
  Add support for ubsan.

9 years agoMerge "Add support for ubsan."
Dan Albert [Wed, 15 Apr 2015 22:06:09 +0000 (22:06 +0000)]
Merge "Add support for ubsan."

9 years agoresolved conflicts for merge of eec386a4 to master
Ying Wang [Wed, 15 Apr 2015 21:39:26 +0000 (14:39 -0700)]
resolved conflicts for merge of eec386a4 to master

Change-Id: Ia686e67ed480427a6422d87bef2dcd4e44e27266

9 years agofs_config: Add fs_config_generate
Mark Salyzyn [Wed, 1 Apr 2015 21:41:29 +0000 (14:41 -0700)]
fs_config: Add fs_config_generate

fs_config_generate_$(TARGET_DEVICE) is built based off the content
of $(TARGET_ANDROID_FILESYSTEM_CONFIG_H). We also add the rules
fs_config_dirs and fs_config_file to utilize this command
for target contents:

fs_config_generate_$(TARGET_DEVICE) -D -o system/etc/fs_config_dir
fs_config_generate_$(TARGET_DEVICE) -F -o system/etc/fs_config_file

In order to use this feature, one must have the fs_config_dirs and
fs_config_files in the $(PRODUCT_PACKAGES) list defined in the
device make files in $(TARGET_DEVICE_DIR). And either an
android_filesystem_config.h file in that directory, or define a
path in TARGET_ANDROID_FILESYSTEM_CONFIG_H to point to one.

Bug: 19908228
Change-Id: Iee1543d99169f874e0915ae07962a7750ecb6342

9 years agofs_config: use libcutils and libselinux shared libraries
Mark Salyzyn [Wed, 15 Apr 2015 19:53:39 +0000 (12:53 -0700)]
fs_config: use libcutils and libselinux shared libraries

- move to libcutils.so and libselinux.so as shared now that
  they are in DISTTOOL.
- liblog dependency is part of libcutils, and need not be
  called out explicitly now. liblog is in DISTTOOL.
- libcutils fs_config has the right to add Android logging

Bug: 19908228
Change-Id: Iaa60ad624b42d83653840ac3c77bfa03ad8674aa

9 years agoam 68dc5196: am 03c6e8c5: Merge "Move package signing after file stripping"
Kenny Root [Wed, 15 Apr 2015 20:12:21 +0000 (20:12 +0000)]
am 68dc5196: am 03c6e8c5: Merge "Move package signing after file stripping"

* commit '68dc5196226406db84a41a03fe70e6278ed35fcd':
  Move package signing after file stripping

9 years agoam 03c6e8c5: Merge "Move package signing after file stripping"
Kenny Root [Wed, 15 Apr 2015 20:05:57 +0000 (20:05 +0000)]
am 03c6e8c5: Merge "Move package signing after file stripping"

* commit '03c6e8c58686ffe611952d363de21b54f813ca41':
  Move package signing after file stripping

9 years agoMerge "Move package signing after file stripping"
Kenny Root [Wed, 15 Apr 2015 19:58:20 +0000 (19:58 +0000)]
Merge "Move package signing after file stripping"

9 years agoMove package signing after file stripping
Kenny Root [Wed, 15 Apr 2015 19:09:32 +0000 (12:09 -0700)]
Move package signing after file stripping

For dex preopt and JNI library extraction, we should remove the
classes.dex and .so files before we sign the APK so that there
isn't an entry in the manifest.

Prebuilt APKs which are pre-signed will simply not have the files
removed. This may cause some system.img bloat, but signature checks make
this necessary.

Bug: 20247329
Change-Id: I4742d1aa3aa64ab5aea2264304cb8c0bea24f784

9 years agoMerge "Auto-clean host tools when switching between apps_only and platform build."
Ying Wang [Wed, 15 Apr 2015 17:10:04 +0000 (17:10 +0000)]
Merge "Auto-clean host tools when switching between apps_only and platform build."

9 years agoam d6d6077c: am 2f1bc255: am 8b75ec1c: Merge "disttools: add liblog, libcutils and...
Mark Salyzyn [Wed, 15 Apr 2015 15:28:39 +0000 (15:28 +0000)]
am d6d6077c: am 2f1bc255: am 8b75ec1c: Merge "disttools: add liblog, libcutils and libselinux shared libraries"

* commit 'd6d6077c999e4ef335312f2740d5d7ad20572f79':
  disttools: add liblog, libcutils and libselinux shared libraries

9 years agoam 2f1bc255: am 8b75ec1c: Merge "disttools: add liblog, libcutils and libselinux...
Mark Salyzyn [Wed, 15 Apr 2015 15:05:55 +0000 (15:05 +0000)]
am 2f1bc255: am 8b75ec1c: Merge "disttools: add liblog, libcutils and libselinux shared libraries"

* commit '2f1bc255fc7f0f5a8f6fd96296a119120bc04726':
  disttools: add liblog, libcutils and libselinux shared libraries

9 years agoam 8b75ec1c: Merge "disttools: add liblog, libcutils and libselinux shared libraries"
Mark Salyzyn [Wed, 15 Apr 2015 14:55:48 +0000 (14:55 +0000)]
am 8b75ec1c: Merge "disttools: add liblog, libcutils and libselinux shared libraries"

* commit '8b75ec1c7b6efa79f358725d0fd7a3932fd273e5':
  disttools: add liblog, libcutils and libselinux shared libraries

9 years agoMerge "disttools: add liblog, libcutils and libselinux shared libraries"
Mark Salyzyn [Wed, 15 Apr 2015 14:45:04 +0000 (14:45 +0000)]
Merge "disttools: add liblog, libcutils and libselinux shared libraries"

9 years agoUse Jack launcher
Yohann Roussel [Tue, 14 Apr 2015 16:38:11 +0000 (18:38 +0200)]
Use Jack launcher

Bug: 20132430
Change-Id: I6e30ad3dffbb32824a4c62e562359b084e6a8784

9 years agoam 1fa6d5b0: am 612581e8: am ad1961a7: Merge "Don\'t use libunwindbacktrace for non...
Dan Albert [Tue, 14 Apr 2015 23:56:11 +0000 (23:56 +0000)]
am 1fa6d5b0: am 612581e8: am ad1961a7: Merge "Don\'t use libunwindbacktrace for non-ARM."

* commit '1fa6d5b0a3fc873bce4d16056c115bf30e62a147':
  Don't use libunwindbacktrace for non-ARM.

9 years agoam 612581e8: am ad1961a7: Merge "Don\'t use libunwindbacktrace for non-ARM."
Dan Albert [Tue, 14 Apr 2015 23:34:03 +0000 (23:34 +0000)]
am 612581e8: am ad1961a7: Merge "Don\'t use libunwindbacktrace for non-ARM."

* commit '612581e8ca8bda8c7f74e84fbb9b7859ca3b9840':
  Don't use libunwindbacktrace for non-ARM.

9 years agoam ad1961a7: Merge "Don\'t use libunwindbacktrace for non-ARM."
Dan Albert [Tue, 14 Apr 2015 23:23:18 +0000 (23:23 +0000)]
am ad1961a7: Merge "Don\'t use libunwindbacktrace for non-ARM."

* commit 'ad1961a74736e02ab16d8688ba7f41a687340bdc':
  Don't use libunwindbacktrace for non-ARM.

9 years agoMerge "Don't use libunwindbacktrace for non-ARM."
Dan Albert [Tue, 14 Apr 2015 23:17:39 +0000 (23:17 +0000)]
Merge "Don't use libunwindbacktrace for non-ARM."

9 years agoam 803cf699: am 5e7e6d75: am 2d215e38: Merge "Use libcompiler_rt-extras on the host...
Dan Albert [Tue, 14 Apr 2015 23:08:47 +0000 (23:08 +0000)]
am 803cf699: am 5e7e6d75: am 2d215e38: Merge "Use libcompiler_rt-extras on the host too."

* commit '803cf699262275a771e3211751e77d2817718656':
  Use libcompiler_rt-extras on the host too.

9 years agoam d8e3b5e..bc7fc60 from mirror-m-wireless-internal-release
Vinit Deshpande [Tue, 14 Apr 2015 23:04:45 +0000 (16:04 -0700)]
am d8e3b5e..bc7fc60 from mirror-m-wireless-internal-release

bc7fc60 "MIZ14"
e44925a merge in m-wireless-internal-release history after reset to 554b16da8c8f733b99cf8bfa922182866d1486df
4dc10e0 "MIZ13C"
705f848 merge in m-wireless-internal-release history after reset to m-wireless-internal-dev
0742b33 "MIZ13B"
d1d0591 merge in m-wireless-internal-release history after reset to m-wireless-internal-dev
7261670 "MIZ13"
e129d44 merge in m-wireless-internal-release history after reset to 554b16da8c8f733b99cf8bfa922182866d1486df
635198e "MIZ09B"
ca927f2 "MIZ09"
39c1433 merge in m-wireless-internal-release history after reset to 554b16da8c8f733b99cf8bfa922182866d1486df
bee9a2a "MIZ08B"
c660ce4 merge in m-wireless-internal-release history after reset to m-wireless-internal-dev
8827702 "MIZ08"
ccc3aeb merge in m-wireless-internal-release history after reset to 554b16da8c8f733b99cf8bfa922182866d1486df
30884d2 "MIZ07"
731c1e7 merge in m-wireless-internal-release history after reset to 554b16da8c8f733b99cf8bfa922182866d1486df
94ff54d "MIZ06"
8104dda merge in m-wireless-internal-release history after reset to 554b16da8c8f733b99cf8bfa922182866d1486df
249c173 "MIZ02"
8f64207 merge in m-wireless-internal-release history after reset to 554b16da8c8f733b99cf8bfa922182866d1486df
a30a61f "MIZ01"
aff0208 merge in m-wireless-internal-release history after reset to 554b16da8c8f733b99cf8bfa922182866d1486df
c9914fe "MIY90"
f0d21f1 merge in m-wireless-internal-release history after reset to 554b16da8c8f733b99cf8bfa922182866d1486df
a3fea1d "MIY89"
cad9311 merge in m-wireless-internal-release history after reset to 554b16da8c8f733b99cf8bfa922182866d1486df
08cc99f "MIY85E"
49b3b63 "MIY85D"
6e44a4b "MIY85C"
554b16d DO NOT MERGE - Bump version to 5.1.1 automerge: 1c3bf5c  -s ours
1c3bf5c DO NOT MERGE - Bump version to 5.1.1

Change-Id: I394d2847345dcd4d7adc2f939c10ab6d824d4031

9 years agoam "DO NOT MERGE - Bump version to 5.1.1 automerge: 1c..."
Vinit Deshpande [Tue, 14 Apr 2015 23:04:26 +0000 (16:04 -0700)]
am "DO NOT MERGE - Bump version to 5.1.1 automerge: 1c..."

merged from mirror-m-wireless-internal-release with -s ours
No changes were actually committed

554b16d DO NOT MERGE - Bump version to 5.1.1 automerge: 1c3bf5c -s ours

9 years agoam 5d1e929..fae98a4 from mirror-m-wireless-internal-release
Vinit Deshpande [Tue, 14 Apr 2015 23:04:16 +0000 (16:04 -0700)]
am 5d1e929..fae98a4 from mirror-m-wireless-internal-release

fae98a4 "MIY85"
9a17903 merge in m-wireless-internal-release history after reset to ceb0b3c8cd6043713a3fd151c6d4a4c957f7f395
7e34c67 "MIY84"
a24eb07 merge in m-wireless-internal-release history after reset to ceb0b3c8cd6043713a3fd151c6d4a4c957f7f395
954668b "MIY83"
890f946 merge in m-wireless-internal-release history after reset to ceb0b3c8cd6043713a3fd151c6d4a4c957f7f395
ceb0b3c Add selinux and verity support to custom image generation. automerge: ad54a4d
ad54a4d Add selinux and verity support to custom image generation.
4e915ba "MIY82"

Change-Id: If39b6532233a5170a316b7518d75126e41fffc73

9 years agoam "resolved conflicts for merge of 68000907 to lmp-mr..."
Vinit Deshpande [Tue, 14 Apr 2015 23:03:58 +0000 (16:03 -0700)]
am "resolved conflicts for merge of 68000907 to lmp-mr..."

merged from mirror-m-wireless-internal-release with -s ours
No changes were actually committed

d461d4f resolved conflicts for merge of 68000907 to lmp-mr1-dev automerge: 030b549

9 years agoam bcfe6fa..7d5716e from mirror-m-wireless-internal-release
Vinit Deshpande [Tue, 14 Apr 2015 23:03:52 +0000 (16:03 -0700)]
am bcfe6fa..7d5716e from mirror-m-wireless-internal-release

7d5716e "MIY78"
28b8df2 merge in m-wireless-internal-release history after reset to ab0b128073f02231248f3abbcd88165aa3690ca1
ab0b128 Support to configure and build multiple custom images. automerge: ae61f50
07f6829 Restrict the verification in block-based incremental OTAs automerge: daebaa6
d7bf504 "MIY77"
ce9efce merge in m-wireless-internal-release history after reset to 597cfdb9db079994620333665db992de7c0a99a0
8445b5e "MIY76"
e67dbed merge in m-wireless-internal-release history after reset to 597cfdb9db079994620333665db992de7c0a99a0
562f7bc "MIY75"
8f3374e merge in m-wireless-internal-release history after reset to 597cfdb9db079994620333665db992de7c0a99a0
ae61f50 Support to configure and build multiple custom images.
879a3e3 "MIY72"
d582e0b merge in m-wireless-internal-release history after reset to m-wireless-internal-dev
daebaa6 Restrict the verification in block-based incremental OTAs

Change-Id: I66be29bee7cf782dabdd8a616b96103445d0afe8

9 years agoam 5e7e6d75: am 2d215e38: Merge "Use libcompiler_rt-extras on the host too."
Dan Albert [Tue, 14 Apr 2015 22:48:57 +0000 (22:48 +0000)]
am 5e7e6d75: am 2d215e38: Merge "Use libcompiler_rt-extras on the host too."

* commit '5e7e6d7585ff94198a5ddd891faba274cf2416d6':
  Use libcompiler_rt-extras on the host too.

9 years agodisttools: add liblog, libcutils and libselinux shared libraries
Mark Salyzyn [Mon, 13 Apr 2015 16:01:24 +0000 (09:01 -0700)]
disttools: add liblog, libcutils and libselinux shared libraries

Bug: 19908228
Change-Id: I48450a9fb917408cb3bc0e41d70c0593acd2b884

9 years agoam 2d215e38: Merge "Use libcompiler_rt-extras on the host too."
Dan Albert [Tue, 14 Apr 2015 22:15:02 +0000 (22:15 +0000)]
am 2d215e38: Merge "Use libcompiler_rt-extras on the host too."

* commit '2d215e38c02828c1f10ccdb205011025c4172cb6':
  Use libcompiler_rt-extras on the host too.

9 years agoMerge "Use libcompiler_rt-extras on the host too."
Dan Albert [Tue, 14 Apr 2015 22:04:55 +0000 (22:04 +0000)]
Merge "Use libcompiler_rt-extras on the host too."

9 years agoDon't use libunwindbacktrace for non-ARM.
Dan Albert [Tue, 14 Apr 2015 21:42:45 +0000 (14:42 -0700)]
Don't use libunwindbacktrace for non-ARM.

After fixing the link order here, it seems libunwindbacktrace no
longer works for exception unwinding, but libgcc now does.

Change-Id: Ice79af4b8f234ed6a053ee818b6dec3aa9706c8a

9 years agoAuto-clean host tools when switching between apps_only and platform build.
Ying Wang [Tue, 14 Apr 2015 21:10:46 +0000 (14:10 -0700)]
Auto-clean host tools when switching between apps_only and platform build.

For apps_only (also PDK build) we use prebuilt host tools in
prebuilts/sdk/tools; For platform build we use tools built from source.
Auto-clean intermediate files of these tools when build type change is
detected.

Bug: 20213206
Change-Id: I9173af322684c017fdb91a3abfbe39ecfe5650e9

9 years agoMerge "Docs: improve the highlighting of definition lists (<dt> and <dd> elements)"
Clay Murphy [Tue, 14 Apr 2015 18:43:02 +0000 (18:43 +0000)]
Merge "Docs:  improve the highlighting of definition lists (<dt> and <dd> elements)"

9 years agoam fd7b099e: am 983f9e49: am b0ff62a1: am a74d2efe: Merge "docs: add new style elemen...
Joe Fernandez [Tue, 14 Apr 2015 17:56:12 +0000 (17:56 +0000)]
am fd7b099e: am 983f9e49: am b0ff62a1: am a74d2efe: Merge "docs: add new style elements for Material Design cross-references" into lmp-docs

* commit 'fd7b099e2d9c61d4615b99e499e30bbd99ecccca':
  docs: add new style elements for Material Design cross-references

9 years agoDocs: improve the highlighting of definition lists (<dt> and <dd> elements)
Clay Murphy [Tue, 14 Apr 2015 17:50:29 +0000 (10:50 -0700)]
Docs:  improve the highlighting of definition lists (<dt> and <dd> elements)

Bug: 18947865
Change-Id: Ibe0966bed1deb2c45d0f323c809d36dc3f33dd17

9 years agoam 983f9e49: am b0ff62a1: am a74d2efe: Merge "docs: add new style elements for Materi...
Joe Fernandez [Tue, 14 Apr 2015 17:35:00 +0000 (17:35 +0000)]
am 983f9e49: am b0ff62a1: am a74d2efe: Merge "docs: add new style elements for Material Design cross-references" into lmp-docs

* commit '983f9e494f0c7f73577101adf391143753dfc4ff':
  docs: add new style elements for Material Design cross-references

9 years agoam b0ff62a1: am a74d2efe: Merge "docs: add new style elements for Material Design...
Joe Fernandez [Tue, 14 Apr 2015 17:25:09 +0000 (17:25 +0000)]
am b0ff62a1: am a74d2efe: Merge "docs: add new style elements for Material Design cross-references" into lmp-docs

* commit 'b0ff62a18102d5e8aebb6f93d304db78b94e826f':
  docs: add new style elements for Material Design cross-references

9 years agoam a74d2efe: Merge "docs: add new style elements for Material Design cross-references...
Joe Fernandez [Tue, 14 Apr 2015 17:13:10 +0000 (17:13 +0000)]
am a74d2efe: Merge "docs: add new style elements for Material Design cross-references" into lmp-docs

* commit 'a74d2efe8fbb131bc41650bce0deb92073dced46':
  docs: add new style elements for Material Design cross-references

9 years agoMerge "docs: add new style elements for Material Design cross-references" into lmp...
Joe Fernandez [Tue, 14 Apr 2015 16:54:49 +0000 (16:54 +0000)]
Merge "docs: add new style elements for Material Design cross-references" into lmp-docs

9 years ago"MIZ14"
The Android Automerger [Tue, 14 Apr 2015 13:54:57 +0000 (06:54 -0700)]
"MIZ14"

9 years agomerge in m-wireless-internal-release history after reset to 554b16da8c8f733b99cf8bfa9...
The Android Automerger [Tue, 14 Apr 2015 13:45:50 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to 554b16da8c8f733b99cf8bfa922182866d1486df

9 years agoam 3c5e45ff: am 70b2a811: am 9317e408: am ffc357f0: Merge "Increment metadata files...
Dirk Dougherty [Tue, 14 Apr 2015 05:13:29 +0000 (05:13 +0000)]
am 3c5e45ff: am 70b2a811: am 9317e408: am ffc357f0: Merge "Increment metadata files for new families pages." into lmp-docs

* commit '3c5e45ff37e27cea465c24d4c1371bd05e122873':
  Increment metadata files for new families pages.

9 years agodocs: add new style elements for Material Design cross-references
Joe Fernandez [Thu, 2 Apr 2015 23:34:44 +0000 (16:34 -0700)]
docs: add new style elements for Material Design cross-references

Change-Id: I718cca684af36294aa89206f3845af5287d05bbe

9 years agoam 70b2a811: am 9317e408: am ffc357f0: Merge "Increment metadata files for new famili...
Dirk Dougherty [Tue, 14 Apr 2015 04:54:27 +0000 (04:54 +0000)]
am 70b2a811: am 9317e408: am ffc357f0: Merge "Increment metadata files for new families pages." into lmp-docs

* commit '70b2a811ccd6fa74770f5747aa5cd97d3bae4b33':
  Increment metadata files for new families pages.

9 years agoam 9317e408: am ffc357f0: Merge "Increment metadata files for new families pages...
Dirk Dougherty [Tue, 14 Apr 2015 04:42:57 +0000 (04:42 +0000)]
am 9317e408: am ffc357f0: Merge "Increment metadata files for new families pages." into lmp-docs

* commit '9317e40807184cfa4b0e8bc001a12446dc3d9f15':
  Increment metadata files for new families pages.

9 years agoam ffc357f0: Merge "Increment metadata files for new families pages." into lmp-docs
Dirk Dougherty [Tue, 14 Apr 2015 04:33:24 +0000 (04:33 +0000)]
am ffc357f0: Merge "Increment metadata files for new families pages." into lmp-docs

* commit 'ffc357f098b9fb939d6869c0f2f1b70fb20c88b6':
  Increment metadata files for new families pages.

9 years agoMerge "Increment metadata files for new families pages." into lmp-docs
Dirk Dougherty [Tue, 14 Apr 2015 04:14:26 +0000 (04:14 +0000)]
Merge "Increment metadata files for new families pages." into lmp-docs

9 years agoam 0d98fcbd: am d4565d8f: am def19e79: am 7c22c9a4: skeleton structure for NDK site
smain@google.com [Tue, 14 Apr 2015 03:10:01 +0000 (03:10 +0000)]
am 0d98fcbd: am d4565d8f: am def19e79: am 7c22c9a4: skeleton structure for NDK site

* commit '0d98fcbd93d661348dcaf17647614254d2265ab2':
  skeleton structure for NDK site

9 years agoam 263e22d4: am 051f18f0: am f37e96e2: Merge "Revert "Enable linker -fix-cortex-a53...
Andrew Hsieh [Tue, 14 Apr 2015 03:01:10 +0000 (03:01 +0000)]
am 263e22d4: am 051f18f0: am f37e96e2: Merge "Revert "Enable linker -fix-cortex-a53-843419""

* commit '263e22d424a80de023143c4758e1e534c726a07d':
  Revert "Enable linker -fix-cortex-a53-843419"

9 years agoam d4565d8f: am def19e79: am 7c22c9a4: skeleton structure for NDK site
smain@google.com [Tue, 14 Apr 2015 02:43:59 +0000 (02:43 +0000)]
am d4565d8f: am def19e79: am 7c22c9a4: skeleton structure for NDK site

* commit 'd4565d8f38bb89a385fa27c42f0129e7330bb5f1':
  skeleton structure for NDK site

9 years agoIncrement metadata files for new families pages.
Dirk Dougherty [Tue, 14 Apr 2015 01:30:39 +0000 (18:30 -0700)]
Increment metadata files for new families pages.

Change-Id: I9df9bde9bcd04c19c92006cff337619b8c3594e7

9 years agoam 051f18f0: am f37e96e2: Merge "Revert "Enable linker -fix-cortex-a53-843419""
Andrew Hsieh [Tue, 14 Apr 2015 00:08:51 +0000 (00:08 +0000)]
am 051f18f0: am f37e96e2: Merge "Revert "Enable linker -fix-cortex-a53-843419""

* commit '051f18f0dce3d0e6278d5bd9b2aad03974549fb5':
  Revert "Enable linker -fix-cortex-a53-843419"

9 years agoam f37e96e2: Merge "Revert "Enable linker -fix-cortex-a53-843419""
Andrew Hsieh [Mon, 13 Apr 2015 23:58:47 +0000 (23:58 +0000)]
am f37e96e2: Merge "Revert "Enable linker -fix-cortex-a53-843419""

* commit 'f37e96e232f7ac3d618526aafcd69705ac7bb3a4':
  Revert "Enable linker -fix-cortex-a53-843419"

9 years agoMerge "Revert "Enable linker -fix-cortex-a53-843419""
Andrew Hsieh [Mon, 13 Apr 2015 23:48:28 +0000 (23:48 +0000)]
Merge "Revert "Enable linker -fix-cortex-a53-843419""

9 years agoRevert "Enable linker -fix-cortex-a53-843419"
Andrew Hsieh [Mon, 13 Apr 2015 23:39:45 +0000 (23:39 +0000)]
Revert "Enable linker -fix-cortex-a53-843419"

This reverts commit 54b22a5a706f6556cda6ef3de13b9b0bdc22e989.

Change-Id: I23613490030783fb6da678de5a25f37caebe5f97

9 years agoam 414bb9a4: am 78622230: am 47ff7f56: Merge "Add host tool fastboot to every build."
Ying Wang [Mon, 13 Apr 2015 22:51:29 +0000 (22:51 +0000)]
am 414bb9a4: am 78622230: am 47ff7f56: Merge "Add host tool fastboot to every build."

* commit '414bb9a4823c44e2f4927f052678e56935d3a9af':
  Add host tool fastboot to every build.

9 years agoam 78622230: am 47ff7f56: Merge "Add host tool fastboot to every build."
Ying Wang [Mon, 13 Apr 2015 22:27:54 +0000 (22:27 +0000)]
am 78622230: am 47ff7f56: Merge "Add host tool fastboot to every build."

* commit '7862223034dee3ef9ac35e3a5346a24c77eacd1b':
  Add host tool fastboot to every build.

9 years agoam 47ff7f56: Merge "Add host tool fastboot to every build."
Ying Wang [Mon, 13 Apr 2015 22:17:14 +0000 (22:17 +0000)]
am 47ff7f56: Merge "Add host tool fastboot to every build."

* commit '47ff7f56d67ca0b819a95f90d428db2e4fd3364e':
  Add host tool fastboot to every build.

9 years agoMerge "Add host tool fastboot to every build."
Ying Wang [Mon, 13 Apr 2015 22:07:40 +0000 (22:07 +0000)]
Merge "Add host tool fastboot to every build."

9 years agoAdd host tool fastboot to every build.
Ying Wang [Mon, 13 Apr 2015 21:49:19 +0000 (14:49 -0700)]
Add host tool fastboot to every build.

Some tools expect fastboot to be present even in user builds.

Change-Id: I4b6ee458eb2feb0dc7a77ec33a04219c5f4adc0d

9 years agoam ace60518: am 6bb41928: am c8400a3e: Merge "Add --include-cfi compiler option."
David Srbecky [Mon, 13 Apr 2015 21:13:22 +0000 (21:13 +0000)]
am ace60518: am 6bb41928: am c8400a3e: Merge "Add --include-cfi compiler option."

* commit 'ace60518c3a19fae779b350795ac3d46d2833feb':
  Add --include-cfi compiler option.

9 years agoam def19e79: am 7c22c9a4: skeleton structure for NDK site
smain@google.com [Mon, 13 Apr 2015 21:06:02 +0000 (21:06 +0000)]
am def19e79: am 7c22c9a4: skeleton structure for NDK site

* commit 'def19e7974cbf1c17dce8f6e25d1bfefb8c55a92':
  skeleton structure for NDK site

9 years agoam 7c22c9a4: skeleton structure for NDK site
smain@google.com [Mon, 13 Apr 2015 20:53:34 +0000 (20:53 +0000)]
am 7c22c9a4: skeleton structure for NDK site

* commit '7c22c9a45ceb44d5c7b4237b89e4227acd839374':
  skeleton structure for NDK site

9 years agoam 6bb41928: am c8400a3e: Merge "Add --include-cfi compiler option."
David Srbecky [Mon, 13 Apr 2015 20:51:53 +0000 (20:51 +0000)]
am 6bb41928: am c8400a3e: Merge "Add --include-cfi compiler option."

* commit '6bb41928e4fe2673a036a4bfa1625c5598cf14f1':
  Add --include-cfi compiler option.

9 years agoam c8400a3e: Merge "Add --include-cfi compiler option."
David Srbecky [Mon, 13 Apr 2015 20:45:04 +0000 (20:45 +0000)]
am c8400a3e: Merge "Add --include-cfi compiler option."

* commit 'c8400a3e2fa2e647b74042f1f32bd83dbae255d4':
  Add --include-cfi compiler option.

9 years agoMerge "Add --include-cfi compiler option."
David Srbecky [Mon, 13 Apr 2015 20:34:49 +0000 (20:34 +0000)]
Merge "Add --include-cfi compiler option."

9 years agoskeleton structure for NDK site
smain@google.com [Sat, 11 Apr 2015 03:38:47 +0000 (20:38 -0700)]
skeleton structure for NDK site

Change-Id: Id9f490f69231c9ab0e846d0e983969a14c67a497