Dan Albert
fad709772e
am cf6e1ff6
: am 27176208
: Merge "Clean up sanitizer configuration."
...
* commit 'cf6e1ff62a0abbea186d5a62f23d0b71671202ca':
Clean up sanitizer configuration.
2015-04-17 17:08:55 +00:00
Dan Albert
cf6e1ff62a
am 27176208
: Merge "Clean up sanitizer configuration."
...
* commit '2717620873fa1936779662a96de05033b89ddb19':
Clean up sanitizer configuration.
2015-04-17 16:57:54 +00:00
Dan Albert
2717620873
Merge "Clean up sanitizer configuration."
2015-04-17 16:47:01 +00:00
Dan Albert
27ccb75af7
Clean up sanitizer configuration.
...
* Refactor a few pieces to avoid deeply nested conditionals.
* LOCAL_SANITIZE := never replaces LOCAL_ADDRESS_SANITIZER := false.
Change-Id: I68bb8c5edda6ecd40179c5ba9f18d06e96aaa260
2015-04-17 09:39:12 -07:00
Lajos Molnar
d6ba1cfdfb
am 35790525
: am 3a5602eb
: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
...
* commit '35790525cc756c72a44094f55970ec3b3d7e8a28':
core_base.mk: switch to new H264 and MPEG2 software codecs
2015-04-17 05:20:26 +00:00
Lajos Molnar
35790525cc
am 3a5602eb
: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
...
* commit '3a5602ebb8c365c252b6b9a6284996015d92ca33':
core_base.mk: switch to new H264 and MPEG2 software codecs
2015-04-17 05:07:58 +00:00
Lajos Molnar
3a5602ebb8
Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
2015-04-17 04:58:22 +00:00
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
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
Glenn Kasten
1efbc8996e
Fix bookmark title
...
Bug: 20299601
Change-Id: Ie57daf7b378cf370e34ff282d97fd36f2d74031a
2015-04-16 11:56:22 -07: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
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
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
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
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
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
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
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
Dan Albert
1fa6d5b0a3
am 612581e8
: am ad1961a7
: Merge "Don\'t use libunwindbacktrace for non-ARM."
...
* commit '612581e8ca8bda8c7f74e84fbb9b7859ca3b9840':
Don't use libunwindbacktrace for non-ARM.
2015-04-14 23:34:03 +00:00
Dan Albert
612581e8ca
am ad1961a7
: Merge "Don\'t use libunwindbacktrace for non-ARM."
...
* commit 'ad1961a74736e02ab16d8688ba7f41a687340bdc':
Don't use libunwindbacktrace for non-ARM.
2015-04-14 23:23:18 +00:00
Dan Albert
ad1961a747
Merge "Don't use libunwindbacktrace for non-ARM."
2015-04-14 23:17:41 +00:00
Dan Albert
803cf69926
am 5e7e6d75
: am 2d215e38
: Merge "Use libcompiler_rt-extras on the host too."
...
* commit '5e7e6d7585ff94198a5ddd891faba274cf2416d6':
Use libcompiler_rt-extras on the host too.
2015-04-14 22:48:57 +00:00
Mark Salyzyn
c506e74dc8
disttools: add liblog, libcutils and libselinux shared libraries
...
Bug: 19908228
Change-Id: I48450a9fb917408cb3bc0e41d70c0593acd2b884
2015-04-14 15:17:16 -07:00
Dan Albert
5e7e6d7585
am 2d215e38
: Merge "Use libcompiler_rt-extras on the host too."
...
* commit '2d215e38c02828c1f10ccdb205011025c4172cb6':
Use libcompiler_rt-extras on the host too.
2015-04-14 22:15:02 +00:00
Dan Albert
2d215e38c0
Merge "Use libcompiler_rt-extras on the host too."
2015-04-14 22:04:56 +00:00
Dan Albert
3e99e66213
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
2015-04-14 14:42:45 -07:00