Commit graph

3587 commits

Author SHA1 Message Date
Ying Wang
b6c570510a am f5ce4fa9: Merge "Install 64-bit libraries to /system/lib64."
* commit 'f5ce4fa983f08d42bbc5d96af4f86bce5c190f0c':
  Install 64-bit libraries to /system/lib64.
2014-01-14 12:08:32 -08:00
Ying Wang
c634974d37 Install 64-bit libraries to /system/lib64.
/system/lib always contains 32-bit libraries, and /system/lib64 (if
present) always contains 64-bit libraries.
Move things around a little bit, so TARGET_ARCH can be used to define
the build paths.

Bug: 11654773
Change-Id: I2edd91e162c7a20d7719d7bae15e5fa6c2a5b498
2014-01-13 16:20:31 -08:00
Elliott Hughes
dda9d8ee0f am 37c699c2: Merge "Remove obsolete CUSTOM_KERNEL_HEADERS."
* commit '37c699c28a464561b186ab11a5af60214ae25d9a':
  Remove obsolete CUSTOM_KERNEL_HEADERS.
2014-01-10 16:47:30 -08:00
Elliott Hughes
37c699c28a Merge "Remove obsolete CUSTOM_KERNEL_HEADERS." 2014-01-11 00:41:25 +00:00
Elliott Hughes
dddb566eba Remove obsolete CUSTOM_KERNEL_HEADERS.
Change-Id: Id260dd351b90f065eee56e231d4c341b18c1b27f
2014-01-10 16:35:08 -08:00
Ying Wang
0650d4a2ea am 987616ed: Merge "Fix x86_64 build"
* commit '987616ed09adc65e6636f7a3a82fa7b38021b6e2':
  Fix x86_64 build
2014-01-10 09:38:13 -08:00
Pavel Chupin
522b0a633c Fix x86_64 build
Issue introduced here:
https://android-review.googlesource.com/#/c/71842/

Change-Id: I8a60641ff07173fcedf259df89aaaa4bc6d6ea3e
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2014-01-10 19:23:08 +04:00
Brian Carlstrom
98c7252113 am ad8271a8: Merge "Add support for ALTERNATE_JAVAC"
* commit 'ad8271a8e6a1f050c1852d6dc3df0eb6777e5606':
  Add support for ALTERNATE_JAVAC
2014-01-09 18:36:22 -08:00
Brian Carlstrom
ad8271a8e6 Merge "Add support for ALTERNATE_JAVAC" 2014-01-10 02:31:26 +00:00
Ying Wang
cb5f9a282e am a26ea82e: Merge "Define PRIVATE_TARGET_ variables for only target modules."
* commit 'a26ea82e6a226575f19fec6b5bea111cbe20c233':
  Define PRIVATE_TARGET_ variables for only target modules.
2014-01-09 16:32:07 -08:00
Brian Carlstrom
b6dcef8777 Add support for ALTERNATE_JAVAC
Bug: 12476356
Change-Id: Idd013031dc32a560bca76cca295bedcad55982b4
2014-01-09 15:33:23 -08:00
Ying Wang
7fff9a1a56 Define PRIVATE_TARGET_ variables for only target modules.
Change-Id: I12c54bfffd9acb78a61d1032a087a0edaf3bf12c
2014-01-09 14:39:41 -08:00
Ying Wang
b5fb7f242e am aed49987: Merge "Allow clang to build host binaries."
* commit 'aed499879210c7432c1c5b3869f383b27b17dafc':
  Allow clang to build host binaries.
2014-01-09 10:57:03 -08:00
Ying Wang
aed4998792 Merge "Allow clang to build host binaries." 2014-01-09 18:52:06 +00:00
Ying Wang
95fc1a5075 am f12d4810: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space"
* commit 'f12d48104ba782d877afc31a081748fdc881f2b6':
  PRODUCT_BOOT_JARS as a list of jar names separated by space
2014-01-07 16:50:49 -08:00
Ying Wang
ad6674cd60 PRODUCT_BOOT_JARS as a list of jar names separated by space
This makes it easier for OEMs to extend the PRODUCT_BOOT_JARS in their
product configuration files.

Change-Id: I5feca2f808b1914c275f28c7a4c38cca2ba6851f
2014-01-07 14:31:49 -08:00
Logan Chien
e6f65438a4 Allow clang to build host binaries.
Change-Id: I7e4f9dc6f69a97cfefdfa2ed55c5d7b8ad496da7
2014-01-07 14:49:20 +08:00
Ying Wang
f05eecc368 am a47d12e3: Merge "Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt"
* commit 'a47d12e38ae38a6fdceb54172490c94408efa0de':
  Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt
2014-01-03 17:59:59 -08:00
Ying Wang
9db168ca5c Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt
Because a library or app can be built from mere static libraries,
or generated java files. For example, framework is built from only
static library framework-base but without LOCAL_SRC_FILES.
Also added framework2 to PRODUCT_PACKAGES.
Previously framework2.jar was installed by dependency explicitly
established in frameworks/base/Android.mk. That's not enough for the
.odex file.
This fixed the boot failure reported in bug 12382916.

Bug: 12382916
Change-Id: If1a70261ab2bb7fef77cf7b7b995bdc029be0fc3
2014-01-03 17:53:00 -08:00
Michael Runge
41e19a4cf0 am 6b55f007: am facd992e: Makefile used spaces instead of a tab
* commit '6b55f00762c03b3625862b89f704090f58f970e7':
  Makefile used spaces instead of a tab
2013-12-26 15:33:32 -08:00
Michael Runge
5636d07a29 am a80542db: am 4038aa8f: Enabled incrementals to patch + rename moved files
* commit 'a80542dbf4f193c59525b8749871bcdf4ae4283a':
  Enabled incrementals to patch + rename moved files
2013-12-26 15:33:27 -08:00
Elliott Hughes
9464ca1b97 am b8559790: Merge "Remove a non-existent directory from the include path."
* commit 'b8559790d43f2483c7910e87e33ceebeb40e9bec':
  Remove a non-existent directory from the include path.
2013-12-20 15:57:57 -08:00
Elliott Hughes
26990f5573 Remove a non-existent directory from the include path.
Brings aarch64 in line with the other architectures.

Change-Id: Iba3fd33e34e3b5bc071f55cfe09de9e55a023cf7
2013-12-20 15:37:55 -08:00
Michael Runge
6b55f00762 am facd992e: Makefile used spaces instead of a tab
* commit 'facd992ec73de763cfbca32dd6aa38ff76a07613':
  Makefile used spaces instead of a tab
2013-12-20 12:36:49 -08:00
Michael Runge
facd992ec7 Makefile used spaces instead of a tab
Change-Id: Ia34f80d99062ef2899527f11d7bf72e78c63e31c
2013-12-20 11:50:16 -08:00
Michael Runge
a80542dbf4 am 4038aa8f: Enabled incrementals to patch + rename moved files
* commit '4038aa8fff8c68733bff8b55d8c8d1b59713ca37':
  Enabled incrementals to patch + rename moved files
2013-12-20 11:35:07 -08:00
Elliott Hughes
d46e3f1fdf am 3d3dd4a1: Merge "Fix aarch64 and x86-64 AndroidConfig.h."
* commit '3d3dd4a186309a62a744d7fea1157158e05bcf6e':
  Fix aarch64 and x86-64 AndroidConfig.h.
2013-12-18 15:35:58 -08:00
Elliott Hughes
3d3dd4a186 Merge "Fix aarch64 and x86-64 AndroidConfig.h." 2013-12-18 23:31:47 +00:00
Elliott Hughes
98593a66af Fix aarch64 and x86-64 AndroidConfig.h.
_LARGEFILE_SOURCE should never be defined with bionic.
_FILE_OFFSET_BITS should be 64 on 64-bit architectures.

Change-Id: I7acf6b39a3af7782d5d7ad00f709593d96fa8522
2013-12-18 15:17:42 -08:00
Ying Wang
6cc89747ec am 8e3a71f7: Merge "Simplify the calculation of LOCAL_UNSTRIPPED_PATH"
* commit '8e3a71f75e08b4ad580903f2edc7edea5dc07806':
  Simplify the calculation of LOCAL_UNSTRIPPED_PATH
2013-12-18 10:55:54 -08:00
Ying Wang
f3584968ff Simplify the calculation of LOCAL_UNSTRIPPED_PATH
Also this fixes the LOCAL_UNSTRIPPED_PATH if the module is installed to
the vendor dir via LOCAL_PROPRIETARY_MODULE.

Bug: 11289169
Change-Id: Ib07e5761411210963076487fe0e148c259e1e082
2013-12-18 10:41:01 -08:00
Ying Wang
d32aaf9374 am 3fc636c2: Merge "Create the dest dir before copying over files."
* commit '3fc636c25af0ddcce6ebe6f99a1d7ca83b84f69a':
  Create the dest dir before copying over files.
2013-12-17 17:45:32 -08:00
Ying Wang
17a7e2bee3 Create the dest dir before copying over files.
Change-Id: I8ad79704558d7a10099e64fc1d032c8ddd3330b9
2013-12-17 17:37:16 -08:00
Ying Wang
82c59aefcd am 71e8a22e: Merge "Add DEXPREOPT support for ART"
* commit '71e8a22e3478b6b4277957ef47486058a5306286':
  Add DEXPREOPT support for ART
2013-12-17 16:58:43 -08:00
Ying Wang
71e8a22e34 Merge "Add DEXPREOPT support for ART" 2013-12-18 00:55:28 +00:00
Christopher Ferris
7bda5aacb1 am d12ee620: Merge "Re-enable uapi kernel headers for arm."
* commit 'd12ee620b064d262abce691771fe53ba8987d06f':
  Re-enable uapi kernel headers for arm.
2013-12-17 15:11:58 -08:00
Christopher Ferris
d12ee620b0 Merge "Re-enable uapi kernel headers for arm." 2013-12-17 23:06:38 +00:00
Brian Carlstrom
ced4bff58e Add DEXPREOPT support for ART
Change-Id: I24d0d7b2a23a769f5d69bd4dc14be22e1475b759
2013-12-17 14:44:00 -08:00
Elliott Hughes
861fea291d am 3fd89533: Merge "Make aarch64 more like arm wrt strict-aliasing."
* commit '3fd895336dc7cfe219be4e1d49096bf53e661503':
  Make aarch64 more like arm wrt strict-aliasing.
2013-12-17 07:42:33 -08:00
Elliott Hughes
c294779d7f Make aarch64 more like arm wrt strict-aliasing.
All thumb code compiles with -fno-strict-aliasing. Let's not make aarch64
porting any more difficult than it needs to be.

Change-Id: I94874df1217b69532c328d7c86c9961631ebde8a
2013-12-16 18:01:19 -08:00
Christopher Ferris
9824ce4e1d Re-enable uapi kernel headers for arm.
Bug: 11559337
Change-Id: Ib914e5f22b10d5a74edc357d42b0dcb223185ab4
2013-12-16 13:58:39 -08:00
Michael Runge
4038aa8fff Enabled incrementals to patch + rename moved files
Change-Id: I551fc5291847e3ace15361c203d86f566c26da97
2013-12-16 11:29:51 -08:00
Christopher Ferris
7f36451b83 am 657eadd4: Merge "Revert "Enable uapi kernel headers for arm.""
* commit '657eadd4b78b91185ca2042ffb7f92be84e6c1c4':
  Revert "Enable uapi kernel headers for arm."
2013-12-16 10:33:03 -08:00
Christopher Ferris
e2c73b3194 Revert "Enable uapi kernel headers for arm."
This reverts commit 88c6c533e1.

Change-Id: I3cd84383c6f217bc6e627e16b2d0c7d948f8131d
2013-12-16 18:21:27 +00:00
Christopher Ferris
9c15d11156 am 84b99aad: Merge "Enable uapi kernel headers for arm."
* commit '84b99aadddf3cd9d02a60b43923ed11fc7341c9f':
  Enable uapi kernel headers for arm.
2013-12-16 09:57:57 -08:00
Christopher Ferris
88c6c533e1 Enable uapi kernel headers for arm.
Bug: 11559337
Change-Id: Idd251338f707b7c6a08f43a79f9784c57142f43c
2013-12-16 09:12:19 -08:00
Ying Wang
d93df33212 am 10b1ffae: Merge "enable PIE for dynamically linked Linux host executables"
* commit '10b1ffaed921bce3014d39ca9dcb705550aa03f0':
  enable PIE for dynamically linked Linux host executables
2013-12-13 10:24:12 -08:00
Joshua J. Drake
b0eafa21b9 enable PIE for dynamically linked Linux host executables
Compile all host programs for Android with -fPIE and -pie. This
enables PIE (Position Independent Executables), which helps
protect these applications from exploitation due to memory
management bugs.

Note: PIE *static* executables are not supported at this time. darwin
and windows are also not supported.

Change-Id: I67c1be297711ea23064c349f97ebd02eef3eff09
2013-12-12 17:36:53 -08:00
Ying Wang
c5e3539b6f am 5859f105: Merge "Enable NX protections"
* commit '5859f105fad3ce1ba76fb252c4c5b8fe357a3ce4':
  Enable NX protections
2013-12-12 16:09:43 -08:00
Ying Wang
5859f105fa Merge "Enable NX protections" 2013-12-13 00:04:42 +00:00