Commit graph

3549 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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