Commit graph

14735 commits

Author SHA1 Message Date
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
Ying Wang
10b1ffaed9 Merge "enable PIE for dynamically linked Linux host executables" 2013-12-13 18:16:26 +00: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
Christopher Ferris
d6b97d1943 am 2c8078fd: Merge "Fix regex for finding symbol data."
* commit '2c8078fdcc7741d848444a01cd81e5dfb8693f15':
  Fix regex for finding symbol data.
2013-12-12 13:57:55 -08: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
Christopher Ferris
2c8078fdcc Merge "Fix regex for finding symbol data." 2013-12-12 21:53:08 +00:00
Ben Cheng
2609640eae Merge "Add an explicit definition of __ANDROID__=1" 2013-12-12 21:52:39 +00: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
Christopher Ferris
65a69446d3 Fix regex for finding symbol data.
The new output of debuggerd removed a space between the #00 and the rest
of the line. The regex is very restrictive, so fixing it to handle the new
output.

Change-Id: I5259ae1e56a351608b330dfd858a2021e6d89358
2013-12-12 12:56:16 -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
Dirk Dougherty
4d74482911 am 9b022bdf: am 35fe9894: Merge "Doc change: Add tag for DevArt." into klp-docs
* commit '9b022bdf8fba6fd3f2185a303e0bf3b3aa2e3d9e':
  Doc change: Add tag for DevArt.
2013-12-11 15:27:50 -08:00
Dirk Dougherty
9b022bdf8f am 35fe9894: Merge "Doc change: Add tag for DevArt." into klp-docs
* commit '35fe9894d283153b0a72741e207a586ff70cd558':
  Doc change: Add tag for DevArt.
2013-12-11 23:25:13 +00:00
Dirk Dougherty
35fe9894d2 Merge "Doc change: Add tag for DevArt." into klp-docs 2013-12-11 23:22:11 +00:00
Ying Wang
d532077a8f am d270230f: Merge "sign_target_files_apks: rewrite build.prop correctly in eng builds"
* commit 'd270230fa49311901d8797a9e77865c37857d028':
  sign_target_files_apks: rewrite build.prop correctly in eng builds
2013-12-11 15:15:10 -08:00
Ying Wang
d270230fa4 Merge "sign_target_files_apks: rewrite build.prop correctly in eng builds" 2013-12-11 23:11:53 +00:00
Andrew Boie
73d5abbd3f sign_target_files_apks: rewrite build.prop correctly in eng builds
In eng builds, ro.display.id has many space separated items and was
resulting in an error when trying to rewrite it as 'value' gets
turned into a list and never converted back to a string.

Change-Id: I6c8633ed2eb52c56a4097992a32d53d80df4f844
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2013-12-11 13:23:15 -08: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
Scott Main
f2fbb21de2 am ecff92d9: resolved conflicts for merge of 79a55d35 to klp-ub-dev
* commit 'ecff92d9f7d58b619465259213d7a58ae01c2872':
  add Analytics event to track sample downloads (for real this time)
2013-12-10 14:09:15 -08:00
Scott Main
ecff92d9f7 resolved conflicts for merge of 79a55d35 to klp-ub-dev
Change-Id: I95f46942e03f125e1a907003520caaf6ab575016
2013-12-10 14:04:30 -08:00
Scott Main
ab750f311c am ea64d5de: am 719acb45: update search suggestions to use new unified JS and show samples
* commit 'ea64d5de02842233b3a163c9c707cc77ce06483c':
  update search suggestions to use new unified JS and show samples
2013-12-10 13:52:37 -08:00
Scott Main
ea64d5de02 am 719acb45: update search suggestions to use new unified JS and show samples
* commit '719acb4553e1ffcbbe452ba7b3e8c6e5a12515db':
  update search suggestions to use new unified JS and show samples
2013-12-10 21:50:34 +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
c2f639a179 Merge "Add "-encoding UTF-8" option to javadoc." 2013-12-10 19:32:57 +00: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
David Friedman
e8db5f69d1 am c25aee29: Added a row for the "All platforms" download line (rebuild stl with debug info package)
* commit 'c25aee29298f1c1658fb274be15724ce60c0b93e':
  Added a row for the "All platforms" download line (rebuild stl with debug info package)
2013-12-10 08:33:13 -08:00
Scott Main
79a55d3585 add Analytics event to track sample downloads (for real this time)
Change-Id: I014fd31f0f12698462d44a8afed96ca6e3cfef38
2013-12-09 17:13:56 -08:00
Scott Main
719acb4553 update search suggestions to use new unified JS and show samples
Change-Id: Id39091558906db7d43b2d07d09756f71d98502a7
2013-12-09 15:57:26 -08:00
David Friedman
c25aee2929 Added a row for the "All platforms" download line (rebuild stl with debug info package)
Change-Id: I333912e697a389b52b5c768e1218b7d146775c9f
2013-12-09 13:24:13 -08: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
Narayan Kamath
948206c026 Merge "Fix tools path on Mac OS for java 7." 2013-12-06 17:11:08 +00:00
Narayan Kamath
fe57f66507 Merge "A few more Java7 related clean ups." 2013-12-06 17:10:53 +00:00
The Android Open Source Project
8e9369f3c2 am 722581a5: (-s ours) Merge commit \'d54f8c2d1b4d88db84465fee93aa29103ca32078\' into HEAD
* commit '722581a59873a98d30f7af34300049d524c1783f':
2013-12-05 17:24:53 -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
a395c6c1e4 am 18ee9e5e: Merge "Push wpa_supplicant modules down to the leaf product config."
* commit '18ee9e5e7de08933a04137e560bff87b113adb21':
  Push wpa_supplicant modules down to the leaf product config.
2013-12-05 12:25:33 -08:00
Ying Wang
730511d9c4 am 3bd3693d: Merge "Delete board config for the unused "emulator" device."
* commit '3bd3693dd0a0b514d6b1e9cbce052dee1940166b':
  Delete board config for the unused "emulator" device.
2013-12-05 12:25:32 -08:00
Ying Wang
404f32d120 am 1caa938a: Merge "Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices"
* commit '1caa938a22606a55103318df82a31a92f47900da':
  Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices
2013-12-05 12:25:31 -08:00
Ying Wang
18ee9e5e7d Merge "Push wpa_supplicant modules down to the leaf product config." 2013-12-05 19:14:20 +00:00
Ying Wang
3bd3693dd0 Merge "Delete board config for the unused "emulator" device." 2013-12-05 19:14:11 +00:00
Ying Wang
1caa938a22 Merge "Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices" 2013-12-05 19:14:01 +00:00
Ying Wang
2d76eae827 am c404d342: am 7493c39e: Add utility function find-files-in-subdirs
* commit 'c404d34282cabb3b9818cbf8020af18797ce8c6f':
  Add utility function find-files-in-subdirs
2013-12-05 10:43:51 -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
Ying Wang
17fc3d2ac1 Push wpa_supplicant modules down to the leaf product config.
Since 558477c0b2a5a7db679c1ad7551d43e6364d1df2 in
external/wpa_supplicant_8 we don't need those modules if
WPA_SUPPLICANT_VERSION is not set by the BoardConfig.mk.

Actually the generic devices don't need them.

Change-Id: Iff7c1fbf483bd16d5f898836c4e7401d56def80f

Conflicts:
	target/product/core_tiny.mk
2013-12-05 10:12:01 -08:00