Commit Graph

21256 Commits

Author SHA1 Message Date
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 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 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 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 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
Elliott Hughes 8389deee6b Merge "mips64 should avoid common LP64 errors just like arm64 and x86-64." 2015-02-25 18:56:52 +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
Ying Wang 263d1aa876 am 0487ab1e: am 58aeaed9: Merge "goldfish_logcat: remove permissive_or_unconfined()"
* commit '0487ab1ec0097d6c617a13f19609f58c6a5987c0':
  goldfish_logcat:  remove permissive_or_unconfined()
2015-02-23 17:41:16 +00:00
Ying Wang 217b81d8b2 am 723d0039: am aa67c0ce: Merge "qemud: remove permissive_or_unconfined()"
* commit '723d003929b1ac7fc2dd5eebbecfc7e00fdc657d':
  qemud:  remove permissive_or_unconfined()
2015-02-23 17:41:15 +00:00
Ying Wang 7d3707f213 am 4ca5ab5d: am 4be75b37: Merge "qemu_props: remove permissive_or_unconfined()"
* commit '4ca5ab5d4a51603ac7c33b2540d13184394e5ed9':
  qemu_props:  remove permissive_or_unconfined()
2015-02-23 17:41:14 +00:00
Ying Wang 3a836e74a9 am a65c7cf1: am 5d47a481: Merge "goldfish_setup: remove permissive_or_unconfined()"
* commit 'a65c7cf1a61e5915bb2d71c68952d55bb75f01fa':
  goldfish_setup:  remove permissive_or_unconfined()
2015-02-23 17:41:13 +00: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 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 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
Ying Wang a47fe23423 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.
2015-02-20 20:00:56 +00:00
Ying Wang e9a2d8eb03 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.
2015-02-20 19:50:27 +00:00
Ying Wang 56dedc22ba 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.
2015-02-20 19:45:47 +00:00
Ying Wang dae9bb50a5 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.
2015-02-20 19:38:32 +00:00
Ying Wang 64f0f2ad23 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.
2015-02-20 19:32:39 +00:00
Ying Wang f7cb5fc2b1 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.
2015-02-20 19:24:41 +00:00
Ying Wang 1c2ca59317 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.
2015-02-20 19:19:18 +00:00