OSDN Git Service
Ying Wang [Thu, 26 Feb 2015 23:37:48 +0000 (23:37 +0000)]
am
8b321d91: am
0e36bfeb: Use ALL_MODULES..INSTALLED in modules-for-tag-list
* commit '
8b321d917616360e9b527d9d6428b6acbbcb816e':
Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list
Ying Wang [Thu, 26 Feb 2015 23:16:21 +0000 (23:16 +0000)]
am
0e36bfeb: Use ALL_MODULES..INSTALLED in modules-for-tag-list
* commit '
0e36bfeb3ffc78658cda3ca6931c66fe3f5b3d3b':
Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list
Ying Wang [Tue, 18 Nov 2014 20:41:53 +0000 (12:41 -0800)]
Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list
Previously we store tag's installed modules in a separate variable
ALL_MODULE_TAGS.$(tag). However we only record the main installed file
for a module, but omit affiliated files like .odex.
With this change, we handle the tagged module the same way as modules in
PRODUCT_PACKAGES.
Change-Id: I7972528a4df5a4ba8bc98930864da9672d32d7fe
Ying Wang [Thu, 26 Feb 2015 18:11:36 +0000 (18:11 +0000)]
am
8485fb07: am
4eec22a6: Merge "Use a less freqent dummy file name: zipdummy"
* commit '
8485fb074bb1b751224b167273de0f443b94680f':
Use a less freqent dummy file name: zipdummy
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:51:28 +0000 (12:51 +0000)]
am
e886392c: am
37a44faa: Merge "Store native libs aligned to PAGE_SIZE"
* commit '
e886392c37a24e25ee1b0e439d74e9b07df2d608':
Store native libs aligned to PAGE_SIZE
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:24:35 +0000 (23:24 +0000)]
am
13baa319: am
876f45e7: Merge "Make some warnings impossible to override."
* commit '
13baa3192149a8a1de5885c8a85f95155ff5d83d':
Make some warnings impossible to override.
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:08:05 +0000 (19:08 +0000)]
am
2c5b6ab5: am
8389deee: Merge "mips64 should avoid common LP64 errors just like arm64 and x86-64."
* commit '
2c5b6ab5ac5465d8d85bec748b5486b58c514637':
mips64 should avoid common LP64 errors just like arm64 and x86-64.
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."
Colin Cross [Wed, 25 Feb 2015 16:52:13 +0000 (16:52 +0000)]
am
841e4cf2: am
a82f7db9: Merge "add BUILD_NATIVE_BENCHMARK"
* commit '
841e4cf2aedda764161ed82a882a945137453b34':
add BUILD_NATIVE_BENCHMARK
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:40:51 +0000 (21:40 +0000)]
am
36f17971: am
ca15af1b: Merge "Turn on -Werror=implicit-function-declaration for arm64."
* commit '
36f179711dfc015d61873b54417622c695185b2d':
Turn on -Werror=implicit-function-declaration for arm64.
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:32:45 +0000 (18:32 +0000)]
am
5081cbf0: am
faeae397: Merge "Turn on -Werror=implicit-function-declaration for x86-64."
* commit '
5081cbf009d45c6cd5c031687bbc623dfca6ebb1':
Turn on -Werror=implicit-function-declaration for x86-64.
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:41:16 +0000 (17:41 +0000)]
am
0487ab1e: am
58aeaed9: Merge "goldfish_logcat: remove permissive_or_unconfined()"
* commit '
0487ab1ec0097d6c617a13f19609f58c6a5987c0':
goldfish_logcat: remove permissive_or_unconfined()
Ying Wang [Mon, 23 Feb 2015 17:41:15 +0000 (17:41 +0000)]
am
723d0039: am
aa67c0ce: Merge "qemud: remove permissive_or_unconfined()"
* commit '
723d003929b1ac7fc2dd5eebbecfc7e00fdc657d':
qemud: remove permissive_or_unconfined()
Ying Wang [Mon, 23 Feb 2015 17:41:14 +0000 (17:41 +0000)]
am
4ca5ab5d: am
4be75b37: Merge "qemu_props: remove permissive_or_unconfined()"
* commit '
4ca5ab5d4a51603ac7c33b2540d13184394e5ed9':
qemu_props: remove permissive_or_unconfined()
Ying Wang [Mon, 23 Feb 2015 17:41:13 +0000 (17:41 +0000)]
am
a65c7cf1: am
5d47a481: Merge "goldfish_setup: remove permissive_or_unconfined()"
* commit '
a65c7cf1a61e5915bb2d71c68952d55bb75f01fa':
goldfish_setup: remove permissive_or_unconfined()
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:19:53 +0000 (10:19 +0000)]
am
ae25aed3: am
940632f1: Merge "Remove references to __CYGWIN__ and HAVE_WINSOCK2_H."
* commit '
ae25aed3c9322b7b9a054f1d1308174a6f8db2e2':
Remove references to __CYGWIN__ and HAVE_WINSOCK2_H.
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
Ying Wang [Fri, 20 Feb 2015 20:00:56 +0000 (20:00 +0000)]
am
e9a2d8eb: am
56dedc22: am
dae9bb50: am
64f0f2ad: am
f7cb5fc2: am
1c2ca593: am
289c9563: am
6be36e0c: am
7447c516: am
89a0e52e: am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variab
* commit '
e9a2d8eb03f8afadcdee283b7ad8c93a2a8191e1':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 19:50:27 +0000 (19:50 +0000)]
am
56dedc22: am
dae9bb50: am
64f0f2ad: am
f7cb5fc2: am
1c2ca593: am
289c9563: am
6be36e0c: am
7447c516: am
89a0e52e: am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the bui
* commit '
56dedc22ba137be34e0f82e097d1bdf5cd99ceed':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 19:45:47 +0000 (19:45 +0000)]
am
dae9bb50: am
64f0f2ad: am
f7cb5fc2: am
1c2ca593: am
289c9563: am
6be36e0c: am
7447c516: am
89a0e52e: am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
dae9bb50a5e733221a23c8d7458165cdf34028fc':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 19:38:32 +0000 (19:38 +0000)]
am
64f0f2ad: am
f7cb5fc2: am
1c2ca593: am
289c9563: am
6be36e0c: am
7447c516: am
89a0e52e: am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
64f0f2ad235f1020a0f75dd91cbef9e5a622cc28':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 19:32:39 +0000 (19:32 +0000)]
am
f7cb5fc2: am
1c2ca593: am
289c9563: am
6be36e0c: am
7447c516: am
89a0e52e: am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
f7cb5fc2b1c38e7b12c1bb9ae348e048be3d2eeb':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 19:24:41 +0000 (19:24 +0000)]
am
1c2ca593: am
289c9563: am
6be36e0c: am
7447c516: am
89a0e52e: am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
1c2ca59317b193d0aaaebdd8c8b7c5aefcbecc3d':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 19:19:18 +0000 (19:19 +0000)]
am
289c9563: am
6be36e0c: am
7447c516: am
89a0e52e: am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
289c9563e396f9b9d49487dc8807318fc7542549':
We shouldn't use temporary variable in the build recipe.
The Android Open Source Project [Fri, 20 Feb 2015 19:15:44 +0000 (19:15 +0000)]
am
2fc439c6: (-s ours) Restore AOSP-style version numbers - DO NOT MERGE
* commit '
2fc439c67a1ad8f16177ef2d916aee7773edd7f2':
Restore AOSP-style version numbers - DO NOT MERGE
Ying Wang [Fri, 20 Feb 2015 19:09:45 +0000 (19:09 +0000)]
am
6be36e0c: am
7447c516: am
89a0e52e: am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
6be36e0c5eb9ff65727b8f90591ba594deb040b4':
We shouldn't use temporary variable in the build recipe.
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 19:00:00 +0000 (19:00 +0000)]
am
7447c516: am
89a0e52e: am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
7447c516722041d8df4cf18571f148aac6a57eb9':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:53:06 +0000 (18:53 +0000)]
am
89a0e52e: am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
89a0e52e4097b2a080292ae65d39db05aceed500':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:45:36 +0000 (18:45 +0000)]
am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
01b35afe186050fd6140ad758a18ce13c9008c22':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:38:29 +0000 (18:38 +0000)]
am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
a9c86ef0959b50043503ab39608ab25c7cdc94b2':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:32:20 +0000 (18:32 +0000)]
am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
f7bb2237c72d668068c6af0234311aeb096a2af2':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:28:48 +0000 (18:28 +0000)]
am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
f2ac06828e41578bd13434fee7fcfee0f76419f9':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:23:29 +0000 (18:23 +0000)]
am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
7eba7cc49b527d6d6605810c1de497c4477db03f':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:18:07 +0000 (18:18 +0000)]
am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
fe3eeb8cf0fd03d020a0b49c4def441056eae157':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:13:23 +0000 (18:13 +0000)]
am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
c5ec654c6edb01c129c5371321fba1cc6e28940d':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:05:42 +0000 (18:05 +0000)]
am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
c646bbfbd6e5d9ea1826199ca43aae1f922074dc':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 22 Feb 2013 17:59:17 +0000 (09:59 -0800)]
We shouldn't use temporary variable in the build recipe.
Use $@ instead.
Change-Id: Ida0960a453b3701383a31f698c3163a297c4bce5
(cherry picked from commit
b8a256a1facdae5b803335daf3c02af159749ab4)
Ying Wang [Fri, 20 Feb 2015 00:50:10 +0000 (00:50 +0000)]
am
564abd16: (-s ours) am
0f672c6a: (-s ours) Merge "[DO NOT MERGE] Trim the AOSP PLATFORM_VERSION."
* commit '
564abd1642fc3584a82d2737d053f9a50c5d0cae':
[DO NOT MERGE] Trim the AOSP PLATFORM_VERSION.
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 [Fri, 20 Feb 2015 00:22:52 +0000 (00:22 +0000)]
Bill Yi [Thu, 19 Feb 2015 22:30:26 +0000 (14:30 -0800)]
Dan Albert [Tue, 17 Feb 2015 21:13:24 +0000 (21:13 +0000)]
am
0badfceb: Merge "Remove the unsets for removed gdbclient functions."
* commit '
0badfcebe71805a495d151ac4df48bb48940bde0':
Remove the unsets for removed gdbclient functions.
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:58:49 +0000 (17:58 +0000)]
am
24374e57: Merge "Remove ARCH_ARM_HAVE_TLS_REGISTER."
* commit '
24374e575285e1f7950293469bca7a3410e46fea':
Remove ARCH_ARM_HAVE_TLS_REGISTER.
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>
OSDN Git Service
