OSDN Git Service
Ying Wang [Thu, 26 Feb 2015 18:04:07 +0000 (18:04 +0000)]
am
4eec22a6: Merge "Use a less freqent dummy file name: zipdummy"
* commit '
4eec22a6627927aaa11a67e3e18d36534af81856':
Use a less freqent dummy file name: zipdummy
Ying Wang [Thu, 26 Feb 2015 17:57:57 +0000 (17:57 +0000)]
Merge "Use a less freqent dummy file name: zipdummy"
Ying Wang [Thu, 26 Feb 2015 17:36:27 +0000 (09:36 -0800)]
Use a less freqent dummy file name: zipdummy
Previously if user has a directory with name dummy in the root of the
source tree, "zip -qd package.apk dummy" fails with:
"zip error: Nothing to do!".
This change mitigates the error.
Change-Id: I642e3bf0378e5b9911a068ecb72f795b3e92f1fe
Narayan Kamath [Thu, 26 Feb 2015 12:45:34 +0000 (12:45 +0000)]
am
37a44faa: Merge "Store native libs aligned to PAGE_SIZE"
* commit '
37a44faa7266c8a7e0cc5077a4c028d6f5bfa7f7':
Store native libs aligned to PAGE_SIZE
Narayan Kamath [Thu, 26 Feb 2015 12:38:33 +0000 (12:38 +0000)]
Merge "Store native libs aligned to PAGE_SIZE"
Dmitriy Ivanov [Wed, 23 Jul 2014 22:27:21 +0000 (15:27 -0700)]
Store native libs aligned to PAGE_SIZE
- Add a new flag to zipalign (-p) that page aligns shared
libraries (zip entries ending with ".so") in the archive.
- Add a new build variable LOCAL_PAGE_ALIGN_SHARED_LIBRARIES
to turn on this behaviour in zipalign.
- Add a new LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS to control
zip behaviour.
Bug:
8076853
Bug:
19330157
Co-Authored-By: Simon Baldwin <simonb@google.com>
Co-Authored-By: Dimitry Ivanov <dimitry@google.com>
Change-Id: I1aa2c039bb2a590ae72f256acc9ba5401c2c59b1
Dan Albert [Wed, 25 Feb 2015 23:17:56 +0000 (23:17 +0000)]
am
876f45e7: Merge "Make some warnings impossible to override."
* commit '
876f45e73f938cdaa7cfc25c43822fc6b274f105':
Make some warnings impossible to override.
Dan Albert [Wed, 25 Feb 2015 23:13:12 +0000 (23:13 +0000)]
Merge "Make some warnings impossible to override."
Elliott Hughes [Wed, 25 Feb 2015 19:01:07 +0000 (19:01 +0000)]
am
8389deee: Merge "mips64 should avoid common LP64 errors just like arm64 and x86-64."
* commit '
8389deee6b355f7dd6b1ff3579179414c6a41e5c':
mips64 should avoid common LP64 errors just like arm64 and x86-64.
Elliott Hughes [Wed, 25 Feb 2015 18:56:52 +0000 (18:56 +0000)]
Merge "mips64 should avoid common LP64 errors just like arm64 and x86-64."
Elliott Hughes [Wed, 25 Feb 2015 00:04:31 +0000 (16:04 -0800)]
mips64 should avoid common LP64 errors just like arm64 and x86-64.
Change-Id: Ibce5863bee3175671862c1889869b43bcb39a074
Colin Cross [Tue, 24 Feb 2015 20:55:52 +0000 (20:55 +0000)]
am
a82f7db9: Merge "add BUILD_NATIVE_BENCHMARK"
* commit '
a82f7db9006ca838fd0c474d2dcc38630ed1fa20':
add BUILD_NATIVE_BENCHMARK
Colin Cross [Tue, 24 Feb 2015 20:49:55 +0000 (20:49 +0000)]
Merge "add BUILD_NATIVE_BENCHMARK"
Elliott Hughes [Mon, 23 Feb 2015 21:35:17 +0000 (21:35 +0000)]
am
ca15af1b: Merge "Turn on -Werror=implicit-function-declaration for arm64."
* commit '
ca15af1bcde972b6ba3546d45913c9bb51bd93b0':
Turn on -Werror=implicit-function-declaration for arm64.
Elliott Hughes [Mon, 23 Feb 2015 21:29:58 +0000 (21:29 +0000)]
Merge "Turn on -Werror=implicit-function-declaration for arm64."
Elliott Hughes [Mon, 23 Feb 2015 18:29:13 +0000 (18:29 +0000)]
am
faeae397: Merge "Turn on -Werror=implicit-function-declaration for x86-64."
* commit '
faeae3977159b0b4ca2021c4c657a090eaeb4a56':
Turn on -Werror=implicit-function-declaration for x86-64.
Elliott Hughes [Mon, 23 Feb 2015 18:23:24 +0000 (18:23 +0000)]
Merge "Turn on -Werror=implicit-function-declaration for x86-64."
Dan Albert [Sat, 21 Feb 2015 20:45:26 +0000 (12:45 -0800)]
Make some warnings impossible to override.
These CFLAGS and CPPFLAGS will always be added last, and are
controlled by the build system. This way we can add warnings that
users are not allowed to disable.
Change-Id: Id71f69249078f62ca2687ecbf764aff0fd3a1c1b
Ying Wang [Mon, 23 Feb 2015 17:34:38 +0000 (17:34 +0000)]
am
58aeaed9: Merge "goldfish_logcat: remove permissive_or_unconfined()"
* commit '
58aeaed9ce5c3738dd8eb36d56484a9614fb00e0':
goldfish_logcat: remove permissive_or_unconfined()
Ying Wang [Mon, 23 Feb 2015 17:34:37 +0000 (17:34 +0000)]
am
aa67c0ce: Merge "qemud: remove permissive_or_unconfined()"
* commit '
aa67c0ce9a9697f5ac192020ee8b75734862b129':
qemud: remove permissive_or_unconfined()
Ying Wang [Mon, 23 Feb 2015 17:34:36 +0000 (17:34 +0000)]
am
4be75b37: Merge "qemu_props: remove permissive_or_unconfined()"
* commit '
4be75b37333f22e8ce10cc8aff7e9756b2f82689':
qemu_props: remove permissive_or_unconfined()
Ying Wang [Mon, 23 Feb 2015 17:34:35 +0000 (17:34 +0000)]
am
5d47a481: Merge "goldfish_setup: remove permissive_or_unconfined()"
* commit '
5d47a481fb88ca4dba853d064eb5dfd671f9b68a':
goldfish_setup: remove permissive_or_unconfined()
Ying Wang [Mon, 23 Feb 2015 17:30:50 +0000 (17:30 +0000)]
Merge "goldfish_logcat: remove permissive_or_unconfined()"
Ying Wang [Mon, 23 Feb 2015 17:30:42 +0000 (17:30 +0000)]
Merge "qemud: remove permissive_or_unconfined()"
Ying Wang [Mon, 23 Feb 2015 17:30:27 +0000 (17:30 +0000)]
Merge "qemu_props: remove permissive_or_unconfined()"
Ying Wang [Mon, 23 Feb 2015 17:30:20 +0000 (17:30 +0000)]
Merge "goldfish_setup: remove permissive_or_unconfined()"
Elliott Hughes [Sat, 21 Feb 2015 21:21:20 +0000 (13:21 -0800)]
Turn on -Werror=implicit-function-declaration for arm64.
Implicit function declarations are much more dangerous on LP64 because
sizeof(int) != sizeof(void*), so any function that returns a pointer will
lose its top bits, leading to relatively hard to debug crashes.
Change-Id: Ia05beffb949ca747833c2e12c40daf896f7a60a5
Elliott Hughes [Sat, 21 Feb 2015 19:01:11 +0000 (11:01 -0800)]
Turn on -Werror=implicit-function-declaration for x86-64.
Implicit function declarations are much more dangerous on LP64 because
sizeof(int) != sizeof(void*), so any function that returns a pointer will
lose its top bits, leading to relatively hard to debug crashes.
Change-Id: Ib2570326dde1b1cde09c63c9b4c973d741528ee2
Narayan Kamath [Sat, 21 Feb 2015 10:15:54 +0000 (10:15 +0000)]
am
940632f1: Merge "Remove references to __CYGWIN__ and HAVE_WINSOCK2_H."
* commit '
940632f1a1af056ea8f87d2fa7a0c7e22cd1556b':
Remove references to __CYGWIN__ and HAVE_WINSOCK2_H.
Narayan Kamath [Sat, 21 Feb 2015 10:01:48 +0000 (10:01 +0000)]
Merge "Remove references to __CYGWIN__ and HAVE_WINSOCK2_H."
Narayan Kamath [Fri, 20 Feb 2015 17:04:10 +0000 (17:04 +0000)]
Remove references to __CYGWIN__ and HAVE_WINSOCK2_H.
We don't support platform builds under CYGWIN and can safely
assume that all windows host builds are for MinGW32.
HAVE_WINSOCK2_H is currently unused. The only references to it
are in code that define it themselves or in application code that
by definition isn't compiled for windows.
Change-Id: I236d6e070df93f713cb716bb8a461c9c1d32a180
The Android Open Source Project [Fri, 20 Feb 2015 19:04:55 +0000 (11:04 -0800)]
Restore AOSP-style version numbers - DO NOT MERGE
Change-Id: I2c81a4dacc13e4705388c3d359410c81999d7b95
Ying Wang [Fri, 20 Feb 2015 00:46:40 +0000 (00:46 +0000)]
am
0f672c6a: (-s ours) Merge "[DO NOT MERGE] Trim the AOSP PLATFORM_VERSION."
* commit '
0f672c6aad22dde39a172ae0b5f0b76068008f30':
[DO NOT MERGE] Trim the AOSP PLATFORM_VERSION.
Ying Wang [Fri, 20 Feb 2015 00:40:55 +0000 (00:40 +0000)]
Merge "[DO NOT MERGE] Trim the AOSP PLATFORM_VERSION."
Ying Wang [Fri, 20 Feb 2015 00:21:47 +0000 (16:21 -0800)]
[DO NOT MERGE] Trim the AOSP PLATFORM_VERSION.
With the long PLATFORM_VERSION, if you have also a long device/product
name and/or a long username, ro.build.fingerprint can easily exceed the
system property's length limit of 92 bytes.
This mitigates the risk a little bit.
Bug:
15593959
Change-Id: I9e316025227b30aa6887c9ce0065364fdbb9fc8f
Bill Yi [Thu, 19 Feb 2015 22:30:26 +0000 (14:30 -0800)]
Dan Albert [Tue, 17 Feb 2015 21:01:18 +0000 (21:01 +0000)]
Merge "Remove the unsets for removed gdbclient functions."
Elliott Hughes [Tue, 17 Feb 2015 17:47:09 +0000 (17:47 +0000)]
Merge "Remove ARCH_ARM_HAVE_TLS_REGISTER."
Elliott Hughes [Sat, 14 Feb 2015 04:51:12 +0000 (20:51 -0800)]
Remove ARCH_ARM_HAVE_TLS_REGISTER.
This was only needed for platform builds, and was removed in the gap between
armv5 being removed and being added back again for tapas builds. Otherwise it
would have been removed back then.
(I suspect that we don't need the system.prop file in here, either, but I
don't really know how to test that.)
Change-Id: I212ff7b3568b5d5ff3cc66150ec7c4fa0b8cac92
Justin Harrison [Fri, 13 Feb 2015 20:37:10 +0000 (20:37 +0000)]
am
070eea05: am
ffd4fee9: Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev
* commit '
070eea05f2f2d47aa873fd1e79160eb8529a0eb8':
Revert "Allow system images larger than 2GiB."
Justin Harrison [Fri, 13 Feb 2015 20:23:29 +0000 (20:23 +0000)]
am
ffd4fee9: Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev
* commit '
ffd4fee911ee43fbec7b08b829d15a7593421dba':
Revert "Allow system images larger than 2GiB."
Justin Harrison [Fri, 13 Feb 2015 18:48:17 +0000 (18:48 +0000)]
Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev
Justin Harrison [Fri, 13 Feb 2015 18:47:51 +0000 (18:47 +0000)]
Revert "Allow system images larger than 2GiB."
This reverts commit
cd082d4bfe917b2e6b97436839cbbbc67c733c83.
Change-Id: Ie63e1ba70d907d2849164871bc7ec71c245f7af9
Ying Wang [Thu, 12 Feb 2015 22:58:44 +0000 (22:58 +0000)]
am
a8b9a8c1: am
1f58c417: Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
* commit '
a8b9a8c1ed5e7d7e0cdc39c2c10f964b95a98e7a':
Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
Ying Wang [Thu, 12 Feb 2015 22:46:54 +0000 (22:46 +0000)]
am
1f58c417: Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
* commit '
1f58c41742b6a063138226e6483010486f56657f':
Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
Ying Wang [Thu, 12 Feb 2015 19:29:41 +0000 (11:29 -0800)]
Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
Package up LOCAL_PREBUILT_JNI_LIBS when you do tapas (apps_only) build.
Change-Id: Ibdc920fee22d4940eebee080a940e8e9492c06cb
(cherry picked from commit
e66d7c1de0a888785cdbf697bebe53be7ed83380)
Dan Albert [Thu, 12 Feb 2015 21:12:36 +0000 (21:12 +0000)]
am
8f1965ed: Merge "Remove gdbclient from envsetup."
* commit '
8f1965ed0152c1f93358e3a424e9156b29c56813':
Remove gdbclient from envsetup.
Dan Albert [Thu, 12 Feb 2015 21:02:49 +0000 (21:02 +0000)]
Merge "Remove gdbclient from envsetup."
Ying Wang [Thu, 12 Feb 2015 20:11:19 +0000 (20:11 +0000)]
am
bdfec89d: Merge "Increase BOARD_SYSTEMIMAGE_PARTITION_SIZE to 900MB for mips64."
* commit '
bdfec89d96819cf78faa4a61635c2ec536b4545f':
Increase BOARD_SYSTEMIMAGE_PARTITION_SIZE to 900MB for mips64.
Ying Wang [Thu, 12 Feb 2015 19:58:39 +0000 (19:58 +0000)]
Merge "Increase BOARD_SYSTEMIMAGE_PARTITION_SIZE to 900MB for mips64."
Dan Albert [Thu, 12 Feb 2015 19:30:06 +0000 (11:30 -0800)]
Remove the unsets for removed gdbclient functions.
Change-Id: I6bb8b42dbc7ac45bec6b8267733f9b4d6212315f
Dan Albert [Thu, 12 Feb 2015 19:14:39 +0000 (11:14 -0800)]
Remove gdbclient from envsetup.
gdbclient is being promoted to a real script:
https://android-review.googlesource.com/#/c/131831/
Change-Id: I4bb70ad44cec0ebf62d9e8e355c22ed8b708868b
JP Abgrall [Thu, 12 Feb 2015 04:05:03 +0000 (20:05 -0800)]
resolved conflicts for merge of
7fc55db3 to lmp-mr1-dev-plus-aosp
Change-Id: I27b9c65d654d4cc8b806043de0ebaa5dbf7b7a7c
JP Abgrall [Thu, 12 Feb 2015 01:53:41 +0000 (01:53 +0000)]
Merge "core: remove dependencies on genext2fs"
bohu [Thu, 12 Feb 2015 01:16:22 +0000 (01:16 +0000)]
am
d857abd1: am
151205c3: Merge "Bump generic_mips and generic_x86_64 system partition size" into lmp-mr1-dev
* commit '
d857abd1ff8b3436d15765e93b0d4d0ec1a9147a':
Bump generic_mips and generic_x86_64 system partition size
bohu [Thu, 12 Feb 2015 01:04:48 +0000 (01:04 +0000)]
am
151205c3: Merge "Bump generic_mips and generic_x86_64 system partition size" into lmp-mr1-dev
* commit '
151205c37fc14201cf9be99e5083d467075a1ba0':
Bump generic_mips and generic_x86_64 system partition size
bohu [Thu, 12 Feb 2015 00:59:27 +0000 (00:59 +0000)]
Merge "Bump generic_mips and generic_x86_64 system partition size" into lmp-mr1-dev
bohu [Thu, 12 Feb 2015 00:51:54 +0000 (16:51 -0800)]
Bump generic_mips and generic_x86_64 system partition size
This fixes the sdk_google_phone_mips and sdk_google_phone_x86-64
builds
Change-Id: I971d02b07a6aa917d7e0f3750b48e657205aae52
JP Abgrall [Wed, 11 Feb 2015 23:04:59 +0000 (15:04 -0800)]
core: remove dependencies on genext2fs
We don't use EXT2 for bootimage anymore.
This will allow getting rid of external/genext2fs
Bug:
19282953
Change-Id: Ie56528c7877036d2501a09888a4420637f9cd647
smain@google.com [Tue, 10 Feb 2015 23:21:02 +0000 (23:21 +0000)]
am
19b8c2f7: am
8cde3e71: am
cf80e847: am
d162be5b: change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
* commit '
19b8c2f776036288dfad8983e38419c3d4316fc9':
change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
Stephen Smalley [Tue, 10 Feb 2015 22:29:01 +0000 (17:29 -0500)]
qemud: remove permissive_or_unconfined()
Change-Id: Ia15cf87de1d03364f80d3d0cbc546475abfef448
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Stephen Smalley [Tue, 10 Feb 2015 22:28:41 +0000 (17:28 -0500)]
qemu_props: remove permissive_or_unconfined()
Change-Id: I29f37822ccac22dd884d88f9dcd23237b5a3e2de
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Stephen Smalley [Tue, 10 Feb 2015 22:28:11 +0000 (17:28 -0500)]
goldfish_setup: remove permissive_or_unconfined()
Change-Id: I3b44f24554f288f4fb1e18a53fa68e8a7cd8c8c7
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Stephen Smalley [Tue, 10 Feb 2015 22:27:41 +0000 (17:27 -0500)]
goldfish_logcat: remove permissive_or_unconfined()
Change-Id: I1a26b07bf723c944c7dcb8beec96537500a3bc60
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Douglas Leung [Tue, 10 Feb 2015 19:54:02 +0000 (11:54 -0800)]
Increase BOARD_SYSTEMIMAGE_PARTITION_SIZE to 900MB for mips64.
This is needed to build mips64 ART in quick mode.
Change-Id: I8a9e62389a3d4edb84bf1d6814d6594565bc98ba
smain@google.com [Tue, 10 Feb 2015 19:19:33 +0000 (19:19 +0000)]
am
8cde3e71: am
cf80e847: am
d162be5b: change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
* commit '
8cde3e71e77472b70da6e810ec1e12c30243ef61':
change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
smain@google.com [Tue, 10 Feb 2015 19:12:49 +0000 (19:12 +0000)]
am
cf80e847: am
d162be5b: change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
* commit '
cf80e8479bc71538902ac07df91fff8d544a174e':
change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
smain@google.com [Tue, 10 Feb 2015 19:05:42 +0000 (19:05 +0000)]
am
d162be5b: change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
* commit '
d162be5b5f65ba0311374242d48303f120398d48':
change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
Andres Morales [Tue, 10 Feb 2015 16:52:58 +0000 (16:52 +0000)]
am
b5df7d48: Merge "Add version strings from android-info.txt into build.prop"
* commit '
b5df7d483772d1dd08a1d5c8614f38a79e43ec12':
Add version strings from android-info.txt into build.prop
Andres Morales [Mon, 9 Feb 2015 22:45:56 +0000 (22:45 +0000)]
Merge "Add version strings from android-info.txt into build.prop"
Andres Morales [Fri, 6 Feb 2015 18:12:55 +0000 (10:12 -0800)]
Add version strings from android-info.txt into build.prop
Allows runtime checking of expected baseband/bootloader.
Change-Id: Iccb053fee5f72f4e082a5c3482c0710b13ee7eb8
Jesse Zhao [Sat, 7 Feb 2015 00:06:13 +0000 (00:06 +0000)]
am
c6af9b8f: am
28b2b00a: Merge "Update vendor fingerprint." into lmp-mr1-dev
* commit '
c6af9b8f4a09cc4208ad119218f57022d6fead5b':
Update vendor fingerprint.
Dan Albert [Sat, 7 Feb 2015 00:06:10 +0000 (00:06 +0000)]
am
3907eaf8: am
cd082d4b: Allow system images larger than 2GiB.
* commit '
3907eaf8b7c6f7209c4cb11a6b8b66a34f292151':
Allow system images larger than 2GiB.
Jesse Zhao [Fri, 6 Feb 2015 22:27:27 +0000 (22:27 +0000)]
am
28b2b00a: Merge "Update vendor fingerprint." into lmp-mr1-dev
* commit '
28b2b00adb7b77a5a6e5654e078c887ed5a425aa':
Update vendor fingerprint.
Jesse Zhao [Fri, 6 Feb 2015 22:21:06 +0000 (22:21 +0000)]
Merge "Update vendor fingerprint." into lmp-mr1-dev
Dan Albert [Fri, 6 Feb 2015 21:41:09 +0000 (21:41 +0000)]
am
cd082d4b: Allow system images larger than 2GiB.
* commit '
cd082d4bfe917b2e6b97436839cbbbc67c733c83':
Allow system images larger than 2GiB.
Dan Albert [Tue, 27 Jan 2015 23:53:15 +0000 (15:53 -0800)]
Allow system images larger than 2GiB.
Python 2.7's zipfile implementation wrongly thinks that zip64 is
required for files larger than 2GiB. We can work around this by
adjusting their limit. Note that `zipfile.writestr()` will not work
for strings larger than 2GiB. The Python interpreter sometimes rejects
strings that large (though it isn't clear to me exactly what
circumstances cause this). `zipfile.write()` must be used directly to
work around this.
This mess can be avoided if we port to python3.
Bug:
18015246
Change-Id: I8a476d99c5efdef6ea408373b706e9fbd3a798be
Andres Morales [Fri, 6 Feb 2015 18:23:12 +0000 (18:23 +0000)]
am
b998054f: Merge "Add system/build.prop dependency on vendor/bootimg"
* commit '
b998054f50043c23e8599ee3cfae058ac378c5cb':
Add system/build.prop dependency on vendor/bootimg
Andres Morales [Fri, 6 Feb 2015 18:11:29 +0000 (18:11 +0000)]
Merge "Add system/build.prop dependency on vendor/bootimg"
Jesse Zhao [Fri, 6 Feb 2015 17:49:55 +0000 (09:49 -0800)]
Update vendor fingerprint.
Change-Id: I5d4abdff8b7b13e01271440f4d4f2ffe1b015b71
Bug:
19257598
smain@google.com [Thu, 5 Feb 2015 21:27:16 +0000 (13:27 -0800)]
change video analytics to distinguish between start and resume events.
also scrub out any additional parameters from the videoId before passing to analytics
Change-Id: Idf3351028e62d0d03c0f680a904bb83ef8353797
Andres Morales [Thu, 5 Feb 2015 20:42:43 +0000 (12:42 -0800)]
Add system/build.prop dependency on vendor/bootimg
When incremental builds only affect the system partition,
the build.prop file for other partitions might go out of
date.
Add a dependency on system/build.prop s.t. when
it's rebuilt,
the fingerprints are updated on the other
partition's build.prop's.
Bug:
19058575
Change-Id: Iea7b761e0800c402eb4ce1154e8f6af5a17f7b06
Elliott Hughes [Thu, 5 Feb 2015 18:47:25 +0000 (18:47 +0000)]
am
9edd7649: Merge "Remove mkyaffs2image references."
* commit '
9edd76494d4378bd740dd22a2eb4f5d0eb0db40f':
Remove mkyaffs2image references.
Elliott Hughes [Thu, 5 Feb 2015 18:47:21 +0000 (18:47 +0000)]
am
ed556858: Merge "Make sure we keep building grep now it\'s broken out from toolbox."
* commit '
ed556858262a7311f0145f1d1c605f7cec7c18c4':
Make sure we keep building grep now it's broken out from toolbox.
Elliott Hughes [Thu, 5 Feb 2015 04:04:42 +0000 (04:04 +0000)]
Merge "Remove mkyaffs2image references."
Elliott Hughes [Thu, 5 Feb 2015 03:58:09 +0000 (19:58 -0800)]
Remove mkyaffs2image references.
Change-Id: I1d112515bc92353a5b48ec668e1cadfb51ecdaad
Elliott Hughes [Thu, 5 Feb 2015 03:35:48 +0000 (03:35 +0000)]
Merge "Make sure we keep building grep now it's broken out from toolbox."
Elliott Hughes [Thu, 5 Feb 2015 02:55:53 +0000 (18:55 -0800)]
Make sure we keep building grep now it's broken out from toolbox.
Change-Id: Ib71e37c5ba238136a9790cd92ecec745e099341e
Ying Wang [Thu, 5 Feb 2015 02:31:30 +0000 (02:31 +0000)]
am
d51b0fd3: Merge "Fail even dev build when property value exceeds length limit."
* commit '
d51b0fd3e4b3b39a36019bb1cd06fe29979f4ee8':
Fail even dev build when property value exceeds length limit.
Ying Wang [Wed, 4 Feb 2015 23:33:19 +0000 (23:33 +0000)]
Merge "Fail even dev build when property value exceeds length limit."
Ying Wang [Wed, 4 Feb 2015 23:10:59 +0000 (15:10 -0800)]
Fail even dev build when property value exceeds length limit.
Let developers know the issue earlier when they set up new
products.
Change-Id: I3f2ecbc3a833c1a8a84bd75407a5c035e5fea70a
Ying Wang [Wed, 4 Feb 2015 19:28:56 +0000 (11:28 -0800)]
resolved conflicts for merge of
4c178ebc to lmp-mr1-dev-plus-aosp
Change-Id: If84527e9333b855d406dc7ac317868f4cfd3f1f2
Ying Wang [Wed, 4 Feb 2015 19:08:09 +0000 (19:08 +0000)]
Merge "Remove support of factory ramdisk/bundle."
Ying Wang [Wed, 4 Feb 2015 18:56:33 +0000 (10:56 -0800)]
Remove support of factory ramdisk/bundle.
Bug:
18779515
Change-Id: Ia6d51d43965447e2e95944a7d2b4b41adb121cb7
Ying Wang [Tue, 3 Feb 2015 19:43:52 +0000 (19:43 +0000)]
am
4d0f56fb: Merge "Disable transitive dependency library symbol resolving for mips."
* commit '
4d0f56fba3cb89d871e1277d9314da12406394e5':
Disable transitive dependency library symbol resolving for mips.
Ying Wang [Tue, 3 Feb 2015 19:30:16 +0000 (19:30 +0000)]
Merge "Disable transitive dependency library symbol resolving for mips."
Ying Wang [Tue, 3 Feb 2015 18:58:50 +0000 (10:58 -0800)]
Disable transitive dependency library symbol resolving for mips.
The transitive symbol resolving causes build breakage when a binary
linked against NDK has indirect dependency on platform libraries, or
vice versa.
Change-Id: Idbfe76079c1db14eb1156d0f396e13d26f0ff582
Ying Wang [Sat, 31 Jan 2015 00:57:37 +0000 (16:57 -0800)]
resolved conflicts for merge of
5cb4276e to lmp-mr1-dev-plus-aosp
Change-Id: Ia7f011f24276e7e8e045a2544e5dff2b758b1c62
Ying Wang [Sat, 31 Jan 2015 00:33:05 +0000 (00:33 +0000)]
Merge "Add target recoveryimage-nodeps."
Ying Wang [Fri, 30 Jan 2015 22:05:22 +0000 (14:05 -0800)]
Add target recoveryimage-nodeps.
Change-Id: Ie7d11ae8f40260bf23481931c18523895c87ebd7