Commit Graph

6571 Commits

Author SHA1 Message Date
Ying Wang
850e0b3aff am edab98a4: Merge "Catch more cases of static host executables."
* commit 'edab98a40a0954789c21eaf6c122c99be2ce2d99':
  Catch more cases of static host executables.
2015-03-04 03:28:53 +00:00
Mohamad Ayyash
b97746ef09 Allow flashing a squashfs system image
Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-03-03 18:54:50 -08:00
Dan Albert
b5eb905729 Catch more cases of static host executables.
Bug: 19567451
Change-Id: Ie1de436db74b727421449b43b192e9599ca8fca6
2015-03-03 18:30:27 -08:00
Dan Albert
4162cc606c am 21b75e26: am d52afdd6: Merge "(Hopefully) fix the Mac build."
* commit '21b75e269e13f4e8ccec001d9de676c1d64e4644':
  (Hopefully) fix the Mac build.
2015-03-04 01:57:06 +00:00
Dan Albert
21b75e269e am d52afdd6: Merge "(Hopefully) fix the Mac build."
* commit 'd52afdd682b26ea6a13c066d6f037c9df6693489':
  (Hopefully) fix the Mac build.
2015-03-04 01:50:21 +00:00
Dan Albert
4f2afde252 (Hopefully) fix the Mac build.
The Mac linker doesn't understand --start-group, which is needed for
properly linking libgcc/libc statically. It isn't needed for dynamic
executables though, so use that driver behavior where appropriate.

Bug: 19567451
Change-Id: Ifeb03bea55bc87561c64ddafdb99f664fef0f00e
2015-03-03 17:42:28 -08:00
Dan Albert
619c52124b am 94451789: am cfafe554: Merge "Fix building static host executables."
* commit '94451789f4ec9d0ea884c0af4856aa846bc71d2e':
  Fix building static host executables.
2015-03-04 00:27:10 +00:00
Dan Albert
94451789f4 am cfafe554: Merge "Fix building static host executables."
* commit 'cfafe554c0852f5b2c05e5d895b47d032daeec2e':
  Fix building static host executables.
2015-03-03 23:24:40 +00:00
Dan Albert
8bf4cc97c2 Fix building static host executables.
BUILD_HOST_static=1 forces all host binaries to be statically linked.
Since -nodefaultlibs was passed (to disable libstdc++), libgcc wasn't
being passed. This change emulates the driver's behavior.

Also fix default STL selection for BUILD_HOST_static.

Bug: 19567451
Change-Id: I617aab782d40ac76ca5a7d9dddf0f202a4e3a69b
2015-03-03 15:08:11 -08:00
Chih-Hung Hsieh
d40a53b494 am 9a75b4ec: am d408e607: Merge "Disable tail call optimization and use -mstackrealign to boot up on fugu."
* commit '9a75b4ec35eaddb38a49c8283ef0f1db2c827a52':
  Disable tail call optimization and use -mstackrealign to boot up on fugu.
2015-03-03 01:50:55 +00:00
Chih-Hung Hsieh
9a75b4ec35 am d408e607: Merge "Disable tail call optimization and use -mstackrealign to boot up on fugu."
* commit 'd408e6071831f150a08f895ee2de6cfe8c7ff858':
  Disable tail call optimization and use -mstackrealign to boot up on fugu.
2015-03-03 01:44:26 +00:00
Chih-Hung Hsieh
d408e60718 Merge "Disable tail call optimization and use -mstackrealign to boot up on fugu." 2015-03-03 01:39:28 +00:00
Chih-Hung Hsieh
73e734bea5 Disable tail call optimization and use -mstackrealign to boot up on fugu.
http://llvm.org/bugs/show_bug.cgi?id=15086,
llvm tail call optimization is wrong for x86.

For Android/x86 to use SSE* instructions safely, stack should be 16-byte
aligned before JNI function call, which isn't true for all x86 device,
so -mstackrealign should be the default.

BUG: 19234330
Change-Id: I4c6676366788772dbe64fd7f0dd33b3ed5c9b80e
2015-03-02 16:50:39 -08:00
Narayan Kamath
cafb413c2d am 59c24c79: am 095c4515: Merge "Remove unused variables."
* commit '59c24c790ab04127330d58459ceee1dcd6dd3ab1':
  Remove unused variables.
2015-02-27 16:39:59 +00:00
Narayan Kamath
59c24c790a am 095c4515: Merge "Remove unused variables."
* commit '095c451541765c7efb9d5a8152f8ef15626ccedb':
  Remove unused variables.
2015-02-27 16:33:23 +00:00
Narayan Kamath
095c451541 Merge "Remove unused variables." 2015-02-27 11:43:34 +00:00
Ying Wang
41e3685f97 am bf565365: Use ALL_MODULES..INSTALLED in modules-for-tag-list
* commit 'bf565365debd77424dbcf0877089f6f33100d8db':
  Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list
2015-02-26 23:15:32 +00:00
Ying Wang
bf565365de 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
(cherry picked from commit 0e36bfeb3f)
2015-02-26 22:18:18 +00:00
Ying Wang
0e36bfeb3f 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
2015-02-26 14:12:25 -08:00
Ying Wang
641e283f5e am 8485fb07: am 4eec22a6: Merge "Use a less freqent dummy file name: zipdummy"
* commit '8485fb074bb1b751224b167273de0f443b94680f':
  Use a less freqent dummy file name: zipdummy
2015-02-26 18:11:36 +00:00
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
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
738871f6eb am e886392c: am 37a44faa: Merge "Store native libs aligned to PAGE_SIZE"
* commit 'e886392c37a24e25ee1b0e439d74e9b07df2d608':
  Store native libs aligned to PAGE_SIZE
2015-02-26 12:51:28 +00: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
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
9ddc52c1e4 am 13baa319: am 876f45e7: Merge "Make some warnings impossible to override."
* commit '13baa3192149a8a1de5885c8a85f95155ff5d83d':
  Make some warnings impossible to override.
2015-02-25 23:24:35 +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
5e7fd72982 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.
2015-02-25 19:08:05 +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
Colin Cross
de6a0bd545 am 841e4cf2: am a82f7db9: Merge "add BUILD_NATIVE_BENCHMARK"
* commit '841e4cf2aedda764161ed82a882a945137453b34':
  add BUILD_NATIVE_BENCHMARK
2015-02-25 16:52:13 +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
5c4ace8a30 am 36f17971: am ca15af1b: Merge "Turn on -Werror=implicit-function-declaration for arm64."
* commit '36f179711dfc015d61873b54417622c695185b2d':
  Turn on -Werror=implicit-function-declaration for arm64.
2015-02-23 21:40:51 +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
c429154989 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.
2015-02-23 18:32:45 +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
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
30c168c570 am ae25aed3: am 940632f1: Merge "Remove references to __CYGWIN__ and HAVE_WINSOCK2_H."
* commit 'ae25aed3c9322b7b9a054f1d1308174a6f8db2e2':
  Remove references to __CYGWIN__ and HAVE_WINSOCK2_H.
2015-02-21 10:19:53 +00: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
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
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
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