Commit Graph

23085 Commits

Author SHA1 Message Date
Lajos Molnar f623a80480 core_base.mk: switch to new H264 and MPEG2 software codecs
Change-Id: I3078a4ef6e73e95edcdd16b087ac61ae56c4b812
2015-04-16 19:02:47 -07:00
Justin Klaassen 846505dc35 Switch from Calculator to ExactCalculator
Bug: 20301980
Change-Id: I95373aba826a0b5d58d2845b77e9849b674c5ed3
2015-04-16 17:28:05 -07:00
Glenn Kasten 6716ca263f am 144423a0: am 9ec90ec8: am 1004eccb: Merge "Fix bookmark title"
* commit '144423a0580fe03a00053da785bcfdc8e46a87b5':
  Fix bookmark title
2015-04-16 23:59:05 +00:00
Glenn Kasten 144423a058 am 9ec90ec8: am 1004eccb: Merge "Fix bookmark title"
* commit '9ec90ec81347aa71eb7538c5e8354c3ffbd858e8':
  Fix bookmark title
2015-04-16 23:37:23 +00:00
Glenn Kasten 9ec90ec813 am 1004eccb: Merge "Fix bookmark title"
* commit '1004eccb166908b1411e966ca7f6fac315ad3bb0':
  Fix bookmark title
2015-04-16 23:22:28 +00:00
Glenn Kasten 1004eccb16 Merge "Fix bookmark title" 2015-04-16 23:12:50 +00:00
Dirk Dougherty aa9fbd8232 Doc change: increment metadata for updated Distribute landing page content.
Change-Id: Ic45637709a72e4fff4a3a130352f48f7544c5ce2
2015-04-16 15:28:45 -07:00
Junda Liu 1ee21944a6 Merge "Adding the new CarrierConfig app to the system image." 2015-04-16 20:13:36 +00:00
Glenn Kasten 1efbc8996e Fix bookmark title
Bug: 20299601
Change-Id: Ie57daf7b378cf370e34ff282d97fd36f2d74031a
2015-04-16 11:56:22 -07:00
Mark Salyzyn 36972044fb 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
2015-04-16 17:53:46 +00:00
Mark Salyzyn db6a4158fe 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
2015-04-16 17:31:36 +00:00
Jonathan Basseri 3dd39b092b Adding the new CarrierConfig app to the system image.
Bug: b/19483786
Change-Id: I0173246997d6edddf4d9afb508a2427818f71928
2015-04-16 10:25:03 -07:00
Mark Salyzyn 86e441fc9c 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
2015-04-16 17:20:03 +00:00
Mark Salyzyn 1ff61a9b2d Merge "build: fs_config_generate must open file in binary mode" 2015-04-16 17:07:47 +00:00
Lajos Molnar 7ac7dc7263 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"
2015-04-16 16:40:35 +00:00
Lajos Molnar 8cd7e9442c 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"
2015-04-16 16:19:14 +00:00
Lajos Molnar fb102b1b51 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"
2015-04-16 16:07:37 +00:00
Lajos Molnar 7c794b1659 Merge "Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"" 2015-04-16 15:57:02 +00:00
Lajos Molnar 37e931d9c3 Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"
clang builds fail on the dependent libraries

This reverts commit c628500ca5.

Change-Id: Ibd4cdce82b890bd3cb9d03a1a1bc0e4fc0e22ee8
2015-04-16 15:49:08 +00:00
Lajos Molnar 2578431911 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
2015-04-16 15:45:56 +00:00
Mark Salyzyn 6024069f37 build: fs_config_generate must open file in binary mode
Bug: 19908228
Change-Id: I2361b8af90b3729deb438e6a7a7179de12680b65
2015-04-16 08:43:33 -07:00
Lajos Molnar ec1c2c0fea 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
2015-04-16 15:24:42 +00:00
Lajos Molnar b5f7b18749 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
2015-04-16 15:13:05 +00:00
Lajos Molnar 161c69714d Merge "core_base.mk: switch to new H264 and MPEG2 software codecs" 2015-04-16 15:02:03 +00:00
Vinit Deshpande 64882b50f8 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
2015-04-16 02:37:46 +00:00
Mark Salyzyn a55ab6fff6 am d756e736: am c9402076: am 7a1d4d5e: Merge "fs_config: Add fs_config_generate"
* commit 'd756e7367ab60d5e4138d7561aaabf4256e3d247':
  fs_config: Add fs_config_generate
2015-04-16 00:38:06 +00:00
Mark Salyzyn d756e7367a am c9402076: am 7a1d4d5e: Merge "fs_config: Add fs_config_generate"
* commit 'c9402076b65025c994c28bac0350d5b600d1d6fe':
  fs_config: Add fs_config_generate
2015-04-16 00:15:47 +00:00
Mark Salyzyn c9402076b6 am 7a1d4d5e: Merge "fs_config: Add fs_config_generate"
* commit '7a1d4d5e49a4068d8cf4fead175016c9b944c42b':
  fs_config: Add fs_config_generate
2015-04-15 23:59:52 +00:00
Mark Salyzyn 7a1d4d5e49 Merge "fs_config: Add fs_config_generate" 2015-04-15 23:50:44 +00:00
Lajos Molnar c628500ca5 core_base.mk: switch to new H264 and MPEG2 software codecs
Change-Id: I86777e5efc7dbb138e9348a4ec7271ff047d328f
2015-04-15 16:18:53 -07:00
Mark Salyzyn a910c7bd58 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
2015-04-15 22:56:22 +00:00
Dan Albert 97952ce8ac am 3bc25d69: am 683a387e: am 4ed95088: Merge "Add support for ubsan."
* commit '3bc25d69580b5cdedd834fe6accf9cc27c0fb102':
  Add support for ubsan.
2015-04-15 22:56:21 +00:00
Mark Salyzyn 54c1d36eae am 5a1c89e9: am 36fb373a: Merge "fs_config: use libcutils and libselinux shared libraries"
* commit '5a1c89e94ee4a96e31bd66f01a27c2c75cba4065':
  fs_config: use libcutils and libselinux shared libraries
2015-04-15 22:40:50 +00:00
Dan Albert 3bc25d6958 am 683a387e: am 4ed95088: Merge "Add support for ubsan."
* commit '683a387efb079fefd3d2895875868b7c2a5a4a06':
  Add support for ubsan.
2015-04-15 22:32:08 +00:00
Mark Salyzyn 5a1c89e94e am 36fb373a: Merge "fs_config: use libcutils and libselinux shared libraries"
* commit '36fb373adfe8bbf9397dc8ccf405fd4d6baeef2f':
  fs_config: use libcutils and libselinux shared libraries
2015-04-15 22:31:26 +00:00
Mark Salyzyn 36fb373adf Merge "fs_config: use libcutils and libselinux shared libraries" 2015-04-15 22:22:42 +00:00
Dan Albert 683a387efb am 4ed95088: Merge "Add support for ubsan."
* commit '4ed95088425a7de5b4fac37fff4888f0a187d5d6':
  Add support for ubsan.
2015-04-15 22:21:24 +00:00
Dan Albert 4ed9508842 Merge "Add support for ubsan." 2015-04-15 22:06:15 +00:00
Ying Wang 87a21c8b89 resolved conflicts for merge of eec386a4 to master
Change-Id: Ia686e67ed480427a6422d87bef2dcd4e44e27266
2015-04-15 14:39:26 -07:00
Mark Salyzyn 06b91b9bcf 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
2015-04-15 14:17:12 -07:00
Mark Salyzyn 073a9ebbbf 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
2015-04-15 14:17:07 -07:00
Kenny Root eec386a4df am 68dc5196: am 03c6e8c5: Merge "Move package signing after file stripping"
* commit '68dc5196226406db84a41a03fe70e6278ed35fcd':
  Move package signing after file stripping
2015-04-15 20:12:21 +00:00
Kenny Root 68dc519622 am 03c6e8c5: Merge "Move package signing after file stripping"
* commit '03c6e8c58686ffe611952d363de21b54f813ca41':
  Move package signing after file stripping
2015-04-15 20:05:57 +00:00
Kenny Root 03c6e8c586 Merge "Move package signing after file stripping" 2015-04-15 19:58:21 +00:00
Kenny Root dff3755a93 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
2015-04-15 12:40:22 -07:00
Ying Wang 599b07a4b2 Merge "Auto-clean host tools when switching between apps_only and platform build." 2015-04-15 17:10:05 +00:00
Mark Salyzyn 4660814b51 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
2015-04-15 15:28:39 +00:00
Mark Salyzyn d6d6077c99 am 2f1bc255: am 8b75ec1c: Merge "disttools: add liblog, libcutils and libselinux shared libraries"
* commit '2f1bc255fc7f0f5a8f6fd96296a119120bc04726':
  disttools: add liblog, libcutils and libselinux shared libraries
2015-04-15 15:05:55 +00:00
Mark Salyzyn 2f1bc255fc am 8b75ec1c: Merge "disttools: add liblog, libcutils and libselinux shared libraries"
* commit '8b75ec1c7b6efa79f358725d0fd7a3932fd273e5':
  disttools: add liblog, libcutils and libselinux shared libraries
2015-04-15 14:55:48 +00:00
Mark Salyzyn 8b75ec1c7b Merge "disttools: add liblog, libcutils and libselinux shared libraries" 2015-04-15 14:45:05 +00:00