Mohamad Ayyash
9b19382f0e
resolved conflicts for merge of fc759204 to stage-aosp-master
...
Change-Id: Icf58e881286a66cb3ca4cb122fa8c11ec217fbab
2015-03-04 15:43:45 -08:00
Mohamad Ayyash
fc759204d6
Merge "Allow flashing a squashfs system image"
2015-03-04 22:55:22 +00:00
Dan Albert
a10263ed1f
am ccf1cc55: Merge "Fix the mac build."
...
* commit 'ccf1cc55a4448dc43302624da07d3211356473e2':
Fix the mac build.
2015-03-04 06:23:10 +00:00
Dan Albert
ccf1cc55a4
Merge "Fix the mac build."
2015-03-04 06:17:20 +00:00
Dan Albert
d666bb1009
Fix the mac build.
...
Bug: 19567451
Change-Id: I6d15259520c9813df1a44d9244c99482f713d114
2015-03-03 21:47:04 -08:00
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
Ying Wang
edab98a40a
Merge "Catch more cases of static host executables."
2015-03-04 03:24:04 +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
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
d52afdd682
Merge "(Hopefully) fix the Mac build."
2015-03-04 01:46:22 +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
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
cfafe554c0
Merge "Fix building static host executables."
2015-03-03 23:20:53 +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
Greg Hackmann
fc93e284dd
am 6492792d: Merge "Consult tput about color control sequence support"
...
* commit '6492792d8a30f218fff6d54765ba5502de0a9a2a':
Consult tput about color control sequence support
2015-03-03 19:02:37 +00:00
Greg Hackmann
6492792d8a
Merge "Consult tput about color control sequence support"
2015-03-03 18:55:21 +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
2479a0987d
am 30b5ed7b: Merge "Fix zipalign README file and usage strings."
...
* commit '30b5ed7b1e8c67c816d64ad1b7c9bde3c3b5019c':
Fix zipalign README file and usage strings.
2015-02-27 17:26:49 +00:00
Narayan Kamath
30b5ed7b1e
Merge "Fix zipalign README file and usage strings."
2015-02-27 17:21:30 +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
e0b8d19f31
Fix zipalign README file and usage strings.
...
Addresses comments from change 13e5965306 .
Change-Id: I0a2c0048781858d3aa06347a77220547cfcdcebe
2015-02-27 14:17:17 +00:00
Narayan Kamath
095c451541
Merge "Remove unused variables."
2015-02-27 11:43:34 +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
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