Ying Wang
8485fb074b
am 4eec22a6
: Merge "Use a less freqent dummy file name: zipdummy"
...
* commit '4eec22a6627927aaa11a67e3e18d36534af81856':
Use a less freqent dummy file name: zipdummy
2015-02-26 18:04:07 +00:00
Ying Wang
4eec22a662
Merge "Use a less freqent dummy file name: zipdummy"
2015-02-26 17:57:58 +00:00
Ying Wang
dcd90831e5
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
2015-02-26 09:36:27 -08:00
Narayan Kamath
e886392c37
am 37a44faa
: Merge "Store native libs aligned to PAGE_SIZE"
...
* commit '37a44faa7266c8a7e0cc5077a4c028d6f5bfa7f7':
Store native libs aligned to PAGE_SIZE
2015-02-26 12:45:34 +00:00
Narayan Kamath
bc0d368896
Remove unused variables.
...
Follow up from 13e5965306
.
Change-Id: I370e52acd998ce72b4d7dbf2aba604d4b08bb0cf
2015-02-26 12:40:34 +00:00
Narayan Kamath
37a44faa72
Merge "Store native libs aligned to PAGE_SIZE"
2015-02-26 12:38:33 +00:00
Dmitriy Ivanov
13e5965306
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
2015-02-26 12:31:40 +00:00
Dan Albert
13baa31921
am 876f45e7
: Merge "Make some warnings impossible to override."
...
* commit '876f45e73f938cdaa7cfc25c43822fc6b274f105':
Make some warnings impossible to override.
2015-02-25 23:17:56 +00:00
Dan Albert
876f45e73f
Merge "Make some warnings impossible to override."
2015-02-25 23:13:13 +00:00
Elliott Hughes
2c5b6ab5ac
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.
2015-02-25 19:01:07 +00:00
Elliott Hughes
8389deee6b
Merge "mips64 should avoid common LP64 errors just like arm64 and x86-64."
2015-02-25 18:56:52 +00:00
Elliott Hughes
d1ea5fbf7b
mips64 should avoid common LP64 errors just like arm64 and x86-64.
...
Change-Id: Ibce5863bee3175671862c1889869b43bcb39a074
2015-02-24 16:04:31 -08:00
Colin Cross
841e4cf2ae
am a82f7db9
: Merge "add BUILD_NATIVE_BENCHMARK"
...
* commit 'a82f7db9006ca838fd0c474d2dcc38630ed1fa20':
add BUILD_NATIVE_BENCHMARK
2015-02-24 20:55:52 +00:00
Colin Cross
a82f7db900
Merge "add BUILD_NATIVE_BENCHMARK"
2015-02-24 20:49:56 +00:00
Elliott Hughes
36f179711d
am ca15af1b
: Merge "Turn on -Werror=implicit-function-declaration for arm64."
...
* commit 'ca15af1bcde972b6ba3546d45913c9bb51bd93b0':
Turn on -Werror=implicit-function-declaration for arm64.
2015-02-23 21:35:17 +00:00
Elliott Hughes
ca15af1bcd
Merge "Turn on -Werror=implicit-function-declaration for arm64."
2015-02-23 21:29:58 +00:00
Elliott Hughes
5081cbf009
am faeae397
: Merge "Turn on -Werror=implicit-function-declaration for x86-64."
...
* commit 'faeae3977159b0b4ca2021c4c657a090eaeb4a56':
Turn on -Werror=implicit-function-declaration for x86-64.
2015-02-23 18:29:13 +00:00
Elliott Hughes
faeae39771
Merge "Turn on -Werror=implicit-function-declaration for x86-64."
2015-02-23 18:23:24 +00:00
Dan Albert
0c91fa84ff
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
2015-02-23 10:05:51 -08:00
Ying Wang
0487ab1ec0
am 58aeaed9
: Merge "goldfish_logcat: remove permissive_or_unconfined()"
...
* commit '58aeaed9ce5c3738dd8eb36d56484a9614fb00e0':
goldfish_logcat: remove permissive_or_unconfined()
2015-02-23 17:34:38 +00:00
Ying Wang
723d003929
am aa67c0ce
: Merge "qemud: remove permissive_or_unconfined()"
...
* commit 'aa67c0ce9a9697f5ac192020ee8b75734862b129':
qemud: remove permissive_or_unconfined()
2015-02-23 17:34:37 +00:00
Ying Wang
4ca5ab5d4a
am 4be75b37
: Merge "qemu_props: remove permissive_or_unconfined()"
...
* commit '4be75b37333f22e8ce10cc8aff7e9756b2f82689':
qemu_props: remove permissive_or_unconfined()
2015-02-23 17:34:36 +00:00
Ying Wang
a65c7cf1a6
am 5d47a481
: Merge "goldfish_setup: remove permissive_or_unconfined()"
...
* commit '5d47a481fb88ca4dba853d064eb5dfd671f9b68a':
goldfish_setup: remove permissive_or_unconfined()
2015-02-23 17:34:35 +00:00
Ying Wang
58aeaed9ce
Merge "goldfish_logcat: remove permissive_or_unconfined()"
2015-02-23 17:30:50 +00:00
Ying Wang
aa67c0ce9a
Merge "qemud: remove permissive_or_unconfined()"
2015-02-23 17:30:43 +00:00
Ying Wang
4be75b3733
Merge "qemu_props: remove permissive_or_unconfined()"
2015-02-23 17:30:28 +00:00
Ying Wang
5d47a481fb
Merge "goldfish_setup: remove permissive_or_unconfined()"
2015-02-23 17:30:28 +00:00
Elliott Hughes
f5e204b3f4
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
2015-02-21 13:21:20 -08:00
Elliott Hughes
b97d8c78e2
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
2015-02-21 11:01:11 -08:00
Narayan Kamath
ae25aed3c9
am 940632f1
: Merge "Remove references to __CYGWIN__ and HAVE_WINSOCK2_H."
...
* commit '940632f1a1af056ea8f87d2fa7a0c7e22cd1556b':
Remove references to __CYGWIN__ and HAVE_WINSOCK2_H.
2015-02-21 10:15:54 +00:00
Narayan Kamath
940632f1a1
Merge "Remove references to __CYGWIN__ and HAVE_WINSOCK2_H."
2015-02-21 10:01:49 +00:00
Narayan Kamath
2fad00c56e
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
2015-02-21 09:55:05 +00:00
The Android Open Source Project
2fc439c67a
Restore AOSP-style version numbers - DO NOT MERGE
...
Change-Id: I2c81a4dacc13e4705388c3d359410c81999d7b95
2015-02-20 11:04:55 -08:00
Ying Wang
564abd1642
am 0f672c6a
: (-s ours) Merge "[DO NOT MERGE] Trim the AOSP PLATFORM_VERSION."
...
* commit '0f672c6aad22dde39a172ae0b5f0b76068008f30':
[DO NOT MERGE] Trim the AOSP PLATFORM_VERSION.
2015-02-20 00:46:40 +00:00
Ying Wang
0f672c6aad
Merge "[DO NOT MERGE] Trim the AOSP PLATFORM_VERSION."
2015-02-20 00:40:56 +00:00
Ying Wang
5bcc416d54
[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
2015-02-20 00:34:35 +00:00
Bill Yi
251412b472
Merge commit 'b89ec38113a22d09b0832ed2d3cb8fc413a14a75' into HEAD
2015-02-19 14:30:26 -08:00
Dan Albert
0badfcebe7
Merge "Remove the unsets for removed gdbclient functions."
2015-02-17 21:01:19 +00:00
Elliott Hughes
24374e5752
Merge "Remove ARCH_ARM_HAVE_TLS_REGISTER."
2015-02-17 17:47:10 +00:00
Elliott Hughes
e033c6df7d
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
2015-02-13 20:51:12 -08:00
Justin Harrison
b89ec38113
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."
2015-02-13 20:37:10 +00:00
Justin Harrison
070eea05f2
am ffd4fee9
: Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev
...
* commit 'ffd4fee911ee43fbec7b08b829d15a7593421dba':
Revert "Allow system images larger than 2GiB."
2015-02-13 20:23:29 +00:00
Justin Harrison
ffd4fee911
Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev
2015-02-13 18:48:17 +00:00
Justin Harrison
2de68bbbf4
Revert "Allow system images larger than 2GiB."
...
This reverts commit cd082d4bfe
.
Change-Id: Ie63e1ba70d907d2849164871bc7ec71c245f7af9
2015-02-13 18:47:51 +00:00
Ying Wang
95627f6e54
am a8b9a8c1
: am 1f58c417
: Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
...
* commit 'a8b9a8c1ed5e7d7e0cdc39c2c10f964b95a98e7a':
Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
2015-02-12 22:58:44 +00:00
Ying Wang
a8b9a8c1ed
am 1f58c417
: Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
...
* commit '1f58c41742b6a063138226e6483010486f56657f':
Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
2015-02-12 22:46:54 +00:00
Ying Wang
1f58c41742
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 e66d7c1de0
)
2015-02-12 22:40:24 +00:00
Dan Albert
b5a3e2fe9d
am 8f1965ed
: Merge "Remove gdbclient from envsetup."
...
* commit '8f1965ed0152c1f93358e3a424e9156b29c56813':
Remove gdbclient from envsetup.
2015-02-12 21:12:36 +00:00
Dan Albert
8f1965ed01
Merge "Remove gdbclient from envsetup."
2015-02-12 21:02:49 +00:00
Ying Wang
f5a6279c4c
am bdfec89d
: Merge "Increase BOARD_SYSTEMIMAGE_PARTITION_SIZE to 900MB for mips64."
...
* commit 'bdfec89d96819cf78faa4a61635c2ec536b4545f':
Increase BOARD_SYSTEMIMAGE_PARTITION_SIZE to 900MB for mips64.
2015-02-12 20:11:19 +00:00