OSDN Git Service
Christopher Ferris [Tue, 17 Dec 2013 23:11:58 +0000 (15:11 -0800)]
am
d12ee620: Merge "Re-enable uapi kernel headers for arm."
* commit '
d12ee620b064d262abce691771fe53ba8987d06f':
Re-enable uapi kernel headers for arm.
Christopher Ferris [Tue, 17 Dec 2013 23:06:38 +0000 (23:06 +0000)]
Merge "Re-enable uapi kernel headers for arm."
Scott Main [Tue, 17 Dec 2013 21:25:17 +0000 (13:25 -0800)]
am
dab6ac86: am
518dc751: Merge "make the new guide/index.html the link for API Guides." into klp-docs
* commit '
dab6ac86013bb9507a59b74abe1b11ab2306f352':
make the new guide/index.html the link for API Guides.
Scott Main [Tue, 17 Dec 2013 21:19:44 +0000 (21:19 +0000)]
am
518dc751: Merge "make the new guide/index.html the link for API Guides." into klp-docs
* commit '
518dc751a617c1f182cb01cdc8fd06076d1e91ba':
make the new guide/index.html the link for API Guides.
Scott Main [Tue, 17 Dec 2013 21:17:29 +0000 (21:17 +0000)]
Merge "make the new guide/index.html the link for API Guides." into klp-docs
Elliott Hughes [Tue, 17 Dec 2013 15:42:33 +0000 (07:42 -0800)]
am
3fd89533: Merge "Make aarch64 more like arm wrt strict-aliasing."
* commit '
3fd895336dc7cfe219be4e1d49096bf53e661503':
Make aarch64 more like arm wrt strict-aliasing.
Elliott Hughes [Tue, 17 Dec 2013 15:39:06 +0000 (15:39 +0000)]
Merge "Make aarch64 more like arm wrt strict-aliasing."
Elliott Hughes [Tue, 17 Dec 2013 02:01:19 +0000 (18:01 -0800)]
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
Christopher Ferris [Mon, 16 Dec 2013 21:58:39 +0000 (13:58 -0800)]
Re-enable uapi kernel headers for arm.
Bug:
11559337
Change-Id: Ib914e5f22b10d5a74edc357d42b0dcb223185ab4
Christopher Ferris [Mon, 16 Dec 2013 18:33:03 +0000 (10:33 -0800)]
am
657eadd4: Merge "Revert "Enable uapi kernel headers for arm.""
* commit '
657eadd4b78b91185ca2042ffb7f92be84e6c1c4':
Revert "Enable uapi kernel headers for arm."
Christopher Ferris [Mon, 16 Dec 2013 18:28:03 +0000 (18:28 +0000)]
Merge "Revert "Enable uapi kernel headers for arm.""
Christopher Ferris [Mon, 16 Dec 2013 18:21:27 +0000 (18:21 +0000)]
Revert "Enable uapi kernel headers for arm."
This reverts commit
88c6c533e17f7bc2e1491310b8d679a91b33aaeb.
Change-Id: I3cd84383c6f217bc6e627e16b2d0c7d948f8131d
Christopher Ferris [Mon, 16 Dec 2013 17:57:57 +0000 (09:57 -0800)]
am
84b99aad: Merge "Enable uapi kernel headers for arm."
* commit '
84b99aadddf3cd9d02a60b43923ed11fc7341c9f':
Enable uapi kernel headers for arm.
Christopher Ferris [Mon, 16 Dec 2013 17:52:43 +0000 (17:52 +0000)]
Merge "Enable uapi kernel headers for arm."
Christopher Ferris [Mon, 16 Dec 2013 17:12:19 +0000 (09:12 -0800)]
Enable uapi kernel headers for arm.
Bug:
11559337
Change-Id: Idd251338f707b7c6a08f43a79f9784c57142f43c
Ying Wang [Fri, 13 Dec 2013 18:24:12 +0000 (10:24 -0800)]
am
10b1ffae: Merge "enable PIE for dynamically linked Linux host executables"
* commit '
10b1ffaed921bce3014d39ca9dcb705550aa03f0':
enable PIE for dynamically linked Linux host executables
Ying Wang [Fri, 13 Dec 2013 18:16:26 +0000 (18:16 +0000)]
Merge "enable PIE for dynamically linked Linux host executables"
Joshua J. Drake [Thu, 12 Dec 2013 06:34:29 +0000 (00:34 -0600)]
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
Ying Wang [Fri, 13 Dec 2013 00:09:43 +0000 (16:09 -0800)]
am
5859f105: Merge "Enable NX protections"
* commit '
5859f105fad3ce1ba76fb252c4c5b8fe357a3ce4':
Enable NX protections
Ying Wang [Fri, 13 Dec 2013 00:04:41 +0000 (00:04 +0000)]
Merge "Enable NX protections"
Christopher Ferris [Thu, 12 Dec 2013 21:57:55 +0000 (13:57 -0800)]
am
2c8078fd: Merge "Fix regex for finding symbol data."
* commit '
2c8078fdcc7741d848444a01cd81e5dfb8693f15':
Fix regex for finding symbol data.
Ben Cheng [Thu, 12 Dec 2013 21:57:55 +0000 (13:57 -0800)]
am
2609640e: Merge "Add an explicit definition of __ANDROID__=1"
* commit '
2609640eaea1ba89a493cff2847cb9ec993dc9fc':
Add an explicit definition of __ANDROID__=1
Christopher Ferris [Thu, 12 Dec 2013 21:53:08 +0000 (21:53 +0000)]
Merge "Fix regex for finding symbol data."
Ben Cheng [Thu, 12 Dec 2013 21:52:39 +0000 (21:52 +0000)]
Merge "Add an explicit definition of __ANDROID__=1"
Ben Cheng [Thu, 12 Dec 2013 21:07:05 +0000 (13:07 -0800)]
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
Christopher Ferris [Thu, 12 Dec 2013 20:56:16 +0000 (12:56 -0800)]
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
Joshua J. Drake [Thu, 12 Dec 2013 06:41:38 +0000 (00:41 -0600)]
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
Dirk Dougherty [Wed, 11 Dec 2013 23:27:50 +0000 (15:27 -0800)]
am
9b022bdf: am
35fe9894: Merge "Doc change: Add tag for DevArt." into klp-docs
* commit '
9b022bdf8fba6fd3f2185a303e0bf3b3aa2e3d9e':
Doc change: Add tag for DevArt.
Dirk Dougherty [Wed, 11 Dec 2013 23:25:13 +0000 (23:25 +0000)]
am
35fe9894: Merge "Doc change: Add tag for DevArt." into klp-docs
* commit '
35fe9894d283153b0a72741e207a586ff70cd558':
Doc change: Add tag for DevArt.
Dirk Dougherty [Wed, 11 Dec 2013 23:22:10 +0000 (23:22 +0000)]
Merge "Doc change: Add tag for DevArt." into klp-docs
Ying Wang [Wed, 11 Dec 2013 23:15:10 +0000 (15:15 -0800)]
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
Ying Wang [Wed, 11 Dec 2013 23:11:52 +0000 (23:11 +0000)]
Merge "sign_target_files_apks: rewrite build.prop correctly in eng builds"
Andrew Boie [Wed, 11 Dec 2013 20:42:03 +0000 (12:42 -0800)]
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>
Ying Wang [Wed, 11 Dec 2013 18:11:21 +0000 (10:11 -0800)]
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
Ying Wang [Wed, 11 Dec 2013 17:52:26 +0000 (17:52 +0000)]
Merge "Added TARGET_IS_64_BIT flag for x86_64 and aarch64"
Alexey Volkov [Wed, 11 Dec 2013 13:18:56 +0000 (17:18 +0400)]
Added TARGET_IS_64_BIT flag for x86_64 and aarch64
Change-Id: Ibdf9dafa3aeaf4b58b4a559ed05e36e2793bf6ed
Signed-off-by: Alexey Volkov <alexey.v.volkov@intel.com>
Scott Main [Thu, 5 Dec 2013 23:17:59 +0000 (15:17 -0800)]
make the new guide/index.html the link for API Guides.
Change-Id: I4423e9ab43b349427cc70211dd094760b35e9360
Scott Main [Tue, 10 Dec 2013 22:09:15 +0000 (14:09 -0800)]
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)
Scott Main [Tue, 10 Dec 2013 22:04:30 +0000 (14:04 -0800)]
resolved conflicts for merge of
79a55d35 to klp-ub-dev
Change-Id: I95f46942e03f125e1a907003520caaf6ab575016
Scott Main [Tue, 10 Dec 2013 21:52:37 +0000 (13:52 -0800)]
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
Scott Main [Tue, 10 Dec 2013 21:50:34 +0000 (21:50 +0000)]
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
Ying Wang [Tue, 10 Dec 2013 19:36:18 +0000 (11:36 -0800)]
am
c2f639a1: Merge "Add "-encoding UTF-8" option to javadoc."
* commit '
c2f639a179b3085c7f61a8d71d2ee7b3ff6c9266':
Add "-encoding UTF-8" option to javadoc.
Ying Wang [Tue, 10 Dec 2013 19:32:57 +0000 (19:32 +0000)]
Merge "Add "-encoding UTF-8" option to javadoc."
Ying Wang [Tue, 10 Dec 2013 19:29:25 +0000 (11:29 -0800)]
Add "-encoding UTF-8" option to javadoc.
This fixed docs build on Mac OS X 10.9 with Java 7.
Change-Id: I91e224456c9e6c43dbf13d691c3b37d21f94b0f3
David Friedman [Tue, 10 Dec 2013 16:33:13 +0000 (08:33 -0800)]
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)
Scott Main [Tue, 10 Dec 2013 01:13:56 +0000 (17:13 -0800)]
add Analytics event to track sample downloads (for real this time)
Change-Id: I014fd31f0f12698462d44a8afed96ca6e3cfef38
Scott Main [Fri, 6 Dec 2013 00:05:09 +0000 (16:05 -0800)]
update search suggestions to use new unified JS and show samples
Change-Id: Id39091558906db7d43b2d07d09756f71d98502a7
David Friedman [Fri, 6 Dec 2013 10:23:14 +0000 (02:23 -0800)]
Added a row for the "All platforms" download line (rebuild stl with debug info package)
Change-Id: I333912e697a389b52b5c768e1218b7d146775c9f
Narayan Kamath [Fri, 6 Dec 2013 17:16:18 +0000 (09:16 -0800)]
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.
Narayan Kamath [Fri, 6 Dec 2013 17:16:18 +0000 (09:16 -0800)]
am
a8dcc8c8: am
fe57f665: Merge "A few more Java7 related clean ups."
* commit '
a8dcc8c81a567902bee69a8dcd7357d391ef39b9':
A few more Java7 related clean ups.
Narayan Kamath [Fri, 6 Dec 2013 17:13:58 +0000 (09:13 -0800)]
am
948206c0: Merge "Fix tools path on Mac OS for java 7."
* commit '
948206c026c8751b9d53341dfe9c2c2905ebb002':
Fix tools path on Mac OS for java 7.
Narayan Kamath [Fri, 6 Dec 2013 17:13:58 +0000 (09:13 -0800)]
am
fe57f665: Merge "A few more Java7 related clean ups."
* commit '
fe57f665074665edf469ad1e1d0fcef749f9a5bb':
A few more Java7 related clean ups.
Narayan Kamath [Fri, 6 Dec 2013 17:11:08 +0000 (17:11 +0000)]
Merge "Fix tools path on Mac OS for java 7."
Narayan Kamath [Fri, 6 Dec 2013 17:10:52 +0000 (17:10 +0000)]
Merge "A few more Java7 related clean ups."
The Android Open Source Project [Fri, 6 Dec 2013 01:24:53 +0000 (17:24 -0800)]
The Android Open Source Project [Thu, 5 Dec 2013 20:59:39 +0000 (12:59 -0800)]
Merge commit '
d54f8c2d1b4d88db84465fee93aa29103ca32078' into HEAD
Change-Id: I3cf53f083dee277a450dac36b011bc83180f6294
Ying Wang [Thu, 5 Dec 2013 20:25:33 +0000 (12:25 -0800)]
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.
Ying Wang [Thu, 5 Dec 2013 20:25:32 +0000 (12:25 -0800)]
am
3bd3693d: Merge "Delete board config for the unused "emulator" device."
* commit '
3bd3693dd0a0b514d6b1e9cbce052dee1940166b':
Delete board config for the unused "emulator" device.
Ying Wang [Thu, 5 Dec 2013 20:25:31 +0000 (12:25 -0800)]
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
Ying Wang [Thu, 5 Dec 2013 19:14:20 +0000 (19:14 +0000)]
Merge "Push wpa_supplicant modules down to the leaf product config."
Ying Wang [Thu, 5 Dec 2013 19:14:11 +0000 (19:14 +0000)]
Merge "Delete board config for the unused "emulator" device."
Ying Wang [Thu, 5 Dec 2013 19:14:01 +0000 (19:14 +0000)]
Merge "Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices"
Ying Wang [Thu, 5 Dec 2013 18:43:51 +0000 (10:43 -0800)]
am
c404d342: am
7493c39e: Add utility function find-files-in-subdirs
* commit '
c404d34282cabb3b9818cbf8020af18797ce8c6f':
Add utility function find-files-in-subdirs
Ying Wang [Thu, 5 Dec 2013 18:39:42 +0000 (10:39 -0800)]
am
7493c39e: Add utility function find-files-in-subdirs
* commit '
7493c39eff203ed027b0f0ea320c26dd7d895b22':
Add utility function find-files-in-subdirs
Ying Wang [Thu, 5 Dec 2013 00:04:49 +0000 (16:04 -0800)]
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
85898bca9969ec30c746cc852394bbae0195edbc)
Ying Wang [Mon, 25 Nov 2013 20:56:25 +0000 (12:56 -0800)]
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
Ying Wang [Mon, 25 Nov 2013 19:16:13 +0000 (11:16 -0800)]
Delete board config for the unused "emulator" device.
Change-Id: I1e1d47fece4113be9f31f04775c5b310d28017e3
Ying Wang [Mon, 25 Nov 2013 18:42:17 +0000 (10:42 -0800)]
Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices
Since
558477c0b2a5a7db679c1ad7551d43e6364d1df2 in
external/wpa_supplicant_8 we don't have WPA_SUPPLICANT_VERSION default
to VER_0_8_X.
This fixes the SDK build.
Change-Id: Ib7a8e10705dc6b987b60b1308405e89eaa2a47c9
Narayan Kamath [Thu, 5 Dec 2013 15:20:41 +0000 (15:20 +0000)]
Fix tools path on Mac OS for java 7.
Change-Id: Ieb72b9e10771ee372bacf20258242cb006c29fef
Ying Wang [Thu, 5 Dec 2013 14:22:37 +0000 (06:22 -0800)]
am
e65c2969: Merge "Add utility function find-files-in-subdirs"
* commit '
e65c29697ac2cad422a094720944d326128f17c3':
Add utility function find-files-in-subdirs
Narayan Kamath [Thu, 5 Dec 2013 12:26:35 +0000 (12:26 +0000)]
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
Ying Wang [Thu, 5 Dec 2013 02:40:31 +0000 (02:40 +0000)]
Merge "Add utility function find-files-in-subdirs"
Ying Wang [Thu, 5 Dec 2013 00:04:49 +0000 (16:04 -0800)]
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
Xavier Ducrohet [Wed, 4 Dec 2013 21:33:41 +0000 (13:33 -0800)]
am
8eb89dde: am
ab92f3df: Add Dialer to SDK system image. DO NOT MERGE.
* commit '
8eb89dde9b1c4da0aa0d116ef05e12c38873b756':
Add Dialer to SDK system image. DO NOT MERGE.
Xavier Ducrohet [Wed, 4 Dec 2013 21:30:08 +0000 (13:30 -0800)]
am
ab92f3df: Add Dialer to SDK system image. DO NOT MERGE.
* commit '
ab92f3dff0eb87a8aed4fdbcf1e16b71fd026daf':
Add Dialer to SDK system image. DO NOT MERGE.
Xavier Ducrohet [Wed, 4 Dec 2013 21:25:31 +0000 (13:25 -0800)]
Add Dialer to SDK system image. DO NOT MERGE.
Change-Id: I4f15482385c869a4ae08d99ae98bffc7c113acd7
Joe Onorato [Wed, 4 Dec 2013 17:43:06 +0000 (09:43 -0800)]
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
Joe Onorato [Wed, 4 Dec 2013 10:31:18 +0000 (02:31 -0800)]
Add a convenient target for building a zip file of javadocs: $(LOCAL_MODULE)-docs.zip
Change-Id: I97fcc0d467f3b7582570b9be7e15acc0a5b550a5
Dirk Dougherty [Wed, 4 Dec 2013 02:49:24 +0000 (18:49 -0800)]
Doc change: Add tag for DevArt.
Change-Id: Id6ecac1587e311373b2f787fb86b85c2c9933183
Dave Langemak [Tue, 3 Dec 2013 23:27:52 +0000 (15:27 -0800)]
Dave Langemak [Tue, 3 Dec 2013 23:24:24 +0000 (15:24 -0800)]
Dave Langemak [Tue, 3 Dec 2013 23:06:56 +0000 (15:06 -0800)]
.1 becomes .2
Change-Id: Ib4208e24e66b05ff441302a817be22ea213eb1df
Doug Zongker [Tue, 3 Dec 2013 16:58:11 +0000 (08:58 -0800)]
am
57c9ffef: am
9b23f2cd: add option to generate two-step recovery files
* commit '
57c9ffef30a6f34e126d8e89a08d208b05cc4901':
add option to generate two-step recovery files
Doug Zongker [Tue, 3 Dec 2013 16:56:05 +0000 (08:56 -0800)]
am
9b23f2cd: add option to generate two-step recovery files
* commit '
9b23f2cd786b46991b7c0198e69264b17875288d':
add option to generate two-step recovery files
Dirk Dougherty [Tue, 3 Dec 2013 01:12:41 +0000 (17:12 -0800)]
am
d239e4c9: Support generated samples_toc.cs file.
* commit '
d239e4c9b5c154129d67bec9cd7b37b2720bf2b6':
Support generated samples_toc.cs file.
Dirk Dougherty [Mon, 25 Nov 2013 19:35:03 +0000 (11:35 -0800)]
Support generated samples_toc.cs file.
Change-Id: I34eeffbc98f729e13de805e7bbb9dac96d13fdd8
Ying Wang [Mon, 2 Dec 2013 22:26:45 +0000 (14:26 -0800)]
am
6178f6f0: Merge "Run ar in Deterministic mode."
* commit '
6178f6f0182b0b9c8063123dd62e86108eb7a212':
Run ar in Deterministic mode.
Ying Wang [Mon, 2 Dec 2013 22:19:27 +0000 (22:19 +0000)]
Merge "Run ar in Deterministic mode."
Ying Wang [Mon, 2 Dec 2013 22:13:02 +0000 (14:13 -0800)]
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
Ying Wang [Mon, 2 Dec 2013 19:22:26 +0000 (11:22 -0800)]
am
7a772619: Merge "core: support make 4.00"
* commit '
7a77261988354b13996e5ba84b87351b571a5a52':
core: support make 4.00
Ying Wang [Mon, 2 Dec 2013 19:16:02 +0000 (19:16 +0000)]
Merge "core: support make 4.00"
Stephen Hines [Wed, 27 Nov 2013 23:26:48 +0000 (15:26 -0800)]
am
65ca752a: Merge "Add FORCE_BUILD_RS_COMPAT option."
* commit '
65ca752aa18d6cd24196b5ba0fd6f53af49f8c56':
Add FORCE_BUILD_RS_COMPAT option.
Stephen Hines [Wed, 27 Nov 2013 23:18:22 +0000 (23:18 +0000)]
Merge "Add FORCE_BUILD_RS_COMPAT option."
Stephen Hines [Mon, 30 Sep 2013 22:57:36 +0000 (15:57 -0700)]
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
Doug Zongker [Mon, 25 Nov 2013 22:44:12 +0000 (14:44 -0800)]
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
Elliott Hughes [Tue, 26 Nov 2013 18:57:07 +0000 (10:57 -0800)]
am
66153e38: Merge "Switch x86 over to uapi-only."
* commit '
66153e38b0fb9525ff6a63eb757b79694b8ad5e2':
Switch x86 over to uapi-only.
Elliott Hughes [Tue, 26 Nov 2013 18:51:47 +0000 (18:51 +0000)]
Merge "Switch x86 over to uapi-only."
Narayan Kamath [Tue, 26 Nov 2013 18:08:49 +0000 (10:08 -0800)]
am
7519d737: Merge "Add experimental flag to support OpenJDK builds."
* commit '
7519d7378052be1824c06c2b6d5cee07874e2b45':
Add experimental flag to support OpenJDK builds.
Ying Wang [Tue, 26 Nov 2013 18:05:24 +0000 (10:05 -0800)]
am
0b25d9fa: Merge "Change build id to OPENMASTER"
* commit '
0b25d9fa70931a544a04cd7ba3f587bd2473c43a':
Change build id to OPENMASTER
Ying Wang [Tue, 26 Nov 2013 18:05:23 +0000 (10:05 -0800)]
am
7738e721: (-s ours) Merge "Version number change for AOSP master"
* commit '
7738e721fa7f80394632eb1d6591845f8fa03853':
Version number change for AOSP master