Commit graph

3794 commits

Author SHA1 Message Date
Christopher Ferris
68aec9bd01 am c4d168b9: am bc7064b5: am 7f36451b: am 657eadd4: Merge "Revert "Enable uapi kernel headers for arm.""
* commit 'c4d168b9d0d277255ac0473632f2c9bc103fe0f2':
  Revert "Enable uapi kernel headers for arm."
2013-12-16 18:43:24 +00:00
Christopher Ferris
bc7064b506 am 7f36451b: am 657eadd4: Merge "Revert "Enable uapi kernel headers for arm.""
* commit '7f36451b83860f3f5b21edc467605066035354d6':
  Revert "Enable uapi kernel headers for arm."
2013-12-16 18:37:31 +00: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
84c6144c52 am 675041d1: am 5e55aabc: am 9c15d111: am 84b99aad: Merge "Enable uapi kernel headers for arm."
* commit '675041d128a87378c959fd4b75bfe949a3818947':
  Enable uapi kernel headers for arm.
2013-12-16 18:08:39 +00:00
Christopher Ferris
5e55aabcb3 am 9c15d111: am 84b99aad: Merge "Enable uapi kernel headers for arm."
* commit '9c15d11156d60e1721dd8e1b3c018b4f0d9a00b0':
  Enable uapi kernel headers for arm.
2013-12-16 18:02:28 +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
dcdd759623 am 39139ee0: am 3d10656e: am d93df332: am 10b1ffae: Merge "enable PIE for dynamically linked Linux host executables"
* commit '39139ee09a82b232877e10b2e1832664382d4257':
  enable PIE for dynamically linked Linux host executables
2013-12-13 22:19:39 +00:00
Ying Wang
3d10656e99 am d93df332: am 10b1ffae: Merge "enable PIE for dynamically linked Linux host executables"
* commit 'd93df3321227b167bf68ead55adf76fc12ef8c60':
  enable PIE for dynamically linked Linux host executables
2013-12-13 18:27:08 +00: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
a27fd616c0 am 5023bb57: am 31570961: am c5e3539b: am 5859f105: Merge "Enable NX protections"
* commit '5023bb574f5e0e29a8434734ca1db52b6a35bf6a':
  Enable NX protections
2013-12-13 00:17:27 +00:00
Ying Wang
3157096157 am c5e3539b: am 5859f105: Merge "Enable NX protections"
* commit 'c5e3539b6fe67288d097d29b68d5f669b97a71ad':
  Enable NX protections
2013-12-13 00:12:47 +00: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
Ben Cheng
92dd82a6e2 am 462b1ca7: am 74f27cff: am af3d1408: am 2609640e: Merge "Add an explicit definition of __ANDROID__=1"
* commit '462b1ca7f6268282f147961aa03ca2433d59af17':
  Add an explicit definition of __ANDROID__=1
2013-12-12 22:06:59 +00:00
Ben Cheng
74f27cffd9 am af3d1408: am 2609640e: Merge "Add an explicit definition of __ANDROID__=1"
* commit 'af3d1408be4acc8dd6ab0a34d5413c8996f7fa5f':
  Add an explicit definition of __ANDROID__=1
2013-12-12 22:01:29 +00:00
Ben Cheng
af3d1408be am 2609640e: Merge "Add an explicit definition of __ANDROID__=1"
* commit '2609640eaea1ba89a493cff2847cb9ec993dc9fc':
  Add an explicit definition of __ANDROID__=1
2013-12-12 13:57:55 -08:00
Ben Cheng
cd7b02d911 Add an explicit definition of __ANDROID__=1
Once the aarch64 toolchain is refreshed this will be removed.
Also removed some CFLAG duplications.

Change-Id: I42fd86931263af82042ea696196fb25e948fe9cb
2013-12-12 13:08:55 -08:00
Joshua J. Drake
afb45637b2 Enable NX protections
Add -Wa,--noexecstack and -Wl,-z,noexecstack as default
flags when compiling host-side applications.  This enables
NX protections, which prevent code from executing on the
stack or heap.  NX protections make exploiting memory
corruption issues more challenging and is an important
security feature.

Change-Id: Iae580abe887e01f9029ec2a4e0fc0aae496724a4
2013-12-12 10:47:08 -08:00
Ying Wang
d56f77da5d am 952a1bfb: am 580b3963: am 0e2779bd: am 8a373fd5: Merge "Added TARGET_IS_64_BIT flag for x86_64 and aarch64"
* commit '952a1bfbb7070507e3ce5340e55210a10af8a016':
  Added TARGET_IS_64_BIT flag for x86_64 and aarch64
2013-12-11 21:09:38 +00:00
Ying Wang
580b396331 am 0e2779bd: am 8a373fd5: Merge "Added TARGET_IS_64_BIT flag for x86_64 and aarch64"
* commit '0e2779bdbb80b6f94534af0b9128ced4b6caa418':
  Added TARGET_IS_64_BIT flag for x86_64 and aarch64
2013-12-11 21:02:29 +00:00
Ying Wang
0e2779bdbb am 8a373fd5: Merge "Added TARGET_IS_64_BIT flag for x86_64 and aarch64"
* commit '8a373fd5aef4eafbd716abe517a99ef0b3d69094':
  Added TARGET_IS_64_BIT flag for x86_64 and aarch64
2013-12-11 10:11:21 -08:00
Ying Wang
8a373fd5ae Merge "Added TARGET_IS_64_BIT flag for x86_64 and aarch64" 2013-12-11 17:52:26 +00:00
Alexey Volkov
a1779eb11b Added TARGET_IS_64_BIT flag for x86_64 and aarch64
Change-Id: Ibdf9dafa3aeaf4b58b4a559ed05e36e2793bf6ed
Signed-off-by: Alexey Volkov <alexey.v.volkov@intel.com>
2013-12-11 17:18:56 +04:00
Ying Wang
afb774eb0e am 077ed54e: am 65ad13ae: am 68abe34c: am c2f639a1: Merge "Add "-encoding UTF-8" option to javadoc."
* commit '077ed54e14577ef0d034e29d9cd3a611ee622dfe':
  Add "-encoding UTF-8" option to javadoc.
2013-12-10 19:42:55 +00:00
Ying Wang
65ad13ae66 am 68abe34c: am c2f639a1: Merge "Add "-encoding UTF-8" option to javadoc."
* commit '68abe34c9838993af5c0c6dbc4017c3cd8d7e86c':
  Add "-encoding UTF-8" option to javadoc.
2013-12-10 19:38:13 +00:00
Ying Wang
68abe34c98 am c2f639a1: Merge "Add "-encoding UTF-8" option to javadoc."
* commit 'c2f639a179b3085c7f61a8d71d2ee7b3ff6c9266':
  Add "-encoding UTF-8" option to javadoc.
2013-12-10 11:36:18 -08:00
Ying Wang
34e3e170e4 Add "-encoding UTF-8" option to javadoc.
This fixed docs build on Mac OS X 10.9 with Java 7.
Change-Id: I91e224456c9e6c43dbf13d691c3b37d21f94b0f3
2013-12-10 11:30:01 -08:00
Daniel Tsai
08062f3369 am d54129e3: build: Fix failed to assign a module name different with it\'s file name to a prebuilt module
* commit 'd54129e3db9a8ece3d0782c0f931a72c6510ebad':
  build: Fix failed to assign a module name different with it's file name to a prebuilt module
2013-12-06 18:04:09 +00:00
Daniel Tsai
d54129e3db build: Fix failed to assign a module name different with it's file name to a prebuilt module
Build system can not find the dependent library if assigning a
multi-prebuilt which module name is different with it's library
file name as following:
    PREBUILT_LIBS := libabc_debug:libabc.a

Change-Id: I05bdc8cebcabf74195198e3cefa1b8923f87d406
2013-12-06 10:01:05 -08:00
Narayan Kamath
7b199e3fa6 am 87286198: am b8d3879e: am 99bb0365: am 948206c0: Merge "Fix tools path on Mac OS for java 7."
* commit '87286198486fb43b35b6dcf8c64ca32a2ec60432':
  Fix tools path on Mac OS for java 7.
2013-12-06 17:51:54 +00:00
Narayan Kamath
1d755aaa7b resolved conflicts for merge of 6835cbf9 to master
Change-Id: I21593edf5f597bc79ff91b756bdaf6921b05cba7
2013-12-06 17:31:38 +00:00
Narayan Kamath
8728619848 am b8d3879e: am 99bb0365: am 948206c0: Merge "Fix tools path on Mac OS for java 7."
* commit 'b8d3879e6298b3800d959aaf7fe9ed1a2a163ff7':
  Fix tools path on Mac OS for java 7.
2013-12-06 17:20:21 +00:00
Narayan Kamath
6835cbf932 am 0e4cccbf: am a8dcc8c8: am fe57f665: Merge "A few more Java7 related clean ups."
* commit '0e4cccbff61dc77e68f0dd13e5c96432febe82bb':
  A few more Java7 related clean ups.
2013-12-06 17:20:20 +00:00
Narayan Kamath
b8d3879e62 am 99bb0365: am 948206c0: Merge "Fix tools path on Mac OS for java 7."
* commit '99bb0365d53186c8ece6ac4e61ca2d303d0e0f0a':
  Fix tools path on Mac OS for java 7.
2013-12-06 09:16:18 -08:00
Narayan Kamath
0e4cccbff6 am a8dcc8c8: am fe57f665: Merge "A few more Java7 related clean ups."
* commit 'a8dcc8c81a567902bee69a8dcd7357d391ef39b9':
  A few more Java7 related clean ups.
2013-12-06 09:16:18 -08:00
Narayan Kamath
99bb0365d5 am 948206c0: Merge "Fix tools path on Mac OS for java 7."
* commit '948206c026c8751b9d53341dfe9c2c2905ebb002':
  Fix tools path on Mac OS for java 7.
2013-12-06 09:13:58 -08:00
Narayan Kamath
a8dcc8c81a am fe57f665: Merge "A few more Java7 related clean ups."
* commit 'fe57f665074665edf469ad1e1d0fcef749f9a5bb':
  A few more Java7 related clean ups.
2013-12-06 09:13:58 -08:00
The Android Open Source Project
722581a598 Merge commit 'd54f8c2d1b4d88db84465fee93aa29103ca32078' into HEAD
Change-Id: I3cf53f083dee277a450dac36b011bc83180f6294
2013-12-05 12:59:39 -08:00
Ying Wang
c404d34282 am 7493c39e: Add utility function find-files-in-subdirs
* commit '7493c39eff203ed027b0f0ea320c26dd7d895b22':
  Add utility function find-files-in-subdirs
2013-12-05 10:39:42 -08:00
Ying Wang
7493c39eff Add utility function find-files-in-subdirs
find-files-in-subdirs uses utility find to find given files in the given
subdirs. This function uses $(1), instead of LOCAL_PATH as the base.

Change-Id: Ib76631c97acd257d651a580cbad767606874f5d0
(cherry picked from commit 85898bca99)
2013-12-05 18:37:20 +00:00
Narayan Kamath
ab2e2e792e Fix tools path on Mac OS for java 7.
Change-Id: Ieb72b9e10771ee372bacf20258242cb006c29fef
2013-12-05 17:56:23 +00:00
Ying Wang
8df06ce0fa am e2d5b777: am e65c2969: Merge "Add utility function find-files-in-subdirs"
* commit 'e2d5b7772b0d4de8220f08e35430ea1bba3a9fcc':
  Add utility function find-files-in-subdirs
2013-12-05 14:24:43 +00:00
Ying Wang
e2d5b7772b am e65c2969: Merge "Add utility function find-files-in-subdirs"
* commit 'e65c29697ac2cad422a094720944d326128f17c3':
  Add utility function find-files-in-subdirs
2013-12-05 06:22:37 -08:00
Narayan Kamath
e2d27887be A few more Java7 related clean ups.
- Separate SDK checking from version checking and
  make messages clearer.
- Add explicit source & target versions for javac to
  make things clearer.
- Rename flag from EXPERIMENTAL_USE_JAVA7_OPENJDK to
  EXPERIMENTAL_USE_JAVA7.
- Allow Oracle JDK 1.7 to be used on Mac OS, since there's
  no official OpenJDK support for that platform.

Change-Id: I454d2c917ed78f03ec7559a99659fefe7e7d50f3
2013-12-05 13:23:06 +00:00
Ying Wang
7c8c7bd4b6 Add utility function find-files-in-subdirs
find-files-in-subdirs uses utility find to find given files in the given
subdirs. This function uses $(1), instead of LOCAL_PATH as the base.

Change-Id: Ib76631c97acd257d651a580cbad767606874f5d0
2013-12-04 16:56:38 -08:00
Ying Wang
d114d22040 Merge "Add utility function find-files-in-subdirs" 2013-12-05 00:53:02 +00:00
Ying Wang
85898bca99 Add utility function find-files-in-subdirs
find-files-in-subdirs uses utility find to find given files in the given
subdirs. This function uses $(1), instead of LOCAL_PATH as the base.

Change-Id: Ib76631c97acd257d651a580cbad767606874f5d0
2013-12-04 16:27:06 -08:00
Joe Onorato
dbbba1ad1f am e939cb5c: am 0df5e7b3: am 36b89ff9: Add a convenient target for building a zip file of javadocs: -docs.zip
* commit 'e939cb5cfe53ac150de6e9a16a3e29ed25f47c1e':
  Add a convenient target for building a zip file of javadocs: $(LOCAL_MODULE)-docs.zip
2013-12-04 17:50:46 +00:00
Joe Onorato
e939cb5cfe am 0df5e7b3: am 36b89ff9: Add a convenient target for building a zip file of javadocs: -docs.zip
* commit '0df5e7b365d8baa6f5a2f5a1113e1a20cdd0fe58':
  Add a convenient target for building a zip file of javadocs: $(LOCAL_MODULE)-docs.zip
2013-12-04 17:47:10 +00:00
Joe Onorato
0df5e7b365 am 36b89ff9: Add a convenient target for building a zip file of javadocs: -docs.zip
* commit '36b89ff93fe1fe55351564c258023255d70b6378':
  Add a convenient target for building a zip file of javadocs: $(LOCAL_MODULE)-docs.zip
2013-12-04 09:43:06 -08:00
Joe Onorato
36b89ff93f Add a convenient target for building a zip file of javadocs: $(LOCAL_MODULE)-docs.zip
Change-Id: I97fcc0d467f3b7582570b9be7e15acc0a5b550a5
2013-12-04 02:32:06 -08:00
Dave Langemak
aa7386a746 am b738b392: am c58cdd36: am 48130ea9: am 63ac2753: .1 becomes .2
* commit 'b738b392f4da0a4975aeec3cbd1b270bcd194b26':
  .1 becomes .2
2013-12-03 23:34:07 +00:00
Dave Langemak
b738b392f4 am c58cdd36: am 48130ea9: am 63ac2753: .1 becomes .2
* commit 'c58cdd36af224ac00c105255614e9e58bc8c02b6':
  .1 becomes .2
2013-12-03 23:30:42 +00:00
Dave Langemak
c58cdd36af am 48130ea9: am 63ac2753: .1 becomes .2
* commit '48130ea9dead7ab64a389b84aaf9d8a8597e3079':
  .1 becomes .2
2013-12-03 15:27:52 -08:00
Dave Langemak
63ac275378 .1 becomes .2
Change-Id: Ib4208e24e66b05ff441302a817be22ea213eb1df
2013-12-03 15:06:56 -08:00
Colin Cross
9781049c41 Merge "Disable recovery in PDK builds" into klp-volantis-dev 2013-12-03 17:44:08 +00:00
Doug Zongker
b00398a07e am a6fadb61: am 57c9ffef: am 9b23f2cd: add option to generate two-step recovery files
* commit 'a6fadb61cae38089bc534f3cb995b98689f796cb':
  add option to generate two-step recovery files
2013-12-03 17:06:04 +00:00
Doug Zongker
a6fadb61ca am 57c9ffef: am 9b23f2cd: add option to generate two-step recovery files
* commit '57c9ffef30a6f34e126d8e89a08d208b05cc4901':
  add option to generate two-step recovery files
2013-12-03 08:58:11 -08:00
Mike Lockwood
2e9d15d0b6 Disable recovery in PDK builds
Change-Id: Ic6ee44cef37104c8d7facc28dfe45d0ef832ebd0
2013-12-02 23:20:53 -08:00
Ying Wang
1fdef9f6f8 am 04324c27: am 6178f6f0: Merge "Run ar in Deterministic mode."
* commit '04324c2780b1377ada547a7027aec8c890b9db0e':
  Run ar in Deterministic mode.
2013-12-02 23:32:10 +00:00
Ying Wang
13ca2c7f5c am 71e5dd30: am 7a772619: Merge "core: support make 4.00"
* commit '71e5dd3055dc6a441ce20f0905f1b3893f79d27e':
  core: support make 4.00
2013-12-02 23:31:44 +00:00
Ying Wang
04324c2780 am 6178f6f0: Merge "Run ar in Deterministic mode."
* commit '6178f6f0182b0b9c8063123dd62e86108eb7a212':
  Run ar in Deterministic mode.
2013-12-02 14:26:45 -08:00
Ying Wang
b2f39181c6 Run ar in Deterministic mode.
Unfortunately no such flag was found for the host ar on Mac OS X.
https://code.google.com/p/android/issues/detail?id=60705

Change-Id: Ic2f75c871f0b5ae3cf20c1255458f7b921054d67
2013-12-02 14:15:23 -08:00
Ying Wang
71e5dd3055 am 7a772619: Merge "core: support make 4.00"
* commit '7a77261988354b13996e5ba84b87351b571a5a52':
  core: support make 4.00
2013-12-02 11:22:26 -08:00
Ying Wang
7a77261988 Merge "core: support make 4.00" 2013-12-02 19:16:02 +00:00
Stephen Hines
8d28269837 am 65ca752a: Merge "Add FORCE_BUILD_RS_COMPAT option."
* commit '65ca752aa18d6cd24196b5ba0fd6f53af49f8c56':
  Add FORCE_BUILD_RS_COMPAT option.
2013-11-27 15:26:48 -08:00
Stephen Hines
4e12f542be Add FORCE_BUILD_RS_COMPAT option.
This enables the .so libraries to be built for apps using the
RenderScript support library. Traditionally, we trim these .so
files from full platform builds.

Change-Id: I6f8e9b8d2b671338d3d5a5ac0bfcc60fd448688b
2013-11-27 14:54:15 -08:00
Doug Zongker
9b23f2cd78 add option to generate two-step recovery files
When run with the -2 option, ota_from_target_files will generate a
package (full or incremental) that does some extra reboots in order to
install the new recovery first, so that the rest of the installation
is done with the new recovery.  This can be useful if (say) the
package installation needs some features from the newer kernel.

For incremental packages, the verification phase is still done with
the old recovery.

This is only supported on devices where the misc partition is EMMC
(not MTD).

Two-step packages are slower to install and possibly confusing to
users (they will see their device reboot four times instead of twice),
so only use this option if necessary.

Change-Id: I3267d905e5e8eb1a1eb61bf48255b8b24ffc4ad1
2013-11-27 11:27:55 -08:00
Elliott Hughes
a09a9c11da am 38b14290: am 66153e38: Merge "Switch x86 over to uapi-only."
* commit '38b14290ea45d410969df9f62f5b39787586ca3a':
  Switch x86 over to uapi-only.
2013-11-27 10:47:45 -08:00
Elliott Hughes
38b14290ea am 66153e38: Merge "Switch x86 over to uapi-only."
* commit '66153e38b0fb9525ff6a63eb757b79694b8ad5e2':
  Switch x86 over to uapi-only.
2013-11-26 10:57:07 -08:00
Elliott Hughes
66153e38b0 Merge "Switch x86 over to uapi-only." 2013-11-26 18:51:47 +00:00
Narayan Kamath
61d57a4d01 am 7519d737: Merge "Add experimental flag to support OpenJDK builds."
* commit '7519d7378052be1824c06c2b6d5cee07874e2b45':
  Add experimental flag to support OpenJDK builds.
2013-11-26 10:08:49 -08:00
Ying Wang
e475ee0ca4 am 0b25d9fa: Merge "Change build id to OPENMASTER"
* commit '0b25d9fa70931a544a04cd7ba3f587bd2473c43a':
  Change build id to OPENMASTER
2013-11-26 10:05:24 -08:00
Narayan Kamath
7519d73780 Merge "Add experimental flag to support OpenJDK builds." 2013-11-26 18:01:17 +00:00
Ying Wang
0b25d9fa70 Merge "Change build id to OPENMASTER" 2013-11-26 17:51:12 +00:00
Ying Wang
7738e721fa Merge "Version number change for AOSP master" 2013-11-26 17:50:35 +00:00
Ying Wang
dcf9f36d8f Merge "Also package the unobfuscated classes.jar into proguard-dic.zip" 2013-11-26 17:37:06 +00:00
Elliott Hughes
1e398e0281 am 9128d725: am 46288040: Merge "Switch MIPS over to uapi-only."
* commit '9128d7253d0684be3a2808c21f8b97c6f76f84d0':
  Switch MIPS over to uapi-only.
2013-11-26 08:42:22 -08:00
Elliott Hughes
9128d7253d am 46288040: Merge "Switch MIPS over to uapi-only."
* commit '462880407efd121f2aa07850840f7b4d20d40d08':
  Switch MIPS over to uapi-only.
2013-11-26 08:38:36 -08:00
Ying Wang
ad69099131 Add experimental flag to support OpenJDK builds.
bug: 8992787

(cherry picked from commit d1dbe7f5a2)

Change-Id: Ie977d4f26ae8d3eee9d7b9cf2c0c270bee5b54b3
2013-11-26 10:30:14 +00:00
Chirayu Desai
e131cf8486 Version number change for AOSP master
Change-Id: I49ef02f99c6428bc538ba3839a0314d977f65e07
2013-11-26 08:29:29 +05:30
Ying Wang
33d6459181 Also package the unobfuscated classes.jar into proguard-dic.zip
proguard-dic.zip is generated and stored on the build server for
apps-only build.

Bug: 11811736
Change-Id: I2629dd1e28515d3b02f455f19b030ae291136559
2013-11-25 17:39:50 -08:00
Elliott Hughes
e5df095b76 Switch x86 over to uapi-only.
Bug: 11559337
Change-Id: I95aa40ec2094acdaef1d4b4d9f0dd6278cf558d1
2013-11-25 16:38:47 -08:00
Elliott Hughes
b88bdebcb9 Switch MIPS over to uapi-only.
Bug: 11559337
Change-Id: I04b93d0d681ddf75573cdeca2d25ffa44862a35f
2013-11-25 14:01:10 -08:00
Elliott Hughes
b5fdb3a947 am 3b54d5a5: am a5b55c27: Merge "Add a "reverse AUX hack" for ARM."
* commit '3b54d5a5fc492de5b28d905d0be36be66acec791':
  Add a "reverse AUX hack" for ARM.
2013-11-25 13:50:26 -08:00
Elliott Hughes
3b54d5a5fc am a5b55c27: Merge "Add a "reverse AUX hack" for ARM."
* commit 'a5b55c27c0a8199d42d1b03ef013baa9620e2bc2':
  Add a "reverse AUX hack" for ARM.
2013-11-25 13:47:06 -08:00
Elliott Hughes
a5b55c27c0 Merge "Add a "reverse AUX hack" for ARM." 2013-11-25 21:42:12 +00:00
Dave Allison
797589d4e4 am 014a3c0d: Add support for instruction set features
* commit '014a3c0d6268c5e167a8fad39c8d24b962101d0a':
  Add support for instruction set features
2013-11-25 13:30:49 -08:00
Dave Allison
014a3c0d62 Add support for instruction set features
This adds the --instruction-set-features= arguments to the dex2oat
commands for the system images.  The feature set is determined at
build time

(cherry picked from commit 4145a2a20a0f275fe4c77e39d507cd5f8eb7a73b)

(cherry picked from commit 5174bb0529)

Change-Id: I45af3b59752a48897bff2dd468b74f3ea73000be
2013-11-25 12:27:24 -08:00
Elliott Hughes
9696acae02 Add a "reverse AUX hack" for ARM.
MIPS and x86 are almost completely switched over to uapi-only. ARM is still
currently old-only. A cleanup of the uapi headers over the weekend means
that the uapi-only <linux/kexec.h> is now in the right place, which will break
the ARM build unless the ARM build also looks in the uapi headers if it can't
find an old header.

Change-Id: Ie7a53ef2122b43cdef64b71d7b36a8381992a461
2013-11-25 12:06:25 -08:00
Ying Wang
7c40768ada am 3821622f: Merge "Rework the generation of host java libraries."
* commit '3821622fc7e6ed03973d4b85a10ad23261ba12ef':
  Rework the generation of host java libraries.
2013-11-25 11:06:59 -08:00
Narayan Kamath
40dae1fefa Rework the generation of host java libraries.
We currently have two types of host libraries, those
meant for the host VM (Sun, OpenJDK etc.) and those meant
for a host dalvik build. The former need to be compiled
against the host standard libraries and the latter need
to be compiled against libcore. This change introduces
two new build rules to complement the existing the existing
host rules.

BUILD_HOST_DALVIK_JAVA_LIBRARY : Build a java library for
a host build of dalvik. Bootclasspath will be set to a host
build of libcore.
BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY : Build a static java
library for a host build of dalvik. Bootclasspath will be set
to a host build of libcore.

This change also removes support for the LOCAL_BUILD_HOST_DEX
flag, which is now unnecessary.

bug: 8992787

(cherry picked from commit 0dd273a3f6)

Change-Id: I3569fff8eaa4d26d55fcc317bd98471f55d74c14
2013-11-25 10:17:53 +00:00
Chirayu Desai
ab5e1624f0 Change build id to OPENMASTER
Change-Id: I2ca9b8de815c9c9e7e9d4c5a616e4ae270992761
2013-11-25 15:37:46 +05:30
Doug Zongker
ce61f1fe2e am b1e393dd: am b480d152: am 816d73f9: store releasetools.py in the target_files zip
* commit 'b1e393ddad02684198e4da414417b66bd09862b8':
  store releasetools.py in the target_files zip
2013-11-22 13:45:40 -08:00
Doug Zongker
b1e393ddad am b480d152: am 816d73f9: store releasetools.py in the target_files zip
* commit 'b480d1529e10b608c590a87839cfbafc46b2caed':
  store releasetools.py in the target_files zip
2013-11-22 13:43:05 -08:00
Doug Zongker
816d73f9eb store releasetools.py in the target_files zip
Save the device-specific releasetools.py module in the target_files
zip so that the OTA tools can use it without needing to get it from a
client.

Change-Id: I2dd5f4628290a8f2f56bd519b07d4ca8d92fddcd
2013-11-22 13:29:55 -08:00
The Android Open Source Project
b9041a45b1 Merge commit 'c73341006286c391ae4d268a77f5e008045d5308' into HEAD
Change-Id: I4bf7d32d65e19dfa1f0533fdd3b2295c50b13005
2013-11-22 11:06:11 -08:00
Ying Wang
91341e5283 Keep a copy of the space-separated PRODUCT_AAPT_CONFIG
That can be used to select dpi-specific prebuilt apks.

Change-Id: Ic68be8fc6fdb46f3ff8de490a35a042a31f1cb19
2013-11-22 10:07:51 -08:00
Dave Langemak
cb067ad2f6 am c3644114: am 8ea83e90: am 96f56b6f: Merge "Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."" into klp-dev
* commit 'c3644114805150eef2f5035085878e5f860c7436':
  Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."
2013-11-21 22:59:47 -08:00
Dave Langemak
c364411480 am 8ea83e90: am 96f56b6f: Merge "Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."" into klp-dev
* commit '8ea83e902d931591af37e747763e768e7a6990be':
  Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."
2013-11-21 17:16:26 -08:00
Elliott Hughes
dbecf2bbe9 am e0daed20: am a59b8545: am e296f2c3: Merge "Switch mips to the uapi kernel headers."
* commit 'e0daed20a6dfbd767ece790a30f68e602a0ec1ad':
  Switch mips to the uapi kernel headers.
2013-11-21 17:12:13 -08:00
Dave Langemak
96f56b6fcb Merge "Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."" into klp-dev 2013-11-22 01:08:53 +00:00
Elliott Hughes
e0daed20a6 am a59b8545: am e296f2c3: Merge "Switch mips to the uapi kernel headers."
* commit 'a59b8545cf1aa013cf87b9946e738e0add1f4536':
  Switch mips to the uapi kernel headers.
2013-11-21 17:07:48 -08:00
Michael Runge
90c60d3b92 Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."
This reverts commit 37335b4238.

Change-Id: I61cc125d3b08eaa300a7774b6607dbb43f0e7148
2013-11-22 00:52:51 +00:00
Elliott Hughes
3e416594b0 am a4a1061f: am bd36506e: am e57c8446: Merge "Switch x86 to uapi headers."
* commit 'a4a1061fbf5e59319510528a7eda77fe8f6fbd09':
  Switch x86 to uapi headers.
2013-11-21 10:15:32 -08:00
Elliott Hughes
a4a1061fbf am bd36506e: am e57c8446: Merge "Switch x86 to uapi headers."
* commit 'bd36506ee4ece41b8a32ac5b078e4538af4bc02a':
  Switch x86 to uapi headers.
2013-11-21 10:12:26 -08:00
Ying Wang
f817876b99 am 1b4252cd: am 0f78b47b: Merge "Switch AOSP X86/MIPS compiler to gcc4.8"
* commit '1b4252cd0312695827529f2a8470b68e5a5c05e2':
  Switch AOSP X86/MIPS compiler to gcc4.8
2013-11-21 08:09:45 -08:00
Elliott Hughes
a59b8545cf am e296f2c3: Merge "Switch mips to the uapi kernel headers."
* commit 'e296f2c38279836e23e15fad0064a88dbfe058e7':
  Switch mips to the uapi kernel headers.
2013-11-20 13:30:29 -08:00
Elliott Hughes
66ef53d83b Switch mips to the uapi kernel headers.
Bug: 11559337
Change-Id: Ic37b284398c049011f98651de84cef760566ebde
2013-11-20 12:55:09 -08:00
Elliott Hughes
bd36506ee4 am e57c8446: Merge "Switch x86 to uapi headers."
* commit 'e57c8446f0fa8e02b27e0b77aee7a2b62784cc54':
  Switch x86 to uapi headers.
2013-11-19 17:16:24 -08:00
Elliott Hughes
2d9dc89962 Switch x86 to uapi headers.
We still need the 'aux' hack, but this is a good step forward.

Bug: 11559337
Change-Id: Ib3d79317293e1cd3d2620c38e6b472a5994ee554
2013-11-19 16:55:00 -08:00
Igor Murashkin
310811999d DO NOT MERGE: Change build id to MASTER
Change-Id: I826114a98a59b1b27530e289605e947302a18268
2013-11-19 11:39:51 -08:00
Geremy Condra
fd6f7513f8 Add support for verity builds to the build system.
Change-Id: I3ef908d8d52ec88de453b161bbc3f198517a72f1
2013-11-17 16:09:34 -08:00
Ying Wang
1b4252cd03 am 0f78b47b: Merge "Switch AOSP X86/MIPS compiler to gcc4.8"
* commit '0f78b47bb304bc6f9597dd0788c60eb4f83d9ea0':
  Switch AOSP X86/MIPS compiler to gcc4.8
2013-11-15 14:56:50 -08:00
Andrew Hsieh
8baaca5f97 Switch AOSP X86/MIPS compiler to gcc4.8
Change-Id: Ifeee2c7d696c8a8e96e52c6ca51434260bdae5f8
2013-11-15 10:25:58 +08:00
Brian Carlstrom
fdd8ee4605 Merge changes I423c6c11,I09fe17f1
* changes:
  changing the rules following java package renaming for external/apache-harmony.
  Adding apache-harmony to cts.
2013-11-15 00:57:21 +00:00
Tsu Chiang Chuang
788878444c changing the rules following java package renaming for
external/apache-harmony.

(cherry picked from commit 27b4b5ffe12b179fc0d24747f9ead2d5f52c871a)

Change-Id: I423c6c11f253239faae89e5319ff40fc15b943a6
2013-11-14 16:22:33 -08:00
Tsu Chiang Chuang
6b874c9df3 Adding apache-harmony to cts.
(cherry-picked from commit 5fef52e9c986184796ff1e5fe54390614ba318a6)

Change-Id: I09fe17f1675aa16a8e325384a7f6d042b07fe02d
2013-11-14 16:22:32 -08:00
Dianne Hackborn
1460444ca1 am d54f8c2d: am 1611712d: am 221fcf31: Merge "Just a little .1 makes all the difference in the world." into klp-dev
* commit 'd54f8c2d1b4d88db84465fee93aa29103ca32078':
  Just a little .1 makes all the difference in the world.
2013-11-14 15:49:32 -08:00
Dianne Hackborn
d54f8c2d1b am 1611712d: am 221fcf31: Merge "Just a little .1 makes all the difference in the world." into klp-dev
* commit '1611712dac98d13e24ac6056405713d4994d25a5':
  Just a little .1 makes all the difference in the world.
2013-11-14 15:44:33 -08:00
Ben Cheng
9a1f26e425 am 2e6753a0: am de9b1835: Merge "Switch AOSP ARM build to use GCC 4.8."
* commit '2e6753a058a766d7c0607437224470c14574a94e':
  Switch AOSP ARM build to use GCC 4.8.
2013-11-14 14:14:22 -08:00
Ben Cheng
2e6753a058 am de9b1835: Merge "Switch AOSP ARM build to use GCC 4.8."
* commit 'de9b1835b3f3a025c2ab57154d0b5840469868f6':
  Switch AOSP ARM build to use GCC 4.8.
2013-11-14 14:09:57 -08:00
Ben Cheng
818d7d04f5 Switch AOSP ARM build to use GCC 4.8.
Change-Id: I65051773153ad5bc2c093cd1313acd212eb427b1
2013-11-14 14:05:29 -08:00
Dianne Hackborn
b6ab1203fb Just a little .1 makes all the difference in the world.
Change-Id: I4c4d8f507f9e81a632e22612043dc904694c5497
2013-11-14 12:06:49 -08:00
Ying Wang
a6b97cf42b am e4ab2f96: am 18b86b97: am 77f27f1d: Merge "Cleanup x86 and x86_64 flags"
* commit 'e4ab2f96082d1e3fa7bb8eab1f495a5d49f77bde':
  Cleanup x86 and x86_64 flags
2013-11-13 22:18:18 -08:00
Ying Wang
e4ab2f9608 am 18b86b97: am 77f27f1d: Merge "Cleanup x86 and x86_64 flags"
* commit '18b86b97b83e7d254125723363f170bc6f8d391e':
  Cleanup x86 and x86_64 flags
2013-11-13 21:02:17 -08:00
Ying Wang
18b86b97b8 am 77f27f1d: Merge "Cleanup x86 and x86_64 flags"
* commit '77f27f1dbe485d80692102743529e6973ba4a121':
  Cleanup x86 and x86_64 flags
2013-11-13 20:57:48 -08:00
Ying Wang
77f27f1dbe Merge "Cleanup x86 and x86_64 flags" 2013-11-14 04:54:55 +00:00
Ying Wang
8b1f9e9e96 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-11-13 17:56:20 -08:00
Ying Wang
ec900ac4dc Support host phony package.
Bug: 11467421
Change-Id: I146387aecc57aaabbbb81f8c8bc9b5c9a5e81f05
2013-11-13 15:56:18 -08:00
Ying Wang
7b66d366bf Call "java[c] -version" only once
and print out the full output if error occurs.
Bug: 11672548

Change-Id: Iba217789f7ab69d73902a4dc82e8975b2f6a48fc
2013-11-13 15:05:15 -08:00
Yohann Roussel
270be79007 Merge "Move multidex support library" 2013-11-13 15:22:34 +00:00
Elliott Hughes
06659afcdf am 693a26ba: am f8c5a6ae: am bd10e2c0: Merge "Switch x86_64 over to uapi headers."
* commit '693a26ba5599b84a3ae2a4b309e22be8a61ba3b0':
  Switch x86_64 over to uapi headers.
2013-11-08 14:56:24 -08:00
Elliott Hughes
693a26ba55 am f8c5a6ae: am bd10e2c0: Merge "Switch x86_64 over to uapi headers."
* commit 'f8c5a6ae006cfa8a6e30b850cbf930a043e5e842':
  Switch x86_64 over to uapi headers.
2013-11-08 14:54:12 -08:00
Elliott Hughes
f8c5a6ae00 am bd10e2c0: Merge "Switch x86_64 over to uapi headers."
* commit 'bd10e2c019b9f6a6e13f050c0e52924f456e482f':
  Switch x86_64 over to uapi headers.
2013-11-08 14:52:30 -08:00
Elliott Hughes
bd10e2c019 Merge "Switch x86_64 over to uapi headers." 2013-11-08 22:50:55 +00:00
Elliott Hughes
600b973722 Switch x86_64 over to uapi headers.
Bug: 11559337
Change-Id: Ia0a8dff9194375172d1c89daae917d2d8952ace7
2013-11-08 14:47:10 -08:00
Raphael Moll
6f1f97d970 am e9966aab: am 79a9a324: am 3342bf0f: Merge "Windows SDK: define BEGIN_DECLS/END_DECLS."
* commit 'e9966aab80e74d0a06c4ab6734a5996d8cb69604':
  Windows SDK: define BEGIN_DECLS/END_DECLS.
2013-11-08 13:42:20 -08:00
Raphael Moll
e9966aab80 am 79a9a324: am 3342bf0f: Merge "Windows SDK: define BEGIN_DECLS/END_DECLS."
* commit '79a9a3243ae701e7bc40b85b4a085ad91821d921':
  Windows SDK: define BEGIN_DECLS/END_DECLS.
2013-11-08 13:38:54 -08:00
Raphael Moll
79a9a3243a am 3342bf0f: Merge "Windows SDK: define BEGIN_DECLS/END_DECLS."
* commit '3342bf0fea22efeb3df0a4e3a3c50fb78ecf96ff':
  Windows SDK: define BEGIN_DECLS/END_DECLS.
2013-11-08 13:36:17 -08:00
Raphael Moll
b9c20aa8ba Windows SDK: define BEGIN_DECLS/END_DECLS.
These macros are not provided by MingW by default.

Change-Id: I623fda6c8e25e26573543c9368ebad47abc7f5c3
2013-11-08 11:40:41 -08:00
Michael Runge
c5d3cb362c am 3b44339d: am 37335b42: Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
* commit '3b44339d6a443fde57db4ae84a7e46823da6d162':
  Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
2013-11-07 16:13:15 -08:00
Maurice Chu
664035f771 Move multidex support library
Multidex is being moved from frameworks/support/multidex to
frameworks/multidex.

GMS Core will be using the multidex library and has gotten special
approval to use the unreleased multidex library (i.e., guinea pig).

Bug: 10674263
Change-Id: I31f582dd7adf4db6eb19c52357875594fc9f7829
2013-11-08 00:09:14 +01:00
Michael Runge
3b44339d6a am 37335b42: Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
* commit '37335b42385970d957d48056145a3d4c4dbc6087':
  Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
2013-11-07 15:00:42 -08:00
Michael Runge
37335b4238 Enable incremental builder to find files that moved, and
try to process them via patch + rename, instead of
delete + add.

b/11437930

Change-Id: Ie70632a2fa0a13d4bb259f61c620bb01812494e5
2013-11-07 11:36:03 -08:00
Brian Carlstrom
9efa0e19b0 Merge "Add support for instruction set features" 2013-11-07 18:32:17 +00:00
Elliott Hughes
2773ab94d7 am 36e681b0: resolved conflicts for merge of 12f87a5b to klp-dev-plus-aosp
* commit '36e681b02a7cd2554f038bcac65d7fdfc7889273':
  Remove the hacks needed to support ash and mksh concurrently.
2013-11-07 09:44:31 -08:00